Skip to content

Commit c8fe198

Browse files
sbeyergitster
authored andcommitted
git-am: Add colon before the subject that is printed out as being applied
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a8ccc20 commit c8fe198

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

git-am.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ do
456456
stop_here $this
457457
fi
458458

459-
printf 'Applying %s\n' "$FIRSTLINE"
459+
printf 'Applying: %s\n' "$FIRSTLINE"
460460

461461
case "$resolved" in
462462
'')

t/t4151-am-abort.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ do
4343

4444
test_expect_success "am$with3 --skip continue after failed am$with3" '
4545
test_must_fail git-am$with3 --skip >output &&
46-
test "$(grep "^Applying" output)" = "Applying 6" &&
46+
test "$(grep "^Applying" output)" = "Applying: 6" &&
4747
test_cmp file-2-expect file-2 &&
4848
test ! -f .git/rr-cache/MERGE_RR
4949
'

0 commit comments

Comments
 (0)