diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:38:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:38:50 -0700 |
| commit | 60335534a6ac52d4d3a372a5b56df5a57a4463d1 (patch) | |
| tree | 8d61494762039a2268c3116574841fe71181054b /builtin | |
| parent | e1ba0f6340c1d72677c7792a0a82ecf05363026e (diff) | |
| parent | 582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff) | |
| download | git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.gz git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.xz | |
Merge branch 'rs/diff-no-minimal' into maint
* rs/diff-no-minimal:
git diff too slow for a file
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 2 | ||||
| -rw-r--r-- | builtin/merge-file.c | 2 | ||||
| -rw-r--r-- | builtin/merge-tree.c | 2 | ||||
| -rw-r--r-- | builtin/rerere.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 4dd4c3f49..8506286dd 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -39,7 +39,7 @@ static int show_root; static int reverse; static int blank_boundary; static int incremental; -static int xdl_opts = XDF_NEED_MINIMAL; +static int xdl_opts; static enum date_mode blame_date_mode = DATE_ISO8601; static size_t blame_date_width; diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 610849a65..b8e9e5ba0 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -25,7 +25,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) const char *names[3] = { NULL, NULL, NULL }; mmfile_t mmfs[3]; mmbuffer_t result = {NULL, 0}; - xmparam_t xmp = {{XDF_NEED_MINIMAL}}; + xmparam_t xmp = {{0}}; int ret = 0, i = 0, to_stdout = 0; int quiet = 0; int nongit; diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index a4a4f2ce4..fc00d794d 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -106,7 +106,7 @@ static void show_diff(struct merge_list *entry) xdemitconf_t xecfg; xdemitcb_t ecb; - xpp.flags = XDF_NEED_MINIMAL; + xpp.flags = 0; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; ecb.outf = show_outf; diff --git a/builtin/rerere.c b/builtin/rerere.c index 34f9acee9..0048f9ef7 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -89,7 +89,7 @@ static int diff_two(const char *file1, const char *label1, printf("--- a/%s\n+++ b/%s\n", label1, label2); fflush(stdout); memset(&xpp, 0, sizeof(xpp)); - xpp.flags = XDF_NEED_MINIMAL; + xpp.flags = 0; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; ecb.outf = outf; |