From: Charles Bailey <charles@hashpling.org>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] Make git respect core.autocrlf for zip archives
Date: Sun, 21 Sep 2008 21:25:27 +0100 [thread overview]
Message-ID: <1222028727-30097-2-git-send-email-charles@hashpling.org> (raw)
In-Reply-To: <1222028727-30097-1-git-send-email-charles@hashpling.org>
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>
---
builtin-archive.c | 2 ++
t/t0024-crlf-archive.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/builtin-archive.c b/builtin-archive.c
index 5ceec43..432ce2a 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 3511439..e533039 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 &&
--
1.6.0.1.309.g4f56
prev parent reply other threads:[~2008-09-21 20:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-21 20:25 [PATCH 1/2] Add new test to show git archive autocrlf bug Charles Bailey
2008-09-21 20:25 ` Charles Bailey [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1222028727-30097-2-git-send-email-charles@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).