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 /builtin/upload-archive.c | |
| parent | 6a2b569c2fec49cc213e0218f1251749771044d6 (diff) | |
| parent | eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0 (diff) | |
| download | git-c34a7daad74b0f7b0dc72de131dbb9e919b0ab32.tar.gz git-c34a7daad74b0f7b0dc72de131dbb9e919b0ab32.tar.xz | |
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 'builtin/upload-archive.c')
| -rw-r--r-- | builtin/upload-archive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index dc872f6a9..cde06977b 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -43,7 +43,7 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix) } /* parse all options sent by the client */ - return write_archive(sent_argv.argc, sent_argv.argv, prefix, 0, NULL, 1); + return write_archive(sent_argv.argc, sent_argv.argv, prefix, NULL, 1); } __attribute__((format (printf, 1, 2))) |