From c8fe1980b2b8e5c61f05a59d3bf9dedd5afa8faa Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Wed, 23 Jul 2008 18:46:36 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-am.sh | 2 +- t/t4151-am-abort.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-am.sh b/git-am.sh index 7864b5f588..f4abd9db15 100755 --- a/git-am.sh +++ b/git-am.sh @@ -456,7 +456,7 @@ do stop_here $this fi - printf 'Applying %s\n' "$FIRSTLINE" + printf 'Applying: %s\n' "$FIRSTLINE" case "$resolved" in '') diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 249093b6d0..f45ab0a2e8 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -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 ' -- 2.11.4.GIT