Elijah Newren <newren@xxxxxxxxx> writes:
> Also add a test_might_fail in front of the final git_config --unset
> core.whitespace as that value may have already been unset previously.
In general, if a previous one that is designed to set a variable failed
for whatever reason, the next one that does --unset without might-fail
will be broken. So...
> @@ -65,9 +65,9 @@ test_expect_success 'without -trail' '
>
> test_expect_success 'without -trail (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=-trail" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... I think you need might-fail in front of this one, and ...
> + echo "F whitespace=-trail" >.gitattributes &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT error >/dev/null &&
> @@ -79,9 +79,9 @@ test_expect_success 'without -trail (attribute)' '
>
> test_expect_success 'without -space' '
>
> - rm -f .gitattributes
> - git config core.whitespace -space
> - prepare_output
> + rm -f .gitattributes &&
> + git config core.whitespace -space &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -93,9 +93,9 @@ test_expect_success 'without -space' '
>
> test_expect_success 'without -space (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=-space" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... this one, ...
> + echo "F whitespace=-space" >.gitattributes &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -107,9 +107,9 @@ test_expect_success 'without -space (attribute)' '
>
> test_expect_success 'with indent-non-tab only' '
>
> - rm -f .gitattributes
> - git config core.whitespace indent,-trailing,-space
> - prepare_output
> + rm -f .gitattributes &&
> + git config core.whitespace indent,-trailing,-space &&
... this one, ...
> + prepare_output &&
>
> grep Eight error >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -121,9 +121,9 @@ test_expect_success 'with indent-non-tab only' '
>
> test_expect_success 'with indent-non-tab only (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=indent,-trailing,-space" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... this one, ...
> + echo "F whitespace=indent,-trailing,-space" >.gitattributes &&
> + prepare_output &&
>
> grep Eight error >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -135,9 +135,9 @@ test_expect_success 'with indent-non-tab only (attribute)' '
>
> test_expect_success 'with cr-at-eol' '
>
> - rm -f .gitattributes
> - git config core.whitespace cr-at-eol
> - prepare_output
> + rm -f .gitattributes &&
> + git config core.whitespace cr-at-eol &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT error >/dev/null &&
> @@ -149,9 +149,9 @@ test_expect_success 'with cr-at-eol' '
>
> test_expect_success 'with cr-at-eol (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=trailing,cr-at-eol" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... and this one, too.
> + echo "F whitespace=trailing,cr-at-eol" >.gitattributes &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT error >/dev/null &&
> @@ -179,11 +179,11 @@ test_expect_success 'trailing empty lines (2)' '
> '
>
> test_expect_success 'do not color trailing cr in context' '
> - git config --unset core.whitespace
> + test_might_fail git config --unset core.whitespace &&
> rm -f .gitattributes &&
> echo AAAQ | tr Q "\015" >G &&
> git add G &&
> - echo BBBQ | tr Q "\015" >>G
> + echo BBBQ | tr Q "\015" >>G &&
> git diff --color G | tr "\015" Q >output &&
> grep "BBB.*${blue_grep}Q" output &&
> grep "AAA.*\[mQ" output
> --
> 1.7.3.95.g14291
--
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