rebase -i: Use "test -n" instead of "test ! -z"
It is a tiny bit simpler. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
aa7eaff8b1
commit
699f13ca9a
@ -156,7 +156,7 @@ pick_one () {
|
|||||||
output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
|
output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
|
||||||
test -d "$REWRITTEN" &&
|
test -d "$REWRITTEN" &&
|
||||||
pick_one_preserving_merges "$@" && return
|
pick_one_preserving_merges "$@" && return
|
||||||
if test ! -z "$REBASE_ROOT"
|
if test -n "$REBASE_ROOT"
|
||||||
then
|
then
|
||||||
output git cherry-pick "$@"
|
output git cherry-pick "$@"
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user