summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2010-01-14 05:54:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-14 08:27:56 (GMT)
commit50438340bcadd790956b5081b8a16cba28156e22 (patch)
tree7defbfa4755c8c5bc6456c87ca385226a60b879d
parent1d621fea180e2612facb190b758bf03dc79e4423 (diff)
downloadgit-50438340bcadd790956b5081b8a16cba28156e22.zip
git-50438340bcadd790956b5081b8a16cba28156e22.tar.gz
git-50438340bcadd790956b5081b8a16cba28156e22.tar.bz2
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>
-rwxr-xr-xgit-rebase--interactive.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index db10dd7..aae94d2 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