Avoid one-or-more (\+) non BRE in sed scripts.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ec798a16e98d7c503071d01fd79b3d156e77058c..abc2b1c3e06bf1904ed92a691e917e8718e9e299 100755 (executable)
--- 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
 
 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"
                        < "$SQUASH_MSG" | tail -n 1)+1))
                echo "# This is a combination of $COUNT commits."
                sed -n "2,\$p" < "$SQUASH_MSG"

diff --git a/git-rebase.sh b/git-rebase.sh
index 9cf005677c2936a7c2f14a00cc4e91670e2259f3..3bd66b0a04bac05a3447d68112d4d933480eaf04 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -69,13 +69,10 @@ continue_merge () {
                        die "$RESOLVEMSG"
                fi
                printf "Committed: %0${prec}d " $msgnum
                        die "$RESOLVEMSG"
                fi
                printf "Committed: %0${prec}d " $msgnum

-               git rev-list --pretty=oneline -1 HEAD | \
-                       sed 's/^[a-f0-9]\+ //'

        else
                printf "Already applied: %0${prec}d " $msgnum
        else
                printf "Already applied: %0${prec}d " $msgnum

-               git rev-list --pretty=oneline -1 "$cmt" | \
-                       sed 's/^[a-f0-9]\+ //'

        fi
        fi

+       git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'

 
        prev_head=`git rev-parse HEAD^0`
        # save the resulting commit so we can read-tree on it later
 
        prev_head=`git rev-parse HEAD^0`
        # save the resulting commit so we can read-tree on it later