Skip to content

Commit

Permalink
Avoid one-or-more (\+) non BRE in sed scripts.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Sep 1, 2007
1 parent 7afa845 commit c7965af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c7965af

Please sign in to comment.