[PATCH] git-rebase-interactive: avoid breaking when GREP_OPTIONS="-H"
- From
Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
- Date
- Sep 7, 2009, 12:56 UTC
- Message-ID
- <1252328160-4359-1-git-send-email-carenas@sajinet.com.pe>
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")
instead of grep counting use `wc -l` to return the line count.
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> --- 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