diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
| commit | 3cc3fb7df67dc9c83b71fec82e5bfb1df3724089 (patch) | |
| tree | efdba423f81c7c1a5c1e625a626d361a73165020 /builtin-log.c | |
| parent | Merge branch 'jc/1.7.0-push-safety' (diff) | |
| parent | diff.c: fix typoes in comments (diff) | |
| download | tgif-3cc3fb7df67dc9c83b71fec82e5bfb1df3724089.tar.xz | |
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
* jc/1.7.0-diff-whitespace-only-status:
diff.c: fix typoes in comments
Make test case number unique
diff: Rename QUIET internal option to QUICK
diff: change semantics of "ignore whitespace" options
Conflicts:
diff.h
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index 1766349550..41b6df490f 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -567,7 +567,7 @@ static int reopen_stdout(struct commit *commit, struct rev_info *rev) get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename); - if (!DIFF_OPT_TST(&rev->diffopt, QUIET)) + if (!DIFF_OPT_TST(&rev->diffopt, QUICK)) fprintf(realstdout, "%s\n", filename.buf + outdir_offset); if (freopen(filename.buf, "w", stdout) == NULL) |