diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-18 01:59:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-18 01:59:16 +0300 |
commit | 8cf666c9eea7d6c40784efde545c9d00edea1959 (patch) | |
tree | 1ce34625dfb8431fb80611ae5f0d55c0bb7ef169 /diff.c | |
parent | 6a2e93f1074d5a8b25c2020805e6b8d795d13e4d (diff) | |
parent | c099789bb01b810e40f9cfaa5c842ed568110fc8 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); } |