From: Stephen Haberman <stephen@exigencecorp.com>
Date: Wed, 15 Oct 2008 07:44:35 +0000 (-0500)
Subject: rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
X-Git-Tag: v1.6.1-rc1~95^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/72583e6c685a85b9354ee2310cec3d9240df3c0f?ds=inline;hp=--cc

rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD

If OLDHEAD was reordered in the todo, and its mapped NEWHEAD was used to set the
ref, commits reordered after OLDHEAD in the todo would should up as un-committed
changes.

Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

72583e6c685a85b9354ee2310cec3d9240df3c0f
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 30e45237a2..c9681178f7 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -376,20 +376,7 @@ do_next () {
 	HEADNAME=$(cat "$DOTEST"/head-name) &&
 	OLDHEAD=$(cat "$DOTEST"/head) &&
 	SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
-	if test -d "$REWRITTEN"
-	then
-		test -f "$DOTEST"/current-commit &&
-			current_commit=$(cat "$DOTEST"/current-commit) &&
-			git rev-parse HEAD > "$REWRITTEN"/$current_commit
-		if test -f "$REWRITTEN"/$OLDHEAD
-		then
-			NEWHEAD=$(cat "$REWRITTEN"/$OLDHEAD)
-		else
-			NEWHEAD=$OLDHEAD
-		fi
-	else
-		NEWHEAD=$(git rev-parse HEAD)
-	fi &&
+	NEWHEAD=$(git rev-parse HEAD) &&
 	case $HEADNAME in
 	refs/*)
 		message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&