diff: remove often unused parameters from diff_unmerge()

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index 4c34c64bd7dac112e2bea27a0c99967e0b9bc050..d2c5c563bc84ba048ebccdc692a84663b8a74e9a 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4308,9 +4308,7 @@ void diff_change(struct diff_options *options,
                DIFF_OPT_SET(options, HAS_CHANGES);
 }
 
-struct diff_filepair *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;
@@ -4321,7 +4319,6 @@ struct diff_filepair *diff_unmerge(struct diff_options *options,
 
        one = alloc_filespec(path);
        two = alloc_filespec(path);
-       fill_filespec(one, sha1, mode);
        pair = diff_queue(&diff_queued_diff, one, two);
        pair->is_unmerged = 1;
        return pair;