diff options
Diffstat (limited to 'third_party/git/t/t9350-fast-export.sh')
| -rwxr-xr-x | third_party/git/t/t9350-fast-export.sh | 71 |
1 files changed, 7 insertions, 64 deletions
diff --git a/third_party/git/t/t9350-fast-export.sh b/third_party/git/t/t9350-fast-export.sh index 690c90fb82..b4004e05c2 100755 --- a/third_party/git/t/t9350-fast-export.sh +++ b/third_party/git/t/t9350-fast-export.sh @@ -53,33 +53,6 @@ test_expect_success 'fast-export | fast-import' ' ' -test_expect_success 'fast-export ^muss^{commit} muss' ' - git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual && - cat >expected <<-EOF && - tag muss - from $(git rev-parse --verify muss^{commit}) - $(git cat-file tag muss | grep tagger) - data 9 - valentin - - EOF - test_cmp expected actual -' - -test_expect_success 'fast-export --mark-tags ^muss^{commit} muss' ' - git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual && - cat >expected <<-EOF && - tag muss - mark :1 - from $(git rev-parse --verify muss^{commit}) - $(git cat-file tag muss | grep tagger) - data 9 - valentin - - EOF - test_cmp expected actual -' - test_expect_success 'fast-export master~2..master' ' git fast-export master~2..master >actual && @@ -540,41 +513,10 @@ test_expect_success 'tree_tag' ' ' # NEEDSWORK: not just check return status, but validate the output -# Note that these tests DO NOTHING other than print a warning that -# they are omitting the one tag we asked them to export (because the -# tags resolve to a tree). They exist just to make sure we do not -# abort but instead just warn. 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 'handling tags of blobs' ' - git tag -a -m "Tag of a blob" blobtag $(git rev-parse master:file) && - git fast-export blobtag >actual && - cat >expect <<-EOF && - blob - mark :1 - data 9 - die Luft - - tag blobtag - from :1 - tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 14 - Tag of a blob - - EOF - test_cmp expect actual -' - -test_expect_success 'handling nested tags' ' - git tag -a -m "This is a nested tag" nested muss && - git fast-export --mark-tags nested >output && - grep "^from $ZERO_OID$" output && - grep "^tag nested$" output >tag_lines && - test_line_count = 2 tag_lines -' - test_expect_success 'directory becomes symlink' ' git init dirtosymlink && git init result && @@ -600,10 +542,9 @@ test_expect_success 'directory becomes symlink' ' test_expect_success 'fast-export quotes pathnames' ' git init crazy-paths && - test_config -C crazy-paths core.protectNTFS false && (cd crazy-paths && blob=$(echo foo | git hash-object -w --stdin) && - git -c core.protectNTFS=false update-index --add \ + git update-index --add \ --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \ --cacheinfo 100644 $blob "path with \"quote\"" \ --cacheinfo 100644 $blob "path with \\backslash" \ @@ -626,15 +567,17 @@ test_expect_success 'fast-export quotes pathnames' ' ' test_expect_success 'test bidirectionality' ' + >marks-cur && + >marks-new && git init marks-test && - git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \ - git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new && + git fast-export --export-marks=marks-cur --import-marks=marks-cur --branches | \ + git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks=marks-new && (cd marks-test && git reset --hard && echo Wohlauf > file && git commit -a -m "back in time") && - git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \ - git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur + git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks=marks-new --branches | \ + git fast-import --export-marks=marks-cur --import-marks=marks-cur ' cat > expected << EOF |