# [PATCH] additional help when editing during interactive rebase 6 messages from 2008-01-09 to 2008-01-11. Participants: William Morgan, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/11545 ## William Morgan, 2008-01-09 02:32 Subject: [PATCH] additional help when editing during interactive rebase Message-ID: <1199845915-sup-797@south> URL: https://gitlist.dev/e/1199845915-sup-797%40south ``` I personally would have found this message useful the first time I used git rebase --interactive. YMMV. Signed-off-by: William Morgan --- git-rebase--interactive.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index acdcc54..d53d283 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -263,6 +263,10 @@ do_next () { warn warn " git commit --amend" warn + warn "Once amended, continue with" + warn + warn " git rebase --continue" + warn exit 0 ;; squash|s) -- 1.5.4.rc2.68.ge708a-dirty -- William ``` ## Junio C Hamano, 2008-01-09 02:55 Subject: Re: [PATCH] additional help when editing during interactive rebase Message-ID: <7vsl17pv1c.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vsl17pv1c.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1199845915-sup-797@south> ``` William Morgan writes: > I personally would have found this message useful the first time I used > git rebase --interactive. YMMV. Aside from this message being inappropriate as a proposed commit log message, I think what the patch tries to achieve is a worthy UI improvement. I would have removed those empty lines around the instruction if I were patching this, though. Losing 5 lines out of 25-line terminal was marginally Ok. Losing 9 lines 4 lines too many and is unacceptable. Thoughts? > Signed-off-by: William Morgan > --- > git-rebase--interactive.sh | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index acdcc54..d53d283 100755 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -263,6 +263,10 @@ do_next () { > warn > warn " git commit --amend" > warn > + warn "Once amended, continue with" > + warn > + warn " git rebase --continue" > + warn > exit 0 > ;; > squash|s) > -- > 1.5.4.rc2.68.ge708a-dirty > > > -- > William ``` ## William Morgan, 2008-01-09 03:29 Subject: [PATCH] additional help when editing during interactive rebase Message-ID: <1199849225-sup-6981@south> URL: https://gitlist.dev/e/1199849225-sup-6981%40south In-Reply-To: <7vsl17pv1c.fsf@gitster.siamese.dyndns.org> ``` Let the user know how to continue a rebase after amending a commit during a git rebase --interactive session. Signed-off-by: William Morgan --- git-rebase--interactive.sh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index acdcc54..ccef1ac 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -258,11 +258,10 @@ do_next () { die_with_patch $sha1 "Could not apply $sha1... $rest" make_patch $sha1 : > "$DOTEST"/amend - warn warn "You can amend the commit now, with" - warn warn " git commit --amend" - warn + warn "Once amended, continue with" + warn " git rebase --continue" exit 0 ;; squash|s) -- 1.5.4.rc2.69.g10f0 -- William ``` ## Johannes Schindelin, 2008-01-09 11:23 Subject: Re: [PATCH] additional help when editing during interactive rebase Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0801091120150.31053%40racer.site In-Reply-To: <7vsl17pv1c.fsf@gitster.siamese.dyndns.org> ``` Hi, On Tue, 8 Jan 2008, Junio C Hamano wrote: > I would have removed those empty lines around the instruction if I were > patching this, though. Losing 5 lines out of 25-line terminal was > marginally Ok. Losing 9 lines 4 lines too many and is unacceptable. > > Thoughts? I wonder if it would not make even more sense to record the current HEAD name, and call "commit --amend" if it is the same upon "--continue". Note that "commit --amend" is _already_ called automatically if the index is dirty (but agrees with the working directory). Then the user would be spared some additional typing, and the help could be changed to hint at "rebase --continue". It also would make things more consistent. Ciao, Dscho ``` ## Junio C Hamano, 2008-01-11 08:42 Subject: Re: [PATCH] additional help when editing during interactive rebase Message-ID: <7vprw83g8z.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vprw83g8z.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Johannes Schindelin writes: > Hi, > > On Tue, 8 Jan 2008, Junio C Hamano wrote: > >> I would have removed those empty lines around the instruction if I were >> patching this, though. Losing 5 lines out of 25-line terminal was >> marginally Ok. Losing 9 lines 4 lines too many and is unacceptable. >> >> Thoughts? > > I wonder if it would not make even more sense to record the current HEAD > name, and call "commit --amend" if it is the same upon "--continue". My understanding of the original issue is that "git-rebase -i" stops at 'edit' and gives the user a chance to muck with the commit, saying "do whatever you want now and then record the result with git commit --amend". The user can follow that but then needs to say "git rebase --continue" after that. The insn does not talk about it, so after running "git commit --amend" as told, a clueless user is left wondering "huh, and then now what?". Do you mean you would instead suggest "git rebase --continue" in the insn, and make the workflow like this: $ git rebase -i ... Now do whatever you want and say "rebase --continue" $ edit foo.c $ git add foo.c $ git rebase --continue and have "rebase --continue" to continue with the modified contents recorded in the index, invoking "git commit --amend", but doing so only if the user hasn't run "git commit" with or without --amend yet? It feels like a better automation than what we currently have, but I somewhat worry how that would change the user experience for using 'edit' to split a commit into two or more. ``` ## Johannes Schindelin, 2008-01-11 11:29 Subject: Re: [PATCH] additional help when editing during interactive rebase Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0801111147440.14355%40wbgn129.biozentrum.uni-wuerzburg.de In-Reply-To: <7vprw83g8z.fsf@gitster.siamese.dyndns.org> ``` Hi, On Fri, 11 Jan 2008, Junio C Hamano wrote: > Do you mean you would instead suggest "git rebase --continue" in > the insn, and make the workflow like this: > > $ git rebase -i ... > Now do whatever you want and say "rebase --continue" > $ edit foo.c > $ git add foo.c > $ git rebase --continue > > and have "rebase --continue" to continue with the modified > contents recorded in the index, invoking "git commit --amend", > but doing so only if the user hasn't run "git commit" with or > without --amend yet? Yes, exactly. > It feels like a better automation than what we currently have, > but I somewhat worry how that would change the user experience > for using 'edit' to split a commit into two or more. If you want to split a commit into two or more, you will already have committed twice when you say "--continue", and all is fine. However, if you do the first commit, and then only add the files for the second commit, the HEAD's commit name has changed! And so, rebase can pick up on that, and avoid the --amend. IOW something like below. However, this patch does not yet make "rebase -i" call "commit --amend" automatically when both the index and HEAD are unchanged. -- snipsnap -- [PATCH] rebase -i: only ever commit --amend when HEAD is untouched When a commit is marked to edit, and the index is dirty when "rebase --continue" is called, that state will be committed with the "--amend" option. However, this is wrong when the user wanted to split the commit. Luckily, we can pick up on that, by recording the HEAD's name in the file "amend", and only --amend when no commit was made in the interim. Signed-off-by: Johannes Schindelin --- git-rebase--interactive.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index acdcc54..4a8a980 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -257,7 +257,7 @@ do_next () { pick_one $sha1 || die_with_patch $sha1 "Could not apply $sha1... $rest" make_patch $sha1 - : > "$DOTEST"/amend + git rev-parse HEAD > "$DOTEST"/amend warn warn "You can amend the commit now, with" warn @@ -378,7 +378,9 @@ do else . "$DOTEST"/author-script || die "Cannot find the author identity" - if test -f "$DOTEST"/amend + if test -f "$DOTEST"/amend && + test $(git rev-parse HEAD) = \ + $(cat "$DOTEST"/amend) then git reset --soft HEAD^ || die "Cannot rewind the HEAD" ```