[PATCH] rebase--interactive: do not use one-or-more (\+) in sed.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 1, 2007, 09:05 UTC
- Message-ID
- <7vejhiu565.fsf_-_@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vmyw6u5ca.fsf@gitster.siamese.dyndns.org>
This is a continuation of the other one to avoid one-or-more operator in sed. At the same time, it actually tightens error checking, because the numbers in the squash messages are not padded with leading zero and cannot begin with 0.
With this, I think we do not have any more use of one-or-more (\+) in sed scripts.
---
git-rebase--interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index ec798a1..abc2b1c 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -190,7 +190,7 @@ nth_string () { make_squash_message () { if test -f "$SQUASH_MSG"; then - COUNT=$(($(sed -n "s/^# This is [^0-9]*\([0-9]\+\).*/\1/p" \ + COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \ < "$SQUASH_MSG" | tail -n 1)+1)) echo "# This is a combination of $COUNT commits." sed -n "2,\$p" < "$SQUASH_MSG"