| commit | cc04adc2d0514f0f666b7e123ba2022b1a20dcde | |
| author | SZEDER Gábor <szeder.dev@gmail.com> | |
| Thu, 8 Feb 2018 15:56:50 +0000 (8 16:56 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 Feb 2018 18:54:27 +0000 (8 10:54 -0800) | ||
| tree | 483102783becea5fcef51284e5ab29c53cd2e640 | treesnapshot (tar.gz zip) |
| parent | a4ca4553e08ab5626f744171c1d2d7fbfed11e8b | commitdiff |
t6022: don't run 'git merge' upstream of a pipe
The primary purpose of 't6022-merge-rename.sh' is to test 'git merge',
but one of the tests runs it upstream of a pipe, hiding its exit code.
Consequently, the test could continue even if 'git merge' exited with
error.
Use an intermediate file between 'git merge' and 'test_i18ngrep' to
catch a potential failure of the former.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The primary purpose of 't6022-merge-rename.sh' is to test 'git merge',
but one of the tests runs it upstream of a pipe, hiding its exit code.
Consequently, the test could continue even if 'git merge' exited with
error.
Use an intermediate file between 'git merge' and 'test_i18ngrep' to
catch a potential failure of the former.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6022-merge-rename.sh | diffblobblamehistory |