Re: [ptp-dev] Git and patches

[Roland Schulz <roland@xxxxxxx>]

On Wed, Nov 30, 2011 at 4:11 PM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote:

Can somebody (Roland?) update the wiki page give a preferred procedure to putting a commit in multiple branches?
I have read  the emails over the last couple of weeks but recent formatting changes(??) make it hard to tell questions from answers, and some of them are very terse.
I think I'm more confused than what I was at the start.
I am not accustomed to the command-line Git so would like procedures based on eGit/Eclipse UI.

http://wiki.eclipse.org/PTP/environment_setup/git
Includes some topics and answers. the answers are very brief and there was much much more discussion here on the mailing list where i think suggested procedures now differ from what's on the wiki page.

I updated it a bit. I don't think we do anything different from most others using GIT. So I'm not sure how helpful it is to write a new documentation. So I would prefer to keep it mostly on the mailing list: helping with questions. For reading up a full tutorial I would think an existing tutorial is better. Having said that, I'm happy to add more if you let me know what you think would be helpful.

Roland

Roland

 

...Beth

Beth Tibbitts
Eclipse Parallel Tools Platform  http://eclipse.org/ptp
IBM STG - High Performance Computing Tools
Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511

Roland Schulz ---11/30/2011 01:35:01 PM---On Wed, Nov 30, 2011 at 1:19 PM, Jeffrey Overbey <jeffreyoverbey@xxxxxxx>wrote: >  Git continues to

From:	Roland Schulz <roland@xxxxxxx>
To:	Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date:	11/30/2011 01:35 PM
Subject:	Re: [ptp-dev] Git and patches
Sent by:	ptp-dev-bounces@xxxxxxxxxxx

---

On Wed, Nov 30, 2011 at 1:19 PM, Jeffrey Overbey <jeffreyoverbey@xxxxxxx> wrote:

Git continues to make me feel like a moron.  I apparently don't know how to make a patch.

I have made two commits to my local Git repository since I cloned the PTP repo; the second commit depends on the first.  When I made the second commit, I didn't check the "amend previous commit" box as recommended in http://wiki.eclipse.org/CDT/git#Posting_patches_on_Bugzilla

Now, I would like to create a patch that can be applied to PTP HEAD (or origin/master or whatever it's called now).  It needs to include the changes from both commits.

Is there an easy way to do this -- to create a Bugzilla-worthy patch with the differences between my master branch and origin/master?

I think Egit is missing that functionality to do this directly. You have two options:
1) use the command line: git diff --no-prefix origin/master > patch.file  

If not, can I at least merge the two commits, or otherwise go back in time and decide to check the "amend previous commit" checkbox?

2) In the Team View, right click the previous commit, Team->Reset->Mixed. Now you can amend and than create the patch in Eclipse.

Roland
 

Jeff

--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov

865-241-1537, ORNL PO BOX 2008 MS6309_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev

-- 
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309