summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-09-01 02:17:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-09-01 02:35:30 -0700
commitc7965afd3dac7b9b6c1d4da27d3757e7d41aa060 (patch)
tree200c5acb7d4a4e9a62a1d6fa8c9948f2fd0c2f2d /git-rebase--interactive.sh
parentrebase -m: Fix incorrect short-logs of already applied commits. (diff)
downloadtgif-c7965afd3dac7b9b6c1d4da27d3757e7d41aa060.tar.xz
Avoid one-or-more (\+) non BRE in sed scripts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ec798a16e9..abc2b1c3e0 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"