diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-11-12 23:08:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-21 00:41:51 (GMT) |
| commit | e959a18ee73d3e16c4ac2f300d61755e6b022bd7 (patch) | |
| tree | f22f555edd2bb779ba5be995ad5800b7213e8af3 /t/t5520-pull.sh | |
| parent | 5540ed27bcf30869b2f56e421cb9f52520d2c0a0 (diff) | |
| download | git-e959a18ee73d3e16c4ac2f300d61755e6b022bd7.zip git-e959a18ee73d3e16c4ac2f300d61755e6b022bd7.tar.gz git-e959a18ee73d3e16c4ac2f300d61755e6b022bd7.tar.bz2 | |
t5520: don't put git in upstream of pipe
Before, if the invocation of git failed, it would be masked by the pipe
since only the return code of the last element of a pipe is used.
Rewrite the test to put the git command on its own line so its return
code is not masked.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 8b7e7ae..8ddf89e 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -668,7 +668,8 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' ' ( cd corrupt && test_commit one && - obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") && + git rev-parse --verify HEAD >head && + obj=$(sed "s#^..#&/#" head) && rm -f .git/objects/$obj && test_must_fail git pull --rebase ) |