Junio C Hamano <gitster@xxxxxxxxx> writes: > Perhaps something along this line to teach > > $ git merge-file --attribute-path=frotz.c file1 orig_file file2 > > to merge what happened since orig_file to file2 into file1, and deposit > the result after converting it appropriately for path "frotz.c" obeying > core.autocrlf and gitattribute rules. > > I see rerere.c::merge() has the exact same issue, but its breakage is half > hidden by its use of fopen(path, "w"). It should explicitly use > convert_to_working_tree() like this patch does, and write the results out > in binary mode. Second try. I forgot how convert_* worked X-<. builtin-merge-file.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git i/builtin-merge-file.c w/builtin-merge-file.c index 96edb97..edee815 100644 --- i/builtin-merge-file.c +++ w/builtin-merge-file.c @@ -5,7 +5,7 @@ #include "parse-options.h" static const char *const merge_file_usage[] = { - "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2", + "git merge-file [options] [-L name1 [-L orig [-L name2]]] [--attribute-path path] file1 orig_file file2", NULL }; @@ -30,10 +30,13 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) int merge_level = XDL_MERGE_ZEALOUS_ALNUM; int merge_style = 0, quiet = 0; int nongit; + char *attribute_path = NULL; struct option options[] = { OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"), OPT_SET_INT(0, "diff3", &merge_style, "use a diff3 based merge", XDL_MERGE_DIFF3), + OPT_STRING('a', "attribute-path", &attribute_path, "path", + "apply work-tree conversion for the path"), OPT__QUIET(&quiet), OPT_CALLBACK('L', NULL, names, "name", "set labels for file1/orig_file/file2", &label_cb), @@ -73,6 +76,21 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) for (i = 0; i < 3; i++) free(mmfs[i].ptr); + if (ret >= 0 && attribute_path) { + struct strbuf buf = STRBUF_INIT; + int st; + st = convert_to_working_tree(attribute_path, + result.ptr, result.size, + &buf); + if (st) { + size_t len; + + free(result.ptr); + result.ptr = strbuf_detach(&buf, &len); + result.size = len; + } + } + if (ret >= 0) { const char *filename = argv[0]; FILE *f = to_stdout ? stdout : fopen(filename, "wb"); -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html