diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-03-28 20:51:52 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 20:51:52 +0300 |
commit | 8069aa01cd83d187813117b34ed718245d56eac9 (patch) | |
tree | 1f58950ea6735b440b80acd2b4e6e639875ea0ff /t | |
parent | 6041a13ec2958b5c39a5f2bbadfffb4d4ce79d46 (diff) | |
parent | dfbfdc521daece092a599959da79c3c134f26b3c (diff) |
Merge branch 'fc/oid-quietly-parse-upstream'
"git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
parsed with GET_OID_QUIETLY option, did not quietly fail, which has
been corrected.
* fc/oid-quietly-parse-upstream:
object-name: fix quiet @{u} parsing
Diffstat (limited to 't')
-rwxr-xr-x | t/t1507-rev-parse-upstream.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index c34714ffe3..549eb315a9 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -183,6 +183,11 @@ test_expect_success '@{u} error message when no upstream' ' test_cmp expect actual ' +test_expect_success '@{u} silent error when no upstream' ' + test_must_fail git rev-parse --verify --quiet @{u} 2>actual && + test_must_be_empty actual +' + test_expect_success 'branch@{u} error message with misspelt branch' ' cat >expect <<-EOF && fatal: no such branch: ${SQ}no-such-branch${SQ} |