]> git.ipfire.org Git - thirdparty/git.git/commit
t3310: extract common notes_merge_files_gone()
authorDenton Liu <liu.denton@gmail.com>
Tue, 7 Jan 2020 04:53:06 +0000 (23:53 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2020 20:56:02 +0000 (12:56 -0800)
commit86ce6e0dd195d0b0494b0866c4b2771141a3c06c
treecbdcb083d8f7c6a2095e09d0d544f16574badfc6
parent245b9ba0ba51a9e19f77a2a96a82a4f021d4a9fc
t3310: extract common notes_merge_files_gone()

We have many statements which are duplicated. Extract and replace these
duplicate statements with notes_merge_files_gone().

While we're at it, replace the test_might_fail(), which should only be
used on git commands.

Also, remove the redirection from stderr to /dev/null. This is because
the test scripts automatically suppress output already. Otherwise, if a
developer asks for verbose output via the `-v` flag, the stderr output
may be useful for debugging.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3310-notes-merge-manual-resolve.sh