mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ph/strbuf

Browse Source 
* 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()
This commit is contained in:
Junio C Hamano
2007-09-10 11:32:58 -07:00
parent 5242bcbb63 6972ab7ae1
commit ddb95de33e
25 changed files with 272 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
archive-tar.c
View File

@ -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);