From: Junio C Hamano <junkio@cox.net>
Date: Wed, 27 Apr 2005 16:21:00 +0000 (-0700)
Subject: [PATCH] Teach diff-tree-helper to handle unmerged paths.
X-Git-Tag: v0.99~725
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=91f192a90902952f40cf24be004e8df3508b16c8;p=git.git

[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/diff-tree-helper.c b/diff-tree-helper.c
index 4167d11e..f3efc8a6 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;