This test would fail at the moment. --- t/t9300-fast-import.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 2fcf269..2a8368e 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1039,6 +1039,37 @@ test_expect_success \ git diff-tree -M -r M3^ M3 >actual && compare_diff_raw expect actual' +cat >input <<INPUT_END +blob +mark :1 +data 10 +test file + +reset refs/heads/M4 +commit refs/heads/M4 +mark :2 +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data 8 +initial +M 100644 :1 testname + +commit refs/heads/M5 +mark :3 +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data 8 +initial +from refs/heads/M4 +M 100644 :1 testname/testfile +D testname + +INPUT_END + +test_expect_success \ + 'M: rename file into new subdirectory with same name' \ + 'git fast-import <input && + git checkout M5 && + test -d testname && test -f testname/testfile' + ### ### series N ### -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html