From: Junio C Hamano Date: Sun, 29 Nov 2009 07:25:54 GMT Subject: [PATCH 2/3] diff: flip the diff.bwoutputonly default to false Message-ID: <7veinhdc71.fsf_-_@alter.siamese.dyndns.org> In-Reply-To: <7vmy25dc9h.fsf@alter.siamese.dyndns.org> This finally corrects the broken "ignore whitespace options only affect patch output and never affects status nor header output", as we have been planning for 1.7.0 Signed-off-by: Junio C Hamano --- diff.c | 2 +- t/t4015-diff-whitespace.sh | 5 +++-- t/t4040-whitespace-status.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index fb93a22..df67f18 100644 --- a/diff.c +++ b/diff.c @@ -29,7 +29,7 @@ static const char *diff_word_regex_cfg; static const char *external_diff_cmd_cfg; int diff_auto_refresh_index = 1; static int diff_mnemonic_prefix; -static int diff_b_w_output_only = 1; +static int diff_b_w_output_only; static int diff_b_w_output_only_given; static char diff_colors[][COLOR_MAXLEN] = { diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 310421b..8ca81e8 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -114,6 +114,7 @@ index d99af23..8b32fb5 100644 EOF test_w_b "bwoutputonly=true" +>expect git config --unset diff.bwoutputonly test_w_b "bwoutputonly unset" @@ -398,7 +399,7 @@ test_expect_success 'checkdiff allows new blank lines' ' git diff --check ' -test_expect_success 'whitespace-only changes shown' ' +test_expect_success 'whitespace-only changes hidden' ' git config --unset diff.bwoutputonly git reset --hard && echo >x "hello world" && @@ -406,7 +407,7 @@ test_expect_success 'whitespace-only changes shown' ' git commit -m "hello 1" && echo >x "hello world" && git diff -b >actual && - test 2 = $(wc -l