summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 18:20:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 18:20:46 (GMT)
commit39b5977b1391b0ee1fdfecf04955c32192f64936 (patch)
tree14edbf7a75770c0123741e771b990ba5a8a3ce63 /combine-diff.c
parentd5c48c531816102d3a86fd807fb19e661a3787d5 (diff)
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff)
downloadgit-39b5977b1391b0ee1fdfecf04955c32192f64936.zip
git-39b5977b1391b0ee1fdfecf04955c32192f64936.tar.gz
git-39b5977b1391b0ee1fdfecf04955c32192f64936.tar.bz2
Merge branch 'rs/diff-no-minimal'
* rs/diff-no-minimal: git diff too slow for a file
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 7557136..655fa89 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -220,7 +220,7 @@ static void combine_diff(const unsigned char *parent, unsigned int mode,
parent_file.ptr = grab_blob(parent, mode, &sz);
parent_file.size = sz;
memset(&xpp, 0, sizeof(xpp));
- xpp.flags = XDF_NEED_MINIMAL;
+ xpp.flags = 0;
memset(&xecfg, 0, sizeof(xecfg));
memset(&state, 0, sizeof(state));
state.nmask = nmask;