Re: [PATCH 4/7] git-rebase--interactive.sh: look up subject in add_pick_line

2012-07-22 Thread Junio C Hamano
Martin von Zweigbergk writes: > After patch 7/7, cherry is used instead of rev-list. Ideally, I would > have liked to teach "git rev-list --cherry-pick" to somehow use a > just like cherry does, but I couldn't think of a generic way > of doing that (in this case, we want to say something like "r

Re: [PATCH 4/7] git-rebase--interactive.sh: look up subject in add_pick_line

2012-07-20 Thread Martin von Zweigbergk
Thanks for reviewing. On Fri, Jul 20, 2012 at 1:14 AM, Johannes Sixt wrote: > Am 7/18/2012 9:27, schrieb Martin von Zweigbergk: >> @@ -814,7 +814,8 @@ add_pick_line () { >> else >> comment_out= >> fi >> - printf '%s\n' "${comment_out}pick $1 $2" >>"$todo" >> + li

Re: [PATCH 4/7] git-rebase--interactive.sh: look up subject in add_pick_line

2012-07-20 Thread Johannes Sixt
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk: > @@ -814,7 +814,8 @@ add_pick_line () { > else > comment_out= > fi > - printf '%s\n' "${comment_out}pick $1 $2" >>"$todo" > + line=$(git rev-list -1 --pretty=oneline --abbrev-commit --abbrev=7 $1) > + printf '%

[PATCH 4/7] git-rebase--interactive.sh: look up subject in add_pick_line

2012-07-18 Thread Martin von Zweigbergk
The todo file is generated using (more-or-less) 'git rev-list $revisions --pretty=oneline --abbrev-commit --abbrev=7', i.e. by letting 'git rev-list' output both the abbreviated sha1 and the subject line. To allow us to more easily generate the list of commits to rebase by using commands that don't