From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jun 2009 21:14:00 +0000 (-0700)
Subject: Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint
X-Git-Tag: v1.6.3.3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67;p=thirdparty%2Fgit.git

Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint

* uk/maint-1.5.3-rebase-i-reflog:
  rebase--interactive: remote stray closing parenthesis

Conflicts:
	git-rebase--interactive.sh
---

a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67
diff --cc git-rebase--interactive.sh
index 314cd364b8,70cb2e30b4..f96d887d23
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -418,18 -156,10 +418,18 @@@ do_next () 
  	OLDHEAD=$(cat "$DOTEST"/head) &&
  	SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
  	NEWHEAD=$(git rev-parse HEAD) &&
 -	message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
 -	git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 -	git symbolic-ref HEAD $HEADNAME &&
 +	case $HEADNAME in
 +	refs/*)
- 		message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
++		message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
 +		git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 +		git symbolic-ref HEAD $HEADNAME
 +		;;
 +	esac && {
 +		test ! -f "$DOTEST"/verbose ||
 +			git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
 +	} &&
  	rm -rf "$DOTEST" &&
 +	git gc --auto &&
  	warn "Successfully rebased and updated $HEADNAME."
  
  	exit