projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa7eaff
)
rebase -i: Use "test -n" instead of "test ! -z"
author
Michael Haggerty
<mhagger@alum.mit.edu>
Thu, 14 Jan 2010 05:54:43 +0000
(06:54 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Jan 2010 08:27:56 +0000
(
00:27
-0800)
It is a tiny bit simpler.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
patch
|
blob
|
history
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index 6fd3105b54de73ab43744074eb20a2f907e0a0c2..2e1b2fa3cc698bceb8fc1de40b83e3da804ee181 100755
(executable)
--- 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