summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-22 23:05:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-24 05:34:43 (GMT)
commitfa7b290895ba2c4407ae818911ba620eaca53bbd (patch)
tree623c2c8db0b2036291caa12f9afb023cf9a98912 /diff.h
parent76399c0195278ed2b52716b821cf064f77131736 (diff)
downloadgit-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.h')
-rw-r--r--diff.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/diff.h b/diff.h
index f51a8ee..3edb705 100644
--- a/diff.h
+++ b/diff.h
@@ -209,10 +209,7 @@ extern void diff_change(struct diff_options *,
const char *fullpath,
unsigned dirty_submodule1, unsigned dirty_submodule2);
-extern struct diff_filepair *diff_unmerge(struct diff_options *,
- const char *path,
- unsigned mode,
- const unsigned char *sha1);
+extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2