merge: refuse to create too cool a merge by default

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 97c23c2e3180fad8e66365cfb80a4d7fa1e2f6b1..edb834187a1e4be0a3a0cc52157e09233d3644e1 100755 (executable)
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -426,4 +426,11 @@ test_expect_success 'filter commit message without trailing newline' '
        test_cmp expect actual
 '
 
+test_expect_success 'tree-filter deals with object name vs pathname ambiguity' '
+       test_when_finished "git reset --hard original" &&
+       ambiguous=$(git rev-list -1 HEAD) &&
+       git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
+       git show HEAD:$ambiguous
+'
+
 test_done