From 214123c6457d9706716dbdd608d03262e348a121 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 8 Mar 2016 15:51:36 -0800 Subject: [PATCH] rebase-i: clarify "is this commit relevant?" test 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 --- git-rebase--interactive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index b938a6d4a..773ccd474 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,