зеркало из https://github.com/microsoft/git.git
Avoid one-or-more (\+) non BRE in sed scripts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
7afa845edc
Коммит
c7965afd3d
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче