diff options
| author | Charles Bailey <charles@hashpling.org> | 2008-09-18 21:01:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 19:49:28 -0700 |
| commit | b99b5b40cffb5269e4aa38b6b60391b55039e27d (patch) | |
| tree | b694d3f76b09749d7c443e8e5330d4ddd3b9550e | |
| parent | f1265cc9ff977b497d805245dbd2454e46ef2710 (diff) | |
| download | git-b99b5b40cffb5269e4aa38b6b60391b55039e27d.tar.gz git-b99b5b40cffb5269e4aa38b6b60391b55039e27d.tar.xz | |
Make git archive respect core.autocrlf when creating zip format archives
There is currently no call to git_config at the start of cmd_archive.
When creating tar archives the core config is read as a side-effect of
reading the tar specific config, but this doesn't happen for zip
archives.
The consequence is that in a configuration with core.autocrlf set,
although files in a tar archive are created with crlf line endings,
files in a zip archive retain unix line endings.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Acked-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-archive.c | 2 | ||||
| -rw-r--r-- | t/t0024-crlf-archive.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin-archive.c b/builtin-archive.c index 5ceec433f..432ce2acc 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); diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh index 35114396c..e5330395f 100644 --- a/t/t0024-crlf-archive.sh +++ b/t/t0024-crlf-archive.sh @@ -33,7 +33,7 @@ if [ $? -eq 127 ]; then exit fi -test_expect_failure 'zip archive' ' +test_expect_success 'zip archive' ' git archive --format=zip HEAD >test.zip && |