[PATCH 02/18] rebase -i: Remove dead code
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 14, 2010, 05:54 UTC
- Message-ID
- <affe8160c091f8f329b4bbc16d7c9641b1483296.1263447037.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1263447037.git.mhagger@alum.mit.edu>
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> --- 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 fba8fb6..c6174bb 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -169,7 +169,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
-- 1.6.6