public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Siddharth Shrimali <r.siddharth.shrimali@gmail.com>
Cc: Patrick Steinhardt <ps@pks.im>,
	git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] t3200: replace hardcoded null OID with $ZERO_OID
Date: Wed, 11 Mar 2026 21:17:26 +0000	[thread overview]
Message-ID: <abHb5k4otqTSgPb8@fruit.crustytoothpaste.net> (raw)
In-Reply-To: <20260311174120.76871-1-r.siddharth.shrimali@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 805 bytes --]

On 2026-03-11 at 17:41:20, Siddharth Shrimali wrote:
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index c58e505c43..e7829c2c4b 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -1494,7 +1494,8 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '
>  '
>  
>  test_expect_success '--merged catches invalid object names' '
> -	test_must_fail git branch --merged 0000000000000000000000000000000000000000
> +	test_must_fail git branch --merged $ZERO_OID 2>err &&
> +	test_grep "must point to a commit" err
>  '

Yeah, this seems reasonable.  It's failing, but for the wrong reasons,
so checking the error message in addition to switching to `$ZERO_OID`
seems like the right thing to do.
-- 
brian m. carlson (they/them)
Toronto, Ontario, CA

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

  reply	other threads:[~2026-03-11 21:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-11 10:58 [PATCH] t3200: replace hardcoded null OID with $ZERO_OID Siddharth Shrimali
2026-03-11 11:20 ` Patrick Steinhardt
2026-03-11 17:41   ` [PATCH v2] " Siddharth Shrimali
2026-03-11 21:17     ` brian m. carlson [this message]
2026-03-12  6:07     ` Patrick Steinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=abHb5k4otqTSgPb8@fruit.crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ps@pks.im \
    --cc=r.siddharth.shrimali@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox