Skip to content

Commit

Permalink
git-am: Add colon before the subject that is printed out as being app…
Browse files Browse the repository at this point in the history 
…lied

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>
  • Loading branch information
Stephan Beyer authored and Junio C Hamano committed Jul 23, 2008
1 parent a8ccc20 commit c8fe198
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion git-am.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ do
stop_here $this
fi

printf 'Applying %s\n' "$FIRSTLINE"
printf 'Applying: %s\n' "$FIRSTLINE"

case "$resolved" in
'')
Expand Down
2 changes: 1 addition & 1 deletion t/t4151-am-abort.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand Down

0 comments on commit c8fe198

Please sign in to comment.