development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-am: Add colon before the subject that is printed out as being applied

Browse source 
git-am output can be confusing, because the subject of the applied
patch can look like the rest of a sentence starting with "Applying".
The added colon should make this clearer.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephan Beyer 2008-07-23 18:46:36 +02:00 committed by Junio C Hamano
parent a8ccc204c5
commit c8fe1980b2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-am.sh
View file

@ -456,7 +456,7 @@ do
stop_here $this
fi
printf 'Applying %s\n' "$FIRSTLINE"
printf 'Applying: %s\n' "$FIRSTLINE"
case "$resolved" in
'')

2
t/t4151-am-abort.sh
View file

@ -43,7 +43,7 @@ do
test_expect_success "am$with3 --skip continue after failed am$with3" '
test_must_fail git-am$with3 --skip >output &&
test "$(grep "^Applying" output)" = "Applying 6" &&
test "$(grep "^Applying" output)" = "Applying: 6" &&
test_cmp file-2-expect file-2 &&
test ! -f .git/rr-cache/MERGE_RR
'