X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.c;h=feced343433f41c2138f09e10e256b2020c89137;hb=15eaa0494051ae2db7fbc357bd0f5b75d3e17a31;hp=3b40e597d5793d13944f9604e5197ac216eb3a3e;hpb=7ab576ce2dc8bb7e87c8fa2c945e61345308d03d;p=git.git

diff --git a/diff.c b/diff.c
index 3b40e597d..feced3434 100644
--- a/diff.c
+++ b/diff.c
@@ -4416,20 +4416,20 @@ void diff_change(struct diff_options *options,
 		DIFF_OPT_SET(options, HAS_CHANGES);
 }
 
-void diff_unmerge(struct diff_options *options,
-		  const char *path,
-		  unsigned mode, const unsigned char *sha1)
+struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
 {
+	struct diff_filepair *pair;
 	struct diff_filespec *one, *two;
 
 	if (options->prefix &&
 	    strncmp(path, options->prefix, options->prefix_length))
-		return;
+		return NULL;
 
 	one = alloc_filespec(path);
 	two = alloc_filespec(path);
-	fill_filespec(one, sha1, mode);
-	diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
+	pair = diff_queue(&diff_queued_diff, one, two);
+	pair->is_unmerged = 1;
+	return pair;
 }
 
 static char *run_textconv(const char *pgm, struct diff_filespec *spec,