[PATCH 2/2] bugfix: git diff --quiet -w never returns with exit status 1
- From
Larry D'Anna <larry@elder-gods.org>
- Date
- Feb 16, 2010, 06:55 UTC
- Message-ID
- <1266303321-28337-1-git-send-email-larry@elder-gods.org>
- In-Reply-To
- <20100216064539.GA18741@cthulhu>
The problem: -w causes the flag DIFF_FROM_CONTENTS to be set, which causes diff_flush to set the flag HAS_CHANGES based on options->found_changes, which is set by diff_flush_patch (if there were any changes). However, --quiet causes diff_flush to never call diff_flush_patch, so options->found_changes is always 0.
The solution: In this situation, call diff_flush_patch with options->file set to /dev/null.
Rationale: diff_flush_patch expects to write its output to options->file. Adding a "silence" flag to diff_flush_patch and everything it calls would be more invasive.
Signed-off-by: Larry D'Anna <larry@elder-gods.org> --- diff.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/diff.c b/diff.c index 68def6c..2984c41 100644 --- a/diff.c +++ b/diff.c @@ -3522,6 +3522,29 @@ void diff_flush(struct diff_options *options) separator++; } + if (output_format & DIFF_FORMAT_NO_OUTPUT && + DIFF_OPT_TST(options, EXIT_WITH_STATUS) && + DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) { + /* + * run diff_flush_patch for the exit status. + * setting options->file to /dev/null should be safe, becaue we + * aren't supposed to produce any output anyways + */ + if (options->close_file) + fclose(options->file); + options->file = fopen("/dev/null", "w"); + if (!options->file) + die_errno("Could not open /dev/null"); + options->close_file = 1; + for (i = 0; i < q->nr; i++) { + struct diff_filepair *p = q->queue[i]; + if (check_pair_status(p)) + diff_flush_patch(p, options); + if (options->found_changes) + break; + } + } + if (output_format & DIFF_FORMAT_PATCH) { if (separator) { putc(options->line_termination, options->file);
-- 1.7.0.rc2.40.g7d8aa