mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: respect core.autocrlf when writing out the result

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2008-06-09 22:23:16 +01:00
committed by Junio C Hamano
parent eea982843e
commit 249c61a62d
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin-merge-recursive.c
View File

@ -551,9 +551,19 @@ static void update_file_flags(const unsigned char *sha,
die("cannot read object %s '%s'", sha1_to_hex(sha), path); die("cannot read object %s '%s'", sha1_to_hex(sha), path);
if (type != OBJ_BLOB) if (type != OBJ_BLOB)
die("blob expected for %s '%s'", sha1_to_hex(sha), path); 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) { if (make_room_for_path(path) < 0) {
update_wd = 0; update_wd = 0;
free(buf);
goto update_index; goto update_index;
} }
if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
@ -576,6 +586,7 @@ static void update_file_flags(const unsigned char *sha,
} else } else
die("do not know what to do with %06o %s '%s'", die("do not know what to do with %06o %s '%s'",
mode, sha1_to_hex(sha), path); mode, sha1_to_hex(sha), path);
free(buf);
} }
update_index: update_index:
if (update_cache) if (update_cache)

2
t/t6033-merge-crlf.sh
View File

@ -42,7 +42,7 @@ test_expect_success 'Check "ours" is CRLF' '
test_cmp file file.temp 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 && git reset --hard a &&
test_must_fail git merge side && test_must_fail git merge side &&
cat file | remove_cr | append_cr >file.temp && cat file | remove_cr | append_cr >file.temp &&