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 <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephan Beyer committed
Jul 23, 2008 at 18:46 UTC
c8fe1980b2b8e5c61f05a59d3bf9dedd5afa8faa
2 files changed
+2
-2
git-am.sh
+1
-1
@@ -456,7 +456,7 @@ do
456
stop_here $this
457
fi
458
459
- printf 'Applying %s\n' "$FIRSTLINE"
459
+ printf 'Applying: %s\n' "$FIRSTLINE"
460
461
case "$resolved" in
462
'')
t/t4151-am-abort.sh
+1
-1
@@ -43,7 +43,7 @@ do
43
44
test_expect_success "am$with3 --skip continue after failed am$with3" '
45
test_must_fail git-am$with3 --skip >output &&
46
- test "$(grep "^Applying" output)" = "Applying 6" &&
46
+ test "$(grep "^Applying" output)" = "Applying: 6" &&
47
test_cmp file-2-expect file-2 &&
48
test ! -f .git/rr-cache/MERGE_RR
49
'