зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
1d621fea18
Коммит
50438340bc
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче