summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2008-06-09 22:23:16 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-09 16:11:08 -0700
commit249c61a62d82c22df98cb72ec61c120887b944e1 (patch)
tree69b7ddacb4a89082ad59111085a79024f56d14bf
parentAdd testcase for merging in a CRLF repo (diff)
downloadtgif-249c61a62d82c22df98cb72ec61c120887b944e1.tar.xz
merge-recursive: respect core.autocrlf when writing out the result
The code forgot to convert the blob contents into work tree representation before writing it out. Also fixes leaks -- earlier the updated blobs were never freed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-merge-recursive.c11
-rwxr-xr-xt/t6033-merge-crlf.sh2
2 files changed, 12 insertions, 1 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 910c0d20e7..175e8b1660 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -551,9 +551,19 @@ 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 (S_ISREG(mode)) {
+ struct strbuf strbuf;
+ strbuf_init(&strbuf, 0);
+ if (convert_to_working_tree(path, buf, size, &strbuf)) {
+ free(buf);
+ size = strbuf.len;
+ buf = strbuf_detach(&strbuf, NULL);
+ }
+ }
if (make_room_for_path(path) < 0) {
update_wd = 0;
+ free(buf);
goto update_index;
}
if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
@@ -576,6 +586,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 ea22837aa7..75d9602de4 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 &&