[PATCH 1/2] t3404: add failing branch symref test
- From
Son Luong Ngoc via GitGitGadget <gitgitgadget@gmail.com>
- Date
- May 28, 2026, 05:42 UTC
- Message-ID
- <a550923440a233daea0b9819e05d6c380de00d09.1779946921.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2126.git.1779946921.gitgitgadget@gmail.com>
From: Son Luong Ngoc <sluongng@gmail.com>
rebase --update-refs queues local branch decorations by their literal refnames. When a branch such as refs/heads/main is a symbolic ref to the current branch, the normal rebase path first updates the current branch and the queued symref update later tries to update the same referent with the old value it recorded before the rebase.
Add a known-breakage test that exercises this case so that the fix can flip it to test_expect_success. The expected behavior is that the branch symref keeps pointing at the rebased current branch.
Signed-off-by: Son Luong Ngoc <sluongng@gmail.com> --- t/t3404-rebase-interactive.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 58b3bb0c27..42ba8cc313 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1978,6 +1978,31 @@ test_expect_success '--update-refs ignores non-branch decorations' ' test_cmp expect actual ' +test_expect_failure '--update-refs skips branch symrefs to current branch' ' + test_when_finished " + test_might_fail git rebase --abort && + git checkout primary && + test_might_fail git symbolic-ref -d refs/heads/update-refs-symref-alias && + test_might_fail git branch -D update-refs-symref update-refs-symref-base + " && + git checkout -B update-refs-symref-base primary && + test_commit --no-tag update-refs-symref-base symref-base.t && + git checkout -B update-refs-symref && + test_commit --no-tag update-refs-symref-topic symref-topic.t && + git checkout update-refs-symref-base && + test_commit --no-tag update-refs-symref-newbase symref-newbase.t && + git checkout update-refs-symref && + git symbolic-ref refs/heads/update-refs-symref-alias refs/heads/update-refs-symref && + + git rebase --update-refs update-refs-symref-base 2>err && + + test_cmp_rev update-refs-symref-base update-refs-symref^ && + test_cmp_rev refs/heads/update-refs-symref refs/heads/update-refs-symref-alias && + test_write_lines refs/heads/update-refs-symref >expect && + git symbolic-ref refs/heads/update-refs-symref-alias >actual && + test_cmp expect actual +' + test_expect_success '--update-refs updates refs correctly' ' git checkout -B update-refs no-conflict-branch && git branch -f base HEAD~4 &&
-- gitgitgadget