diff options
| author |  Larry D'Anna <larry@elder-gods.org> | 2010-02-16 01:55:21 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-02-15 23:04:34 -0800 |
| commit | 6977c250ac6cacb5ee441bff832fdeab4d0cd8f9 (patch) | |
| tree | 65395c21da0f7326b50da68e05a6d2db78cd182b /builtin-merge-index.c | |
| parent | Merge branch 'maint-1.6.6' into maint (diff) | |
| download | tgif-6977c250ac6cacb5ee441bff832fdeab4d0cd8f9.tar.xz | |
git diff --quiet -w: check and report the status
The option -w tells the diff machinery to inspect the contents to set the
exit status, instead of checking the blob object level difference alone.
However, --quiet tells the diff machinery not to look at the contents, which
means DIFF_FROM_CONTENTS has no chance to inspect the change.
Work it around by calling diff_flush_patch() with output sent to /dev/null.
Signed-off-by: Larry D'Anna <larry@elder-gods.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-index.c')
0 files changed, 0 insertions, 0 deletions