Skip to content

Commit

Permalink
Make git archive respect core.autocrlf when creating zip format archives
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Charles Bailey authored and Junio C Hamano committed Sep 19, 2008
1 parent f1265cc commit b99b5b4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions builtin-archive.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion t/t0024-crlf-archive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit b99b5b4

Please sign in to comment.