зеркало из https://github.com/microsoft/git.git
git-am: re-fix the diag message printing
The $FIRSTLINE variable is from the user's commit and can contain arbitrary backslash escapes that may be (mis)interpreted when given to "echo", depending on the implementation. Use "printf" to work around the issue. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a70d4100d0
Коммит
4d2e283a1e
|
@ -501,7 +501,7 @@ do
|
||||||
fi
|
fi
|
||||||
if test $apply_status != 0
|
if test $apply_status != 0
|
||||||
then
|
then
|
||||||
echo "Patch failed at $msgnum $FIRSTLINE"
|
printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
|
||||||
stop_here_user_resolve $this
|
stop_here_user_resolve $this
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче