X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9350-fast-export.sh;h=8c8e679468f4b191f93ca68a973d4d58fa1b72d2;hb=0c61c6de3497900616b66a65dc41b27544131ed5;hp=6069e1f8312527f2c3d3d93180543f4ab911b257;hpb=4087a02e452aafd0e9a6c3471c40fe76d6aafbe4;p=git.git diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 6069e1f83..8c8e67946 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -364,6 +364,11 @@ test_expect_success 'path limiting with import-marks does not lose unmodified fi git fast-export --import-marks=marks simple -- file file0 | grep file0 ' +test_expect_success 'full-tree re-shows unmodified files' ' + git checkout -f simple && + test $(git fast-export --full-tree simple | grep -c file0) -eq 3 +' + test_expect_success 'set-up a few more tags for tag export tests' ' git checkout -f master && HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` && @@ -385,4 +390,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_success SYMLINKS '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