Re: [PATCH] git-rebase-interactive: avoid breaking when GREP_OPTIONS="-H"
From: Dave Rodgman <hidden>
Date: 2016-06-15 22:47:22
On Mon, 07 Sep 2009 05:56 -0700, "Carlo Marcelo Arenas Belon" [off-list ref] wrote:
if GREP_OPTIONS is set and includes -H, using `grep -c` will fail to generate a numeric count and result in the following error : /usr/libexec/git-core/git-rebase--interactive: line 110: (standard input):1+(standard input):0: missing `)' (error token is "input):1+(standard input):0")
I think in my case, grep is being confused by colours being enabled - I have this wrapper script for grep: #!/bin/bash echo $@ `which -a grep|/bin/grep -v $0|head -n 1` --color=auto $@ your patch fixes it though. thanks Dave
quoted hunk ↗ jump to hunk
instead of grep counting use `wc -l` to return the line count. Signed-off-by: Carlo Marcelo Arenas Belon <redacted> --- git-rebase--interactive.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 23ded48..c12d980 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh@@ -106,8 +106,8 @@ mark_action_done () { sed -e 1q < "$TODO" >> "$DONE" sed -e 1d < "$TODO" >> "$TODO".new mv -f "$TODO".new "$TODO" - count=$(grep -c '^[^#]' < "$DONE") - total=$(($count+$(grep -c '^[^#]' < "$TODO"))) + count=$(grep '^[^#]' < "$DONE" | wc -l) + total=$(($count+$(grep '^[^#]' < "$TODO" | wc -l))) if test "$last_count" != "$count" then last_count=$count-- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html