]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 76399c0) | patch
diff: remove often unused parameters from diff_unmerge()
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Apr 2011 23:05:58 +0000 (16:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Apr 2011 05:34:43 +0000 (22:34 -0700)
commitfa7b290895ba2c4407ae818911ba620eaca53bbd
tree623c2c8db0b2036291caa12f9afb023cf9a98912tree | snapshot
parent76399c0195278ed2b52716b821cf064f77131736commit | diff
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>
diff-lib.c diff | blob | blame | history
diff.c diff | blob | blame | history
diff.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.