Skip to contentSkip to conversation

General GIT MO question

DISCUSSION Grant Likely 2 participants 3 messages Jan 17, 2006 – Jan 18, 2006 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 1 line · David H. Lynch Jr.

I appreciate you feedback on the E12/UartLite stuff I posted earlier.

no problem

Quoted 6 lines

I have gotten sufficiently compitent with git that I can use it as a
source code manager.
But despite perusing through a fairly significant amount of git docs, I
have not really grasped how to get from how I work to what seems to be the norm for patch subimissions.

Heh, your tracking the same path of pain that I went through 2 months ago. :)

Quoted 10 lines

Fixing a bug or adding a small feature is one thing. You have a base,
and and end result and a simple diff. But I am porting to a whole new board, adding support for two new serial drivers, and adding boot to init serial IO support - all at once, as well as dealing with bugs and mis-steps along the way.

I can figure out how to get git to do alot of nice things, but I can
not figure out how to get it to produce a nice modularized set of patches that includes only those things relevant for kernel submission.

Here's what I do, assuming that my changes are in the 'master' branch, and 'master' is based off of 'origin'. BTW, I also use the cogito with git.

1. create a new branch 'cleanup' off of origin so it doesn't have any of my patches in it.

$ git branch cleanup origin
$ git checkout origin

2. get a list of all my patches; I use 'cg log' and look for the sha1 'commit' tags.

$ cg log master
p
3a. start 'cherry-picking' my patches one-by-one from 'master' to
'cleanup'.  Feel free to use this to reorder patches
$ git cherry-pick -r <first-commit-sha1>
$ git cherry-pick -r <second-commit-sha1>
$ git cherry-pick -r <third-commit-sha1>

3b. If I want to modify the patch before committing; I use the -n flag to only apply the changes; clean up the change, then commit it with the -c flag. Also do this if a patch conflicts.

$ git cherry-pick -r -n <messy-commit-sha1>
$ <edit stuff>
$ cg commit -c <messy-commit-sha1>   # Use the original change message

3c. Cherry picking works for merging patches too

$ git cherry-pick -r -n <partial-patch1>
$ git cherry-pick -r -n <partial-patch2>
$ git cherry-pick -r -n <partial-patch3>
$ cg commit

4. generate patch files for submission to the mailing list

$ git-format-patch -o <output dir> origin cleanup

5. (optional) make 'cleanup' the new 'master

$ git branch -f master cleanup
$ git checkout master
Quoted 4 lines

I am looking for a clue here. How do you produce a clean set of
granular patches including only what you want and not the all the steps and mis-steps along the way ?

Signature · 3 lines
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
(403) 663-0761
#2 lore raw
Quoted 52 lines · Grant Likely
Quoted 1 line · David H. Lynch Jr.

I appreciate you feedback on the E12/UartLite stuff I posted earlier.

no problem

Quoted 5 lines

I have gotten sufficiently compitent with git that I can use it as a
source code manager.
But despite perusing through a fairly significant amount of git docs, I
have not really grasped how to get from how I work to what seems to be the norm for patch subimissions.

Heh, your tracking the same path of pain that I went through 2 months ago. :)

Quoted 9 lines

Fixing a bug or adding a small feature is one thing. You have a base,
and and end result and a simple diff. But I am porting to a whole new board, adding support for two new serial drivers, and adding boot to init serial IO support - all at once, as well as dealing with bugs and mis-steps along the way.

I can figure out how to get git to do alot of nice things, but I can
not figure out how to get it to produce a nice modularized set of patches that includes only those things relevant for kernel submission.

Here's what I do, assuming that my changes are in the 'master' branch, and 'master' is based off of 'origin'. BTW, I also use the cogito with git.

1. create a new branch 'cleanup' off of origin so it doesn't have any of my patches in it.

$ git branch cleanup origin
$ git checkout origin

2. get a list of all my patches; I use 'cg log' and look for the sha1 'commit' tags.

$ cg log master
p
3a. start 'cherry-picking' my patches one-by-one from 'master' to
'cleanup'.  Feel free to use this to reorder patches
$ git cherry-pick -r <first-commit-sha1>
$ git cherry-pick -r <second-commit-sha1>
$ git cherry-pick -r <third-commit-sha1>

3b. If I want to modify the patch before committing; I use the -n flag to only apply the changes; clean up the change, then commit it with the -c flag. Also do this if a patch conflicts.

$ git cherry-pick -r -n <messy-commit-sha1>
$ <edit stuff>
$ cg commit -c <messy-commit-sha1>   # Use the original change message

3c. Cherry picking works for merging patches too

$ git cherry-pick -r -n <partial-patch1>
$ git cherry-pick -r -n <partial-patch2>
$ git cherry-pick -r -n <partial-patch3>
$ cg commit
Quoted 12 lines

4. generate patch files for submission to the mailing list

$ git-format-patch -o <output dir> origin cleanup

5. (optional) make 'cleanup' the new 'master

$ git branch -f master cleanup
$ git checkout master
Quoted 3 lines

I am looking for a clue here. How do you produce a clean set of
granular patches including only what you want and not the all the steps and mis-steps along the way ?

Or use stg (http://www.procode.org/stgit/),
steps 1-2 you could made by
stg new
steps 3 trough 5 by :
stg refresh/stg export

--
Regards
Andrey Volkov

#3 lore raw
Quoted 9 lines · Andrey Volkov
Quoted 6 lines · Grant Likely
Quoted 3 lines · David H. Lynch Jr.

I am looking for a clue here. How do you produce a clean set of
granular patches including only what you want and not the all the steps and mis-steps along the way ?

Quoted 5 lines

Or use stg (http://www.procode.org/stgit/),
steps 1-2 you could made by
stg new
steps 3 trough 5 by :
stg refresh/stg export

cool! I need to try that

Thanks,
g.

Signature · 3 lines
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
(403) 663-0761