When running 'git diff --quiet <file1> <file2>', if file1 or file2
is outside the repository, it will exit(0) even if the files differ.
It should exit(1) when they differ.
Signed-off-by: Tim Henigan <tim.henigan@xxxxxxxxx>
---
This was the least invasive fix that I found. I considered adding
the following when the '--quiet' option is parsed instead:
+ DIFF_OPT_SET(options, EXIT_WITH_STATUS)
+ DIFF_OPT_SET(options, DIFF_FROM_CONTENTS)
diff.c | 5 +++--
t/t4035-diff-quiet.sh | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 77edd50..b1d74fe 100644
--- a/diff.c
+++ b/diff.c
@@ -4432,9 +4432,10 @@ void diff_flush(struct diff_options *options)
separator++;
}
- if (output_format & DIFF_FORMAT_NO_OUTPUT &&
+ if ((output_format & DIFF_FORMAT_NO_OUTPUT &&
DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
- DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
+ DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) ||
+ DIFF_OPT_TST(options, QUICK)) {
/*
* run diff_flush_patch for the exit status. setting
* options->file to /dev/null should be safe, becaue we
diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh
index cdb9202..e14e676 100755
--- a/t/t4035-diff-quiet.sh
+++ b/t/t4035-diff-quiet.sh
@@ -77,4 +77,9 @@ test_expect_success 'git diff-index --cached HEAD' '
}
'
+test_expect_success 'git diff <tracked file> <file outside repo>' '
+ git diff --quiet c /dev/null
+ test $? = 1
+'
+
test_done
--
1.7.11.rc3.6.g501bf14
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html