[PATCH] rebase -i: When an 'edit' stops, mention the commit

[PATCH] rebase -i: When an 'edit' stops, mention the commit

[Johannes Sixt]

From: Johannes Sixt <johannes.sixt@telecom.at>

In a rebase session where more than one commit is to be 'edit'ed, and the
user spends considerable time to 'edit' a commit, it is easy to forget what
one wanted to 'edit' at the individual commits. It would be helpful to see
at which commit the rebase stopped.

Incidentally, if the rebase stopped due to merge conflicts or other errors,
the commit was already reported ("Could not apply $sha1..."), but when
rebase stopped after successfully applying an "edit" commit, it would not
mention it. With this change the commit is reported.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index e63a864..4e334ba 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -277,7 +277,7 @@ do_next () {
 			die_with_patch $sha1 "Could not apply $sha1... $rest"
 		make_patch $sha1
 		: > "$DOTEST"/amend
-		warn
+		warn "Stopped at $sha1... $rest"
 		warn "You can amend the commit now, with"
 		warn
 		warn "	git commit --amend"
-- 
1.6.0.rc0.956.g7bc0

	

Re: [PATCH] rebase -i: When an 'edit' stops, mention the commit

[Johannes Schindelin]

Hi,

On Wed, 23 Jul 2008, Johannes Sixt wrote:

> In a rebase session where more than one commit is to be 'edit'ed, and 
> the user spends considerable time to 'edit' a commit, it is easy to 
> forget what one wanted to 'edit' at the individual commits. It would be 
> helpful to see at which commit the rebase stopped.

"... So mention it."

ACK.

Ciao,
Dscho