diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-08 04:02:13 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-09 03:24:19 +0200 |
| commit | 3df0a859aa5cc68a2bd616cb686f01cf0e2468c1 (patch) | |
| tree | c2e8e6999e4cdcd07d94805d8621a7d471d4344c /git-rebase--interactive.sh | |
| parent | rebase -i: handle --continue more like non-interactive rebase (diff) | |
| download | git-3df0a859aa5cc68a2bd616cb686f01cf0e2468c1.tar.xz git-3df0a859aa5cc68a2bd616cb686f01cf0e2468c1.zip | |
rebase -i: actually show the diffstat when being verbose
The "while" loop in the function do_rest is not supposed to ever be
exited. Instead, the function do_one checks if there is nothing left,
and cleans up and exits if that is the case. So the diffstat code
belongs there.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | git-rebase--interactive.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 705178f7e9..1a064af381 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -239,7 +239,10 @@ do_next () { fi && message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" && git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && - git symbolic-ref HEAD $HEADNAME && + git symbolic-ref HEAD $HEADNAME && { + test ! -f "$DOTEST"/verbose || + git diff --stat $(cat "$DOTEST"/head)..HEAD + } && rm -rf "$DOTEST" && warn "Successfully rebased and updated $HEADNAME." @@ -251,9 +254,6 @@ do_rest () { do do_next done - test -f "$DOTEST"/verbose && - git diff --stat $(cat "$DOTEST"/head)..HEAD - exit } while case $# in 0) break ;; esac |