diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-27 09:21:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 09:21:00 -0700 |
| commit | 91f192a90902952f40cf24be004e8df3508b16c8 (patch) | |
| tree | d2f1e3523866c7f1562a8bbc060b1a2110fe9bd7 /diff-tree-helper.c | |
| parent | f92a4465813b42b0c116bc9ab2a105ee19f076d8 (diff) | |
| download | git-91f192a90902952f40cf24be004e8df3508b16c8.tar.gz | |
[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>
Diffstat (limited to 'diff-tree-helper.c')
| -rw-r--r-- | diff-tree-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree-helper.c b/diff-tree-helper.c index 4167d11e00..f3efc8a6f2 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; |