diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-23 18:46:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-23 12:31:37 -0700 |
| commit | c8fe1980b2b8e5c61f05a59d3bf9dedd5afa8faa (patch) | |
| tree | 23abd75d30d06526abbd6ba9f01da735c363f3f1 | |
| parent | a8ccc204c5daf4dae4071907499055d2dc9995db (diff) | |
| download | git-c8fe1980b2b8e5c61f05a59d3bf9dedd5afa8faa.tar.gz git-c8fe1980b2b8e5c61f05a59d3bf9dedd5afa8faa.tar.xz | |
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>
| -rwxr-xr-x | git-am.sh | 2 | ||||
| -rwxr-xr-x | t/t4151-am-abort.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 249093b6d..f45ab0a2e 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 ' |