diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-01-23 14:00:44 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-23 13:25:12 -0800 |
| commit | 9aebc4708ad21cc18f6d5c6909381abb0fe01023 (patch) | |
| tree | 8bcc8c7d093146472229cb0d4debdaebb0be9f95 | |
| parent | git-svn tests: rewrite brittle tests to use "--[no-]merges". (diff) | |
| download | tgif-9aebc4708ad21cc18f6d5c6909381abb0fe01023.tar.xz | |
upload-pack tests: avoid a non-zero "grep" exit status
Continue changing a test that 763b47bafa (t5703: stop losing return
codes of git commands, 2019-11-27) already refactored.
This was originally added as part of a series to add support for
running under bash's "set -o pipefail", under that mode this test will
fail because sometimes there's no commits in the "objs" output.
It's easier to fix that than exempt these tests under a hypothetical
"set -o pipefail" test mode. It looks like we probably won't have
that, but once we've dug this code up let's refactor it[2] so we don't
hide a potential pipe failure.
1. https://lore.kernel.org/git/xmqqzh18o8o6.fsf@gitster.c.googlers.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5703-upload-pack-ref-in-want.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index eab966985b..5d825b1781 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -16,7 +16,8 @@ get_actual_commits () { test-tool pkt-line unpack-sideband <out >o.pack && git index-pack o.pack && git verify-pack -v o.idx >objs && - grep commit objs | cut -d" " -f1 | sort >actual_commits + sed -n -e 's/\([0-9a-f][0-9a-f]*\) commit .*/\1/p' objs >objs.sed && + sort >actual_commits <objs.sed } check_output () { |