From 89b9e31dd56705af01da2a1a3dc2d466172cb016 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 14 Nov 2017 11:17:52 -0500 Subject: notes: send "Automatic notes merge failed" messages to stderr All other error messages from notes use stderr. Do the same when alerting users of an unresolved notes merge. Fix the output redirection in t3310 and t3320 as well. Previously, the tests directed output to a file, but stderr was either not captured or not sent to the file due to the order of the redirection operators. Signed-off-by: Todd Zullinger Acked-by: Johan Herland Signed-off-by: Junio C Hamano --- t/t3320-notes-merge-worktrees.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t3320-notes-merge-worktrees.sh') diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index b9c3bc2487..10bfc8b947 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -61,7 +61,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' ' ( cd worktree2 && git config core.notesRef refs/notes/x && - test_must_fail git notes merge z 2>&1 >out && + test_must_fail git notes merge z >out 2>&1 && test_i18ngrep "Automatic notes merge failed" out && grep -v "A notes merge into refs/notes/x is already in-progress in" out ) && -- cgit v1.2.1