From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Thu, 14 Jan 2010 05:54:41 +0000 (+0100)
Subject: rebase -i: Remove dead code
X-Git-Tag: v1.7.0-rc0~68^2~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50438340bcadd790956b5081b8a16cba28156e22;p=git.git

rebase -i: Remove dead code

This branch of the "if" is only executed if $no_ff is empty, which
only happens if $1 was not '-n'.  (This code has been dead since
1d25c8cf82eead72e11287d574ef72d3ebec0db1.)

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index db10dd7b2..aae94d2f6 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -167,7 +167,6 @@ pick_one () {
 	if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1"
 	then
 		output git reset --hard $sha1
-		test "a$1" = a-n && output git reset --soft $current_sha1
 		sha1=$(git rev-parse --short $sha1)
 		output warn Fast-forward to $sha1
 	else