On Tue, Mar 08, 2016 at 03:36:26PM -0800, Junio C Hamano wrote:

> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to