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 /builtin/upload-archive.c | |
| parent | 3f0ec0687d95e0f53c899f964d769ca1846874da (diff) | |
| download | git-eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0.tar.gz git-eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0.tar.xz | |
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 <gitster@pobox.com>
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))) |