From: "Kristofer Karlsson via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Kristofer Karlsson <krka@spotify.com>,
Derrick Stolee <stolee@gmail.com>,
Kristofer Karlsson <krka@spotify.com>,
Kristofer Karlsson <krka@spotify.com>
Subject: [PATCH v3 2/2] t6600: add tests for duplicate tips in tips_reachable_from_bases()
Date: Sat, 16 May 2026 15:59:41 +0000 [thread overview]
Message-ID: <4d11ebb79ea780c1ce619c66cf9693d819d86d4b.1778947182.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2116.v3.git.1778947182.gitgitgadget@gmail.com>
From: Kristofer Karlsson <krka@spotify.com>
When multiple refs point to the same commit, the reachability check
must handle them correctly. Add three tests:
- duplicate tips, all reachable
- duplicate tips, none reachable
- duplicate tips at the minimum generation (exercises the
early-termination advancement logic)
Suggested-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Kristofer Karlsson <krka@spotify.com>
---
t/t6600-test-reach.sh | 45 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index dc0421ed2f..9486002866 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -612,6 +612,51 @@ test_expect_success 'for-each-ref merged:none' '
--format="%(refname)" --stdin
'
+test_expect_success 'for-each-ref merged:duplicate, all reachable' '
+ git branch dup-a commit-3-3 &&
+ git branch dup-b commit-3-3 &&
+ cat >input <<-\EOF &&
+ refs/heads/commit-1-1
+ refs/heads/dup-a
+ refs/heads/dup-b
+ EOF
+ cat >expect <<-\EOF &&
+ refs/heads/commit-1-1
+ refs/heads/dup-a
+ refs/heads/dup-b
+ EOF
+ run_all_modes git for-each-ref --merged=commit-5-5 \
+ --format="%(refname)" --stdin
+'
+
+test_expect_success 'for-each-ref merged:duplicate, none reachable' '
+ cat >input <<-\EOF &&
+ refs/heads/dup-a
+ refs/heads/dup-b
+ refs/heads/commit-9-9
+ EOF
+ >expect &&
+ run_all_modes git for-each-ref --merged=commit-2-2 \
+ --format="%(refname)" --stdin
+'
+
+test_expect_success 'for-each-ref merged:duplicate at min generation' '
+ git branch dup-c commit-1-1 &&
+ git branch dup-d commit-1-1 &&
+ cat >input <<-\EOF &&
+ refs/heads/dup-c
+ refs/heads/dup-d
+ refs/heads/commit-5-5
+ EOF
+ cat >expect <<-\EOF &&
+ refs/heads/commit-5-5
+ refs/heads/dup-c
+ refs/heads/dup-d
+ EOF
+ run_all_modes git for-each-ref --merged=commit-5-5 \
+ --format="%(refname)" --stdin
+'
+
# For get_branch_base_for_tip, we only care about
# first-parent history. Here is the test graph with
# second parents removed:
--
gitgitgadget
prev parent reply other threads:[~2026-05-16 15:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 18:07 [PATCH] commit-reach: use the decoration hash for tips_reachable_from_bases() Kristofer Karlsson via GitGitGadget
2026-05-15 21:14 ` Jeff King
2026-05-16 8:23 ` Kristofer Karlsson
2026-05-16 13:46 ` Derrick Stolee
2026-05-16 9:16 ` [PATCH v2] commit-reach: use object flags " Kristofer Karlsson via GitGitGadget
2026-05-16 15:59 ` [PATCH v3 0/2] " Kristofer Karlsson via GitGitGadget
2026-05-16 15:59 ` [PATCH v3 1/2] " Kristofer Karlsson via GitGitGadget
2026-05-16 15:59 ` Kristofer Karlsson via GitGitGadget [this message]
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=4d11ebb79ea780c1ce619c66cf9693d819d86d4b.1778947182.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=krka@spotify.com \
--cc=peff@peff.net \
--cc=stolee@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