Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data
From: Jeff King <hidden>
Date: 2016-06-15 23:08:39
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data · Torsten Bögershausen <hidden>
- 2016-06-15 · Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data · Anders Kaseorg <hidden>
- 2016-06-15 · [PATCH] rebase -p: avoid grep on potentailly non-ASCII data · Anders Kaseorg <hidden>
On Tue, Mar 08, 2016 at 03:36:26PM -0800, Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c0cfe88..4cde685 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh@@ -1233,7 +1233,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
Looks better. I think "-q" might be nicer still (and more efficient, though it almost certainly doesn't matter in practice). -Peff