{"thread":{"id":"14633","subject":"[PATCH] git-am: Add colon before the subject that is printed out as being applied","startedAt":"2008-07-23T16:46:36Z","lastAt":"2008-07-23T16:46:36Z","messageCount":1,"participants":["Stephan Beyer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84544","messageId":"1216831596-30870-1-git-send-email-s-beyer@gmx.net","threadId":"14633","inReplyTo":null,"subject":"[PATCH] git-am: Add colon before the subject that is printed out as being applied","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-07-23T16:46:36Z","receivedAt":"2008-07-23T16:46:36Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"git-am output can be confusing, because the subject of the applied\npatch can look like the rest of a sentence starting with \"Applying\".\nThe added colon should make this clearer.\n\nSigned-off-by: Stephan Beyer <s-beyer@gmx.net>\n---\nHi,\n\nLinus added single quotes to applypatch in 610968199,\nwriting:\n\n    Add quotes around the subject line that we print out as being applied.\n\n    My brain just flipped when it tried to read the \"Applying\" as part\n    of the explanation of the patch, and the sentence didn't make any\n    sense. The quotes make it clear what's going on.\n\nI think he is right ;)\n\nOf course, it's debatable whether\n\tApplying: foo\nor\n\tApplying \"foo\"\nor\n\tApplying 'foo'\nmay be the best. I don't really care :)\n\nThe main reason I chose the colon variant is because the change in t4151\nis less ugly.\n\nAnother reason: thinking of \"ambiguous\" subjects:\n -\tApplying \"Remove \"string\" from foo.c\"\n -\tApplying 'Remove 'string' from foo.sh'\n -\tApplying: foo.c: Remove \"string\"\n\nRegards,\n  Stephan\n\n git-am.sh           |    2 +-\n t/t4151-am-abort.sh |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex 7864b5f..f4abd9d 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -456,7 +456,7 @@ do\n \t\tstop_here $this\n \tfi\n \n-\tprintf 'Applying %s\\n' \"$FIRSTLINE\"\n+\tprintf 'Applying: %s\\n' \"$FIRSTLINE\"\n \n \tcase \"$resolved\" in\n \t'')\ndiff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh\nindex 249093b..f45ab0a 100755\n--- a/t/t4151-am-abort.sh\n+++ b/t/t4151-am-abort.sh\n@@ -43,7 +43,7 @@ do\n \n \ttest_expect_success \"am$with3 --skip continue after failed am$with3\" '\n \t\ttest_must_fail git-am$with3 --skip >output &&\n-\t\ttest \"$(grep \"^Applying\" output)\" = \"Applying 6\" &&\n+\t\ttest \"$(grep \"^Applying\" output)\" = \"Applying: 6\" &&\n \t\ttest_cmp file-2-expect file-2 &&\n \t\ttest ! -f .git/rr-cache/MERGE_RR\n \t'\n-- \n1.6.0.rc0.102.ga1791\n"}]}