X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9350-fast-export.sh;h=8c8e679468f4b191f93ca68a973d4d58fa1b72d2;hb=0c61c6de3497900616b66a65dc41b27544131ed5;hp=69179c61247bf05bc287c2a4b16ce2762dc4ac47;hpb=f15652d90c37ca56db08d325c871f2cc8f7d509e;p=git.git diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 69179c612..8c8e67946 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -355,6 +355,20 @@ test_expect_failure 'no exact-ref revisions included' ' ) ' +test_expect_success 'path limiting with import-marks does not lose unmodified files' ' + git checkout -b simple marks~2 && + git fast-export --export-marks=marks simple -- file > /dev/null && + echo more content >> file && + test_tick && + git commit -mnext file && + 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 //"` && @@ -376,7 +390,7 @@ 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' ' +test_expect_success SYMLINKS 'directory becomes symlink' ' git init dirtosymlink && git init result && (