diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-10 11:32:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-10 11:32:58 -0700 |
| commit | ddb95de33e99d547c3b533aea12f18c9e4dd649e (patch) | |
| tree | b9d745e3dc1cdd91b0bc938ce104808b2f2db42a /archive-tar.c | |
| parent | 5242bcbb638f031818e9ebd4467c8e55d5a06bfb (diff) | |
| parent | 6972ab7ae10a205bbc05b98408a36403915a9c39 (diff) | |
| download | git-ddb95de33e99d547c3b533aea12f18c9e4dd649e.tar.gz git-ddb95de33e99d547c3b533aea12f18c9e4dd649e.tar.xz | |
Merge branch 'master' into ph/strbuf
* master:
archive - leakfix for format_subst()
Make --no-thin the default in git-push to save server resources
fix doc for --compression argument to pack-objects
git-tag -s must fail if gpg cannot sign the tag.
git-svn: understand grafts when doing dcommit
git-diff: don't squelch the new SHA1 in submodule diffs
Define NO_MEMMEM on Darwin as it lacks the function
git-svn: fix "Malformed network data" with svn:// servers
(cvs|svn)import: Ask git-tag to overwrite old tags.
git-rebase: fix -C option
git-rebase: support --whitespace=<option>
Documentation / grammer nit
archive: rename attribute specfile to export-subst
archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
add memmem()
Remove unused function convert_sha1_file()
archive: specfile support (--pretty=format: in archive files)
Export format_commit_message()
Diffstat (limited to 'archive-tar.c')
| -rw-r--r-- | archive-tar.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/archive-tar.c b/archive-tar.c index c84d7c065..0612bb605 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -17,6 +17,7 @@ static unsigned long offset; static time_t archive_time; static int tar_umask = 002; static int verbose; +static const struct commit *commit; /* writes out the whole block, but only if it is full */ static void write_if_needed(void) @@ -252,7 +253,8 @@ static int write_tar_entry(const unsigned char *sha1, buffer = NULL; size = 0; } else { - buffer = convert_sha1_file(path.buf, sha1, mode, &type, &size); + buffer = sha1_file_to_archive(path.buf, sha1, mode, &type, + &size, commit); if (!buffer) die("cannot read %s", sha1_to_hex(sha1)); } @@ -271,6 +273,7 @@ int write_tar_archive(struct archiver_args *args) archive_time = args->time; verbose = args->verbose; + commit = args->commit; if (args->commit_sha1) write_global_extended_header(args->commit_sha1); |