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 /git-rebase.sh | |
parent | 7afa845edc09d2818af5fe67a0eb45ec579d1260 (diff) | |
download | git-c7965afd3dac7b9b6c1d4da27d3757e7d41aa060.tar.gz |
Avoid one-or-more (\+) non BRE in sed scripts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 1 insertions, 4 deletions
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 |