summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-08 15:51:36 -0800
committerJunio C Hamano <gitster@pobox.com>2016-03-10 15:35:48 -0800
commit214123c6457d9706716dbdd608d03262e348a121 (patch)
treea3c67598abcf7d79966127e4b7ed663f1049f7d4 /git-rebase--interactive.sh
parent71b401032b9e5b0a71e41d95ae0998858787700c (diff)
downloadgit-214123c6457d9706716dbdd608d03262e348a121.tar.gz
rebase-i: clarify "is this commit relevant?" testjc/sane-grep
While I was checking all the call sites of sane_grep and sane_egrep, I noticed this one is somewhat strangely written. The lines in the file sane_grep works on all begin with 40-hex object name, so there is no real risk of confusing "test $(...) = ''" by finding something that begins with a dash, but using the status from sane_grep makes it a lot clearer what is going on. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b938a6d4aa..773ccd4746 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1237,7 +1237,8 @@ then
git rev-list $revisions |
while read rev
do
- if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
+ if test -f "$rewritten"/$rev &&
+ ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null
then
# Use -f2 because if rev-list is telling us this commit is
# not worthwhile, we don't want to track its multiple heads,