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 db10dd7b296db75906760adb7417cf6681d3cea0..aae94d2f6f3b883ffffc4fc453e97dea151c9f80 100755 (executable)
--- 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