Merge branch 'sb/unpack-trees-super-prefix'

diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 7b7008970565931fa9f493af74b18e15354668d9..5ededd8e400e7e64faa1bd559d67251ecbf8608e 100755 (executable)
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -363,6 +363,14 @@ test_expect_success 'a/b (untracked) vs a, plus c/d case test.' '
        test -f a/b
 '
 
+test_expect_success 'read-tree supports the super-prefix' '
+       cat <<-EOF >expect &&
+               error: Updating '\''fictional/a'\'' would lose untracked files in it
+       EOF
+       test_must_fail git --super-prefix fictional/ read-tree -u -m "$treeH" "$treeM" 2>actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'a/b vs a, plus c/d case setup.' '
        rm -f .git/index &&
        rm -fr a &&