diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:13:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:13:10 -0700 |
| commit | ea81e10ff4e31820407f4cb1b8ebd87de9e51737 (patch) | |
| tree | cf8b40877e775412070288c0086fb9b70a09e6b3 /builtin-merge-recursive.c | |
| parent | 5bcde3082d5f348ff8b02547126746b9b713c8d5 (diff) | |
| parent | 249c61a62d82c22df98cb72ec61c120887b944e1 (diff) | |
| download | git-ea81e10ff4e31820407f4cb1b8ebd87de9e51737.tar.gz git-ea81e10ff4e31820407f4cb1b8ebd87de9e51737.tar.xz | |
Merge branch 'js/merge-recursive'
* js/merge-recursive:
merge-recursive: respect core.autocrlf when writing out the result
Add testcase for merging in a CRLF repo
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 362c29002..4aa28a1ba 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -555,9 +555,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))) { @@ -580,6 +590,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) |