From 91f192a90902952f40cf24be004e8df3508b16c8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Apr 2005 09:21:00 -0700 Subject: [PATCH] [PATCH] Teach diff-tree-helper to handle unmerged paths. This teaches diff-tree-helper to call diff_unmerge() so that it can report unmerged paths to GIT_EXTERNAL_DIFF, instead of consuming it on its own. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff-tree-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-tree-helper.c b/diff-tree-helper.c index 4167d11e0..f3efc8a6f 100644 --- a/diff-tree-helper.c +++ b/diff-tree-helper.c @@ -56,7 +56,7 @@ static int parse_diff_tree_output(const char *buf, switch (*cp++) { case 'U': - fprintf(stderr, "warning: unmerged path %s\n", cp+1); + diff_unmerge(cp + 1); return WARNED_OURSELVES; case '+': old->file_valid = 0; -- 2.30.2