diff options
author | Tim Henigan <tim.henigan@gmail.com> | 2012-06-21 14:09:51 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-22 10:26:13 -0700 |
commit | 304970dd5d9e542e70eca98932c1e9f26770678e (patch) | |
tree | 2bc20aad574aa22b6d41dd9c797eb5b1ef474a7a /t/t4013/diff.diff_initial..side | |
parent | diff: handle relative paths in no-index (diff) | |
download | tgif-304970dd5d9e542e70eca98932c1e9f26770678e.tar.xz |
diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
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.
This happens because 'diff_no_index' looks at the 'found_changes'
member from 'diff_options' to determine if changes were made. This
is the wrong thing to do, since it is only set if xdiff is actually
run and it finds a change (the diff machinery will optimize out the
xdiff call when it is not necessary) and in that case HAS_CHANGED
flag needs to be taken into account.
Use diff_result_code() that knows all these details for the correct
exit value instead.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions