diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-22 23:05:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-24 05:34:43 (GMT) |
| commit | fa7b290895ba2c4407ae818911ba620eaca53bbd (patch) | |
| tree | 623c2c8db0b2036291caa12f9afb023cf9a98912 /diff.c | |
| parent | 76399c0195278ed2b52716b821cf064f77131736 (diff) | |
| download | git-fa7b290895ba2c4407ae818911ba620eaca53bbd.zip git-fa7b290895ba2c4407ae818911ba620eaca53bbd.tar.gz git-fa7b290895ba2c4407ae818911ba620eaca53bbd.tar.bz2 | |
diff: remove often unused parameters from diff_unmerge()
e9c8409 (diff-index --cached --raw: show tree entry on the LHS for
unmerged entries., 2007-01-05) added a <mode, object name> pair as
parameters to this function, to store them in the pre-image side of an
unmerged file pair. Now the function is fixed to return the filepair it
queued, we can make the caller on the special case codepath to do so.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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; |