summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2010-01-14 06:54:43 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-14 00:27:56 -0800
commit699f13ca9af6b045826b8d44c2f3870affd7823d (patch)
treeae1f7e710701fe011b4efa9455b5937e270fec22
parentrebase -i: Inline expression (diff)
downloadtgif-699f13ca9af6b045826b8d44c2f3870affd7823d.tar.xz
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>
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6fd3105b54..2e1b2fa3cc 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -156,7 +156,7 @@ pick_one () {
output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
test -d "$REWRITTEN" &&
pick_one_preserving_merges "$@" && return
- if test ! -z "$REBASE_ROOT"
+ if test -n "$REBASE_ROOT"
then
output git cherry-pick "$@"
return