diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-09-01 02:17:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-01 02:35:30 -0700 |
| commit | c7965afd3dac7b9b6c1d4da27d3757e7d41aa060 (patch) | |
| tree | 200c5acb7d4a4e9a62a1d6fa8c9948f2fd0c2f2d | |
| parent | rebase -m: Fix incorrect short-logs of already applied commits. (diff) | |
| download | tgif-c7965afd3dac7b9b6c1d4da27d3757e7d41aa060.tar.xz | |
Avoid one-or-more (\+) non BRE in sed scripts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-rebase--interactive.sh | 2 | ||||
| -rwxr-xr-x | git-rebase.sh | 5 |
2 files changed, 2 insertions, 5 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" diff --git a/git-rebase.sh b/git-rebase.sh index 9cf005677c..3bd66b0a04 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -69,13 +69,10 @@ continue_merge () { 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 - git rev-list --pretty=oneline -1 "$cmt" | \ - sed 's/^[a-f0-9]\+ //' 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 |