diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
| commit | f6b06b459092520bd90e5a191589e2d4371ef7d1 (patch) | |
| tree | 0d40f7fc913c9cd303a0c3b6575393abd8380b9c /t/t5000-tar-tree.sh | |
| parent | e68f0a4e574f38beeac513e824b685965dda31b7 (diff) | |
| parent | df368fae35ce23f5b373cd567595063997bdb61c (diff) | |
| download | git-f6b06b459092520bd90e5a191589e2d4371ef7d1.zip git-f6b06b459092520bd90e5a191589e2d4371ef7d1.tar.gz git-f6b06b459092520bd90e5a191589e2d4371ef7d1.tar.bz2 | |
Merge branch 'rs/archive-add-file'
"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.
* rs/archive-add-file:
Makefile: use git-archive --add-file
archive: add --add-file
archive: read short blobs in archive.c::write_archive_entry()
Diffstat (limited to 't/t5000-tar-tree.sh')
| -rwxr-xr-x | t/t5000-tar-tree.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 37655a2..3ebb0d3 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -94,6 +94,16 @@ check_tar() { ' } +check_added() { + dir=$1 + path_in_fs=$2 + path_in_archive=$3 + + test_expect_success " validate extra file $path_in_archive" ' + diff -r $path_in_fs $dir/$path_in_archive + ' +} + test_expect_success 'setup' ' test_oid_cache <<-EOF obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a @@ -164,6 +174,25 @@ test_expect_success 'git-archive --prefix=olde-' ' check_tar with_olde-prefix olde- +test_expect_success 'git archive --add-file' ' + echo untracked >untracked && + git archive --add-file=untracked HEAD >with_untracked.tar +' + +check_tar with_untracked +check_added with_untracked untracked untracked + +test_expect_success 'git archive --add-file twice' ' + echo untracked >untracked && + git archive --prefix=one/ --add-file=untracked \ + --prefix=two/ --add-file=untracked \ + --prefix= HEAD >with_untracked2.tar +' + +check_tar with_untracked2 +check_added with_untracked2 untracked one/untracked +check_added with_untracked2 untracked two/untracked + test_expect_success 'git archive on large files' ' test_config core.bigfilethreshold 1 && git archive HEAD >b3.tar && |