summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2022-06-18 00:20:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-06-22 23:10:06 (GMT)
commit7fa3338870d66dd3946c5c3a0bd09dadb798893d (patch)
tree040f35db3176e5d9f94c60d2270619734af1dc26 /builtin/merge-tree.c
parenta4040cfa35d8781df3e994380d1b559be8b22bd2 (diff)
downloadgit-7fa3338870d66dd3946c5c3a0bd09dadb798893d.zip
git-7fa3338870d66dd3946c5c3a0bd09dadb798893d.tar.gz
git-7fa3338870d66dd3946c5c3a0bd09dadb798893d.tar.bz2
merge-tree: provide a list of which files have conflicts
Callers of `git merge-tree --write-tree` will often want to know which files had conflicts. While they could potentially attempt to parse the CONFLICT notices printed, those messages are not meant to be machine readable. Provide a simpler mechanism of just printing the files (in the same format as `git ls-files` with quoting, but restricted to unmerged files) in the output before the free-form messages. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r--builtin/merge-tree.c26
1 files changed, 23 insertions, 3 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 831d9c7..13a9536 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -11,6 +11,9 @@
#include "blob.h"
#include "exec-cmd.h"
#include "merge-blobs.h"
+#include "quote.h"
+
+static int line_termination = '\n';
struct merge_list {
struct merge_list *next;
@@ -400,7 +403,8 @@ struct merge_tree_options {
};
static int real_merge(struct merge_tree_options *o,
- const char *branch1, const char *branch2)
+ const char *branch1, const char *branch2,
+ const char *prefix)
{
struct commit *parent1, *parent2;
struct commit_list *merge_bases = NULL;
@@ -441,8 +445,24 @@ static int real_merge(struct merge_tree_options *o,
o->show_messages = !result.clean;
puts(oid_to_hex(&result.tree->object.oid));
+ if (!result.clean) {
+ struct string_list conflicted_files = STRING_LIST_INIT_NODUP;
+ const char *last = NULL;
+ int i;
+
+ merge_get_conflicted_files(&result, &conflicted_files);
+ for (i = 0; i < conflicted_files.nr; i++) {
+ const char *name = conflicted_files.items[i].string;
+ if (last && !strcmp(last, name))
+ continue;
+ write_name_quoted_relative(
+ name, prefix, stdout, line_termination);
+ last = name;
+ }
+ string_list_clear(&conflicted_files, 1);
+ }
if (o->show_messages) {
- printf("\n");
+ putchar(line_termination);
merge_display_update_messages(&opt, &result);
}
merge_finalize(&opt, &result);
@@ -508,7 +528,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
/* Do the relevant type of merge */
if (o.mode == MODE_REAL)
- return real_merge(&o, argv[0], argv[1]);
+ return real_merge(&o, argv[0], argv[1], prefix);
else
return trivial_merge(argv[0], argv[1], argv[2]);
}