git/t/t4012-diff-binary.sh, branch v2.32.2

tests: remove most uses of test_i18ncmp

2021-02-11T07:48:27Z

As a follow-up to d162b25f956 (tests: remove support for GIT_TEST_GETTEXT_POISON, 2021-01-20) remove most uses of test_i18ncmp via a simple s/test_i18ncmp/test_cmp/g search-replacement. I'm leaving t6300-for-each-ref.sh out due to a conflict with in-flight changes between "master" and "seen", as well as the prerequisite itself due to other changes between "master" and "next/seen" which add new test_i18ncmp uses. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

tests: remove most uses of C_LOCALE_OUTPUT

2021-02-11T07:48:26Z

As a follow-up to d162b25f956 (tests: remove support for GIT_TEST_GETTEXT_POISON, 2021-01-20) remove those uses of the now always true C_LOCALE_OUTPUT prerequisite from those tests which declare it as an argument to test_expect_{success,failure}. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

t: use test_might_fail() instead of manipulating exit code manually

2018-07-03T19:38:04Z

These tests manually coerce the exit code of invoked commands to "success" when they don't care if the command succeeds or fails since failure of those commands should not cause the test to fail overall. In doing so, they intentionally break the &&-chain. Modernize by replacing manual exit code management with test_might_fail() and a normal &&-chain. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

builtin/apply: make parse_single_patch() return -1 on error

2016-08-11T19:41:46Z

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. To do that in a compatible manner with the rest of the error handling in builtin/apply.c, parse_single_patch() should return a negative integer instead of calling die(). Let's do that by using error() and let's adjust the related test cases accordingly. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

t4012-diff-binary.sh: use the $( ... ) construct for command substitution

2014-04-30T18:08:05Z

The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`$.*$`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

Fix tests under GETTEXT_POISON on git-apply

2012-08-27T16:26:30Z

Use the i18n-specific test functions in test scripts for git-apply. This issue was was introduced in the following commits: de373 i18n: apply: mark parseopt strings for translation 3638e i18n: apply: mark strings for translation and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

t4012: Use test_must_fail instead of if-else

2012-07-16T20:51:25Z

Make the code less bulky and easier to read. Also do not overlook failures like e.g. git failing because of unexpected signals. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano

t4012: use 'printf' instead of 'dd' to generate a binary file

2012-07-16T20:51:10Z

For some reason, 'echo X | dd bs=1k seek=1' creates a file with 2050 bytes on Windows instead of the expected 1026 bytes, so that a test fails. Since the actual contents of the file are irrelevant as long as there is at least one zero byte so that the diff machinery recognizes it as binary, use printf to generate it. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano

t4012: Re-indent test snippets

2012-07-16T20:50:50Z

Most one-level indents were 1 HT (horizontal tab) followed by 1 SP. Remove the SP. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano

t4012: Make --shortstat test more robust

2012-07-16T20:50:28Z

The --shortstat test depends on the same scenario as the --stat test. Use the part of the same expected result for the --stat test to avoid duplicating it manually. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano