From: "Torsten Bögershausen" <tboegi@web.de>
To: Anthony Sottile <asottile@umich.edu>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: core.autocrlf=true causes `git apply` to fail on patch generated with `git diff-index HEAD --patch`
Date: Wed, 2 Aug 2017 17:44:50 +0200 [thread overview]
Message-ID: <cceaf377-73e0-e733-20ba-c4e547226382@web.de> (raw)
In-Reply-To: <CA+dzEB=3OMw_YM4K_a8dyDG_FwGavU382stXrEOkbYoyM4DSZQ@mail.gmail.com>
On 08/01/2017 10:58 PM, Anthony Sottile wrote:
> Here's where I'm hitting the problem described:
> https://github.com/pre-commit/pre-commit/issues/570
>
> Note that `git -c core.autocrlf=false` apply patch fixes this
> situation, but breaks others.
[]
I wasn't thinking of that - and thanks for the detailed report.
I seems as there are 3 things to be done:
- Make a workaround in your scripts/tools. It seems as if that is
already done.
- Fix Git.
My very first investigation shows that a patch like this could fix
the problem:
diff --git a/apply.c b/apply.c
index f2d599141d..66b8387360 100644
--- a/apply.c
+++ b/apply.c
@@ -2278,6 +2278,8 @@ static int read_old_data(struct stat *st, const
char *path, struct strbuf *buf)
case S_IFREG:
if (strbuf_read_file(buf, path, st->st_size) !=
st->st_size)
return error(_("unable to open or read %s"), path);
+ if (would_convert_to_git(&the_index, path))
+ read_cache();
convert_to_git(&the_index, path, buf->buf, buf->len,
buf, 0);
return 0;
default:
----------------
I will probably do some more investigations if this is the core
problem, so it will take some days or weeks.
- Convince people to normalize their repos and convert all CRLF in the
repo into LF.
This may take even longer.
next prev parent reply other threads:[~2017-08-02 15:45 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 18:24 core.autocrlf=true causes `git apply` to fail on patch generated with `git diff-index HEAD --patch` Anthony Sottile
2017-08-01 20:47 ` Torsten Bögershausen
2017-08-01 20:58 ` Anthony Sottile
2017-08-02 15:44 ` Torsten Bögershausen [this message]
2017-08-02 20:42 ` [PATCH v1 1/1] correct apply for files commited with CRLF tboegi
2017-08-02 21:13 ` Junio C Hamano
2017-08-04 17:31 ` Torsten Bögershausen
2017-08-04 17:57 ` Junio C Hamano
2017-08-04 19:26 ` Junio C Hamano
2017-08-02 20:58 ` core.autocrlf=true causes `git apply` to fail on patch generated with `git diff-index HEAD --patch` Junio C Hamano
2017-08-12 5:45 ` Torsten Bögershausen
2017-08-12 5:53 ` Torsten Bögershausen
2017-08-12 14:56 ` [PATCH/RFC] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-12 14:56 ` [PATCH/RFC] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-14 17:37 ` Junio C Hamano
2017-08-17 6:06 ` [PATCH v2 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-17 6:06 ` [PATCH v2 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-17 6:37 ` Junio C Hamano
2017-08-17 21:43 ` [PATCH v3 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-17 21:43 ` [PATCH v3 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-17 22:29 ` Junio C Hamano
2017-08-17 22:35 ` Junio C Hamano
2017-08-19 11:27 ` [PATCH v4 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-19 11:28 ` [PATCH v4 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-13 8:51 ` [PATCH/RFC 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-13 8:51 ` [PATCH/RFC 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-16 18:28 ` Junio C Hamano
2017-08-16 18:28 ` [PATCH/FIXUP 3/2] apply: remove unused member apply_state.flags Junio C Hamano
2017-08-16 18:29 ` [PATCH/FIXUP 4/2] apply: only pay attention to CRLF in the preimage Junio C Hamano
2017-08-16 18:30 ` [PATCH/FIXUP 5/2] apply: localize the CRLF business to read_old_data() Junio C Hamano
2017-08-16 18:34 ` [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case Junio C Hamano
2017-08-17 6:24 ` Torsten Bögershausen
2017-08-17 7:06 ` Junio C Hamano
2017-08-17 7:12 ` Junio C Hamano
2017-08-17 8:24 ` Torsten Bögershausen
2017-08-17 17:07 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cceaf377-73e0-e733-20ba-c4e547226382@web.de \
--to=tboegi@web.de \
--cc=asottile@umich.edu \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).