summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 10:52:58 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 10:52:58 -0700
commit22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch)
tree0091b831de88064187f0ddfd637b8ff93883eded /diff.c
parent6c252ef79e314eef8fca862cca8a63329fa7591c (diff)
parent095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff)
downloadgit-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.gz
Merge branch 'jc/fix-diff-files-unmerged'
* jc/fix-diff-files-unmerged: diff-files: show unmerged entries correctly diff: remove often unused parameters from diff_unmerge() diff.c: return filepair from diff_unmerge() test: use $_z40 from test-lib
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/diff.c b/diff.c
index 3b40e597d5..feced34343 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,