diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-22 13:37:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-22 13:55:20 -0800 |
| commit | eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0 (patch) | |
| tree | e619ede7551b1afd632defa778924abafabc87d4 /archive.h | |
| parent | 3f0ec0687d95e0f53c899f964d769ca1846874da (diff) | |
| download | git-eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0.tar.gz | |
archive: read local configurationjc/setup-cleanup-fix
Since b9605bc4f2 ("config: only read .git/config from configured
repos", 2016-09-12), we do not read from ".git/config" unless we
know we are in a repository. "git archive" however didn't do the
repository discovery and instead relied on the old behaviour.
Teach the command to run a "gentle" version of repository discovery
so that local configuration variables are honoured.
[jc: stole tests from peff]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.h')
| -rw-r--r-- | archive.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -36,7 +36,7 @@ typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, unsigned int mode); extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry); -extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote); +extern int write_archive(int argc, const char **argv, const char *prefix, const char *name_hint, int remote); const char *archive_format_from_filename(const char *filename); extern void *sha1_file_to_archive(const struct archiver_args *args, |