diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:23:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:23:17 -0800 |
| commit | c34a7daad74b0f7b0dc72de131dbb9e919b0ab32 (patch) | |
| tree | 1d2770d0c868cc2be228028e4865724cb860e48d /archive.h | |
| parent | 6a2b569c2fec49cc213e0218f1251749771044d6 (diff) | |
| parent | eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0 (diff) | |
| download | git-c34a7daad74b0f7b0dc72de131dbb9e919b0ab32.tar.gz | |
Merge branch 'jc/setup-cleanup-fix'
"git archive" and "git mailinfo" stopped reading from local
configuration file with a recent update.
* jc/setup-cleanup-fix:
archive: read local configuration
mailinfo: read local configuration
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, |