summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-17 14:59:16 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-17 14:59:16 -0800
commit8cf666c9eea7d6c40784efde545c9d00edea1959 (patch)
tree1ce34625dfb8431fb80611ae5f0d55c0bb7ef169 /diff.c
parent6a2e93f1074d5a8b25c2020805e6b8d795d13e4d (diff)
parentc099789bb01b810e40f9cfaa5c842ed568110fc8 (diff)
downloadgit-8cf666c9eea7d6c40784efde545c9d00edea1959.tar.gz
Merge branch 'cb/diff-fname-optim'
* cb/diff-fname-optim: diff: avoid repeated scanning while looking for funcname do not search functions for patch ID add rebase patch id tests
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index c8e43664fb..c248bc64c5 100644
--- a/diff.c
+++ b/diff.c
@@ -3894,7 +3894,7 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
xpp.flags = 0;
xecfg.ctxlen = 3;
- xecfg.flags = XDL_EMIT_FUNCNAMES;
+ xecfg.flags = 0;
xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
&xpp, &xecfg);
}