diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2010-01-14 06:54:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-14 00:27:56 -0800 |
| commit | 50438340bcadd790956b5081b8a16cba28156e22 (patch) | |
| tree | 7defbfa4755c8c5bc6456c87ca385226a60b879d /git-rebase--interactive.sh | |
| parent | 1d621fea180e2612facb190b758bf03dc79e4423 (diff) | |
| download | git-50438340bcadd790956b5081b8a16cba28156e22.tar.gz | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index db10dd7b29..aae94d2f6f 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 |