diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
commit | c8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch) | |
tree | 24e09d9f84dec336720cf393e156089ca2835791 /t/t9601-cvsimport-vendor-branch.sh | |
parent | Initial commit. (diff) | |
download | git-17a789943131483bc454986d1be6da6caaabce8c.tar.xz git-17a789943131483bc454986d1be6da6caaabce8c.zip |
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 't/t9601-cvsimport-vendor-branch.sh')
-rwxr-xr-x | t/t9601-cvsimport-vendor-branch.sh | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh new file mode 100755 index 0000000..116cddb --- /dev/null +++ b/t/t9601-cvsimport-vendor-branch.sh @@ -0,0 +1,88 @@ +#!/bin/sh + +# Description of the files in the repository: +# +# imported-once.txt: +# +# Imported once. 1.1 and 1.1.1.1 should be identical. +# +# imported-twice.txt: +# +# Imported twice. HEAD should reflect the contents of the +# second import (i.e., have the same contents as 1.1.1.2). +# +# imported-modified.txt: +# +# Imported, then modified on HEAD. HEAD should reflect the +# modification. +# +# imported-modified-imported.txt: +# +# Imported, then modified on HEAD, then imported again. +# +# added-imported.txt,v: +# +# Added with 'cvs add' to create 1.1, then imported with +# completely different contents to create 1.1.1.1, therefore the +# vendor branch was never the default branch. +# +# imported-anonymously.txt: +# +# Like imported-twice.txt, but with a vendor branch whose branch +# tag has been removed. + +test_description='git cvsimport handling of vendor branches' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./lib-cvs.sh + +setup_cvs_test_repository t9601 + +test_expect_success PERL 'import a module with a vendor branch' ' + + git cvsimport -C module-git module + +' + +test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co main' + +test_expect_success PERL 'check main out of git repository' 'test_git_co main' + +test_expect_success PERL 'check a file that was imported once' ' + + test_cmp_branch_file main imported-once.txt + +' + +test_expect_failure PERL 'check a file that was imported twice' ' + + test_cmp_branch_file main imported-twice.txt + +' + +test_expect_success PERL 'check a file that was imported then modified on HEAD' ' + + test_cmp_branch_file main imported-modified.txt + +' + +test_expect_success PERL 'check a file that was imported, modified, then imported again' ' + + test_cmp_branch_file main imported-modified-imported.txt + +' + +test_expect_success PERL 'check a file that was added to HEAD then imported' ' + + test_cmp_branch_file main added-imported.txt + +' + +test_expect_success PERL 'a vendor branch whose tag has been removed' ' + + test_cmp_branch_file main imported-anonymously.txt + +' + +test_done |