path: root/archive.h
diff options
authorJunio C Hamano <>2016-11-22 21:37:04 (GMT)
committerJunio C Hamano <>2016-11-22 21:55:20 (GMT)
commiteb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0 (patch)
treee619ede7551b1afd632defa778924abafabc87d4 /archive.h
parent3f0ec0687d95e0f53c899f964d769ca1846874da (diff)
archive: read local configuration
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 <>
Diffstat (limited to 'archive.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/archive.h b/archive.h
index 4a791e1..415e015 100644
--- a/archive.h
+++ b/archive.h
@@ -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,