Skip to content

Commit

Permalink
rebase -i: actually show the diffstat when being verbose
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Jul 9, 2007
1 parent 18640d9 commit 3df0a85
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand All @@ -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
Expand Down

0 comments on commit 3df0a85

Please sign in to comment.