Since the git format contains the commit the patch should
be applied to, I think that there is no
need for the contributors to specify which branch to use
for the patch. I will update the wiki
accordingly.
Thanks, all.
I've amended the Wiki to recommend Git format patches and have
re-submitted my patch for bug 210248 in Git format.
cW
On 2011-11-04, at 3:46 PM, Schaefer, Doug wrote:
There
was a time when we had issues with git format patches. But if those are
resolved, then there’s no reason not to use them.
:D
From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Christian
Damus Sent: Friday,
November 04, 2011 3:44 PM To: CDT General developers
list. Subject: Re:
[cdt-dev] Wiki updates for contributing patches on
Git
Hi,
Marc,
Thanks
for the edits. I didn't know about the "Amend previous commit".
I learned something today! :-) And a good point about the
repo history, yes.
The
bit about not checking the Git format option was based on the recommendation
in the EGit on-line help. It indicates that the Git-format patch isn't
compatible with Eclipse's "Apply Patch" wizard. If that information is
out of date or incorrect, then that's good news. I didn't realize
that the different was so small.
Of
course, the CDT committer team owns the contribution process, so if Git
format works well with Eclipse and that's what y'all prefer, then I can
amend that on the Wiki.
On
2011-11-04, at 3:35 PM, Marc Khouzam wrote:
Thanks
Christian for adding this info!
I
updated two points on the wiki:
-
mentioning that a patch can only be created for a single commit, and
therefore to be aware of the "Amend previous commit" option
-
mentioning to use the Repository history (as people mistakenly tried to
create patches from the file history in some cases).
There
is one part I'm not sure about. The wiki recommends not to use the Git
format for the patch.
At one
point EGit would hit an NPE when creating patches not using the Git
format. Also,
the Git
format has the nice advantage of including the commit on which the patch
should be applied.
The con
is that when applying a Git patch, one must select to ignore the first two
path name segments;
but it
still works once that is done. I use Git format all the time
now.
Should
we ask contributors to attach patches in Git format?
Marc
From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Schaefer,
Doug Sent: Friday,
November 04, 2011 2:44 PM To: CDT General developers
list. Subject: Re:
[cdt-dev] Wiki updates for contributing patches on Git
Excellent,
thanks Christian. We’re all new to it so any info documented is a great
help.
As
I just went through the process as a Git first-timer of cloning the CDT
repo, making some changes, and contributing them to the project as a patch
on Bugzilla, I thought I'd document the procedure briefly on the
Wiki.
As
I said, I'm new to Git, so I may have done something wrong that will lead
others astray. If so, please correct me (on the Wiki, of
course).
---- Christian W. Damus Software Developer, IDE Team QNX Software Systems Limited <http://www.qnx.com/>
---- Christian W. Damus Software Developer, IDE Team QNX Software Systems Limited <http://www.qnx.com/>
_______________________________________________ cdt-dev
mailing list cdt-dev@xxxxxxxxxxxhttps://dev.eclipse.org/mailman/listinfo/cdt-dev
---- Christian
W. Damus Software Developer, IDE Team QNX Software Systems
Limited <http://www.qnx.com/>
|