Merge branch 'rs/diff-no-minimal' into maint

* rs/diff-no-minimal: git diff too slow for a file
2010-06-21 05:38:50 -07:00
parent e1ba0f6340 582aa00bdf
commit 60335534a6
7 changed files with 11 additions and 11 deletions
--- 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;