revisions: split out handle_revision_pseudo_opt function

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index b54e840ee2ab09a67afc663a2f475bfc9fcb9d8b..ef84f04102ed067768c66ea9608b98d47851eb8b 100755 (executable)
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -150,9 +150,15 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
        git rm -fr . &&
        git checkout --orphan new &&
        cp important c0.c &&
+       test_must_fail git merge c0 2>out
+'
+
+test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' '
+       test_cmp out expect
+'
+
+test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
        test_when_finished "rm c0.c" &&
-       test_must_fail git merge c0 2>out &&
-       test_cmp out expect &&
        test_path_is_missing .git/MERGE_HEAD &&
        test_cmp important c0.c
 '