diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:12 -0700 |
commit | 3791f77c28f233df121da2f83abf7eefc7b49b69 (patch) | |
tree | 8c50a58cf599933aa412a30d7cac615092d42aa0 /builtin-archive.c | |
parent | e69a6f47c4e25a20170eb989a55257d0399f795b (diff) | |
parent | ea2408bfe18b4f9d1eaa9d8587c5ae6196552cac (diff) | |
download | git-3791f77c28f233df121da2f83abf7eefc7b49b69.tar.gz |
Merge branch 'maint'
* maint:
sha1_file: link() returns -1 on failure, not errno
Make git archive respect core.autocrlf when creating zip format archives
Add new test to demonstrate git archive core.autocrlf inconsistency
gitweb: avoid warnings for commits without body
Clarified gitattributes documentation regarding custom hunk header.
git-svn: fix handling of even funkier branch names
git-svn: Always create a new RA when calling do_switch for svn://
git-svn: factor out svnserve test code for later use
diff/diff-files: do not use --cc too aggressively
Diffstat (limited to 'builtin-archive.c')
-rw-r--r-- | builtin-archive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-archive.c b/builtin-archive.c index 5ceec433fd..432ce2acc6 100644 --- a/builtin-archive.c +++ b/builtin-archive.c @@ -111,6 +111,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix) { const char *remote = NULL; + git_config(git_default_config, NULL); + remote = extract_remote_arg(&argc, argv); if (remote) return run_remote_archiver(remote, argc, argv); |