diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2007-09-03 20:07:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-03 16:46:16 -0700 |
| commit | 8460b2fcd45668d91567c36a22ea4f1b14ba133d (patch) | |
| tree | df399f035df047c2236ff919e2654c5eff4fce0c /t | |
| parent | 7b95089c0f59a25bb1c506b6962eb64412c585eb (diff) | |
| download | git-8460b2fcd45668d91567c36a22ea4f1b14ba133d.tar.gz git-8460b2fcd45668d91567c36a22ea4f1b14ba133d.tar.xz | |
archive: specfile support (--pretty=format: in archive files)
Add support for a new attribute, specfile. Files marked as being
specfiles are expanded by git-archive when they are written to an
archive. It has no effect on worktree files. The same placeholders
as those for the option --pretty=format: of git-log et al. can be
used.
The attribute is useful for creating auto-updating specfiles. It is
limited by the underlying function format_commit_message(), though.
E.g. currently there is no placeholder for git-describe like output,
and expanded specfiles can't contain NUL bytes. That can be fixed
in format_commit_message() later and will then benefit users of
git-log, too.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5000-tar-tree.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 1a4c53a03..3d5d01be7 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -28,12 +28,15 @@ commit id embedding: TAR=${TAR:-tar} UNZIP=${UNZIP:-unzip} +SPECFILEFORMAT=%H%n + test_expect_success \ 'populate workdir' \ 'mkdir a b c && echo simple textfile >a/a && mkdir a/bin && cp /bin/sh a/bin && + printf "%s" "$SPECFILEFORMAT" >a/specfile && ln -s a a/l1 && (p=long_path_to_a_file && cd a && for depth in 1 2 3 4 5; do mkdir $p && cd $p; done && @@ -105,6 +108,22 @@ test_expect_success \ 'diff -r a c/prefix/a' test_expect_success \ + 'create an archive with a specfile' \ + 'echo specfile specfile >a/.gitattributes && + git archive HEAD >f.tar && + rm a/.gitattributes' + +test_expect_success \ + 'extract specfile' \ + '(mkdir f && cd f && $TAR xf -) <f.tar' + +test_expect_success \ + 'validate specfile contents' \ + 'git log --max-count=1 "--pretty=format:$SPECFILEFORMAT" HEAD \ + >f/a/specfile.expected && + diff f/a/specfile.expected f/a/specfile' + +test_expect_success \ 'git archive --format=zip' \ 'git archive --format=zip HEAD >d.zip' |