[PATCH v2] merge-recursive: respect core.autocrlf
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Johannes Schindelin <redacted> --- On Mon, 9 Jun 2008, Junio C Hamano wrote: > Fairly straightforward fix, except that I suspect this needs to > be done only for regular files and not symlinks. > > I think entry.c:write_entry() shows how this should be done. Right. And the relevant clause is actually already there. D'oh. builtin-merge-recursive.c | 12 +++++++++++- t/t6033-merge-crlf.sh | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 7643f17..1fbff3a 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c@@ -535,13 +535,22 @@ static void update_file_flags(const unsigned char *sha, die("cannot read object %s '%s'", sha1_to_hex(sha), path); if (type != OBJ_BLOB) die("blob expected for %s '%s'", sha1_to_hex(sha), path); - if (make_room_for_path(path) < 0) { update_wd = 0; goto update_index; } if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { int fd; + struct strbuf strbuf; + + strbuf_init(&strbuf, 0); + if (convert_to_working_tree(path, buf, size, &strbuf)) { + size_t newsize = 0; + free(buf); + buf = strbuf_detach(&strbuf, &newsize); + size = newsize; + } + if (mode & 0100) mode = 0777; else
@@ -560,6 +569,7 @@ static void update_file_flags(const unsigned char *sha, } else die("do not know what to do with %06o %s '%s'", mode, sha1_to_hex(sha), path); + free(buf); } update_index: if (update_cache)
diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh
index ea22837..75d9602 100755
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6033-merge-crlf.sh@@ -42,7 +42,7 @@ test_expect_success 'Check "ours" is CRLF' ' test_cmp file file.temp ' -test_expect_failure 'Check that conflict file is CRLF' ' +test_expect_success 'Check that conflict file is CRLF' ' git reset --hard a && test_must_fail git merge side && cat file | remove_cr | append_cr >file.temp &&
--
1.5.6.rc1.181.gb439d