diff options
| author | Elijah Newren <newren@gmail.com> | 2010-07-09 07:10:51 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-09 16:10:54 -0700 |
| commit | f15652d90c37ca56db08d325c871f2cc8f7d509e (patch) | |
| tree | e7f63464b2043ef4c36a958dd4b1373ee79104e4 /t/t9350-fast-export.sh | |
| parent | d599e0484f8ebac8cc50e9557a4c3d246826843d (diff) | |
| download | git-f15652d90c37ca56db08d325c871f2cc8f7d509e.tar.gz | |
Add additional testcases for D/F conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9350-fast-export.sh')
| -rwxr-xr-x | t/t9350-fast-export.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index d43f37ccaf..69179c6124 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -376,4 +376,28 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' +test_expect_failure 'directory becomes symlink' ' + git init dirtosymlink && + git init result && + ( + cd dirtosymlink && + mkdir foo && + mkdir bar && + echo hello > foo/world && + echo hello > bar/world && + git add foo/world bar/world && + git commit -q -mone && + git rm -r foo && + ln -s bar foo && + git add foo && + git commit -q -mtwo + ) && + ( + cd dirtosymlink && + git fast-export master -- foo | + (cd ../result && git fast-import --quiet) + ) && + (cd result && git show master:foo) +' + test_done |