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 <gitster@pobox.com>
Junio C Hamano committed
Mar 8, 2016 at 15:51 UTC
214123c6457d9706716dbdd608d03262e348a121
1 file changed
+2
-1
git-rebase--interactive.sh
+2
-1
@@ -1237,7 +1237,8 @@ then
1237
git rev-list $revisions |
1238
while read rev
1239
do
1240
- if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
1240
+ if test -f "$rewritten"/$rev &&
1241
+ ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null
1242
then
1243
# Use -f2 because if rev-list is telling us this commit is
1244
# not worthwhile, we don't want to track its multiple heads,