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

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

[Stephan Beyer]

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>
---
Hi,

Linus added single quotes to applypatch in 610968199,
writing:

    Add quotes around the subject line that we print out as being applied.

    My brain just flipped when it tried to read the "Applying" as part
    of the explanation of the patch, and the sentence didn't make any
    sense. The quotes make it clear what's going on.

I think he is right ;)

Of course, it's debatable whether
	Applying: foo
or
	Applying "foo"
or
	Applying 'foo'
may be the best. I don't really care :)

The main reason I chose the colon variant is because the change in t4151
is less ugly.

Another reason: thinking of "ambiguous" subjects:
 -	Applying "Remove "string" from foo.c"
 -	Applying 'Remove 'string' from foo.sh'
 -	Applying: foo.c: Remove "string"

Regards,
  Stephan

 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 7864b5f..f4abd9d 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 249093b..f45ab0a 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
 	'
-- 
1.6.0.rc0.102.ga1791