author | Junio C Hamano <gitster@pobox.com> | |
Wed, 16 Mar 2011 22:46:08 +0000 (15:46 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 16 Mar 2011 22:57:19 +0000 (15:57 -0700) | ||
commit | 2cfe8a68ccba86f046080f890102a9a43361cfdd | |
tree | afcc58df52da5b238ed6649acab672ea874d6d76 | tree | snapshot |
parent | 90b1994170900514a1ce7a3345e25cb7216915cc | commit | diff |
diff --quiet: disable optimization when --diff-filter=X is used
The code notices that the caller does not want any detail of the changes
and only wants to know if there is a change or not by specifying --quiet.
And it breaks out of the loop when it knows it already found any change.
When you have a post-process filter (e.g. --diff-filter), however, the
path we found to be different in the previous round and set HAS_CHANGES
bit may end up being uninteresting, and there may be no output at the end.
The optimization needs to be disabled for such case.
Note that the f245194 (diff: change semantics of "ignore whitespace"
options, 2009-05-22) already disables this optimization by refraining
from setting HAS_CHANGES when post-process filters that need to inspect
the contents of the files (e.g. -S, -w) in diff_change() function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The code notices that the caller does not want any detail of the changes
and only wants to know if there is a change or not by specifying --quiet.
And it breaks out of the loop when it knows it already found any change.
When you have a post-process filter (e.g. --diff-filter), however, the
path we found to be different in the previous round and set HAS_CHANGES
bit may end up being uninteresting, and there may be no output at the end.
The optimization needs to be disabled for such case.
Note that the f245194 (diff: change semantics of "ignore whitespace"
options, 2009-05-22) already disables this optimization by refraining
from setting HAS_CHANGES when post-process filters that need to inspect
the contents of the files (e.g. -S, -w) in diff_change() function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-lib.c | diff | blob | history | |
t/t4037-whitespace-status.sh | diff | blob | history |