Git development
 help / color / mirror / Atom feed
From: Pablo Sabater <pabloosabaterr@gmail.com>
To: git@vger.kernel.org
Cc: me@runxiyu.org, gitster@pobox.com, christian.couder@gmail.com,
	karthik.188@gmail.com, jltobler@gmail.com,
	ayu.chandekar@gmail.com, siddharthasthana31@gmail.com,
	chandrapratap3519@gmail.com,
	Pablo Sabater <pabloosabaterr@gmail.com>
Subject: [GSoC PATCH 0/3] receive-pack: fix HEAD check for updateInstead
Date: Mon, 30 Mar 2026 13:18:19 +0200	[thread overview]
Message-ID: <20260330111822.165188-1-pabloosabaterr@gmail.com> (raw)
In-Reply-To: <20260223141236.22476-1-me@runxiyu.org>

When a bare repo has linked worktrees, and its HEAD points to an unborn branch,
pushing to a wt branch with updateInstead fails and rejects the push, even if
the wt is clean.

This happens because HEAD is checked only for the bare repo context, instead
of the wt.

This series includes Runxi's test, a cleanup of a test that messes with Runxi's
test and the fix for the issue.

Pablo Sabater (2):
  t5516: clean up cloned and new-wt in denyCurrentBranch and worktrees
    test
  receive-pack: use worktree HEAD for updateInstead

Runxi Yu (1):
  t5516: test updateInstead with worktree and unborn bare HEAD

 builtin/receive-pack.c | 39 +++++++++++++++------------------------
 t/t5516-fetch-push.sh  | 15 +++++++++++++++
 2 files changed, 30 insertions(+), 24 deletions(-)


base-commit: ca1db8a0f7dc0dbea892e99f5b37c5fe5861be71
-- 
2.43.0


  parent reply	other threads:[~2026-03-30 11:18 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-23 14:12 [PATCH git] t5516: test updateInstead with worktree and unborn bare HEAD Runxi Yu
2026-02-23 19:15 ` Junio C Hamano
2026-02-24  4:33   ` Runxi Yu
2026-03-03 10:03     ` Runxi Yu
2026-03-30 11:18 ` Pablo Sabater [this message]
2026-03-30 11:18   ` [GSoC PATCH 1/3] " Pablo Sabater
2026-03-30 11:18   ` [GSoC PATCH 2/3] t5516: clean up cloned and new-wt in denyCurrentBranch and worktrees test Pablo Sabater
2026-03-30 11:18   ` [GSoC PATCH 3/3] receive-pack: use worktree HEAD for updateInstead Pablo Sabater
2026-03-30 15:26   ` [GSoC PATCH 0/3] receive-pack: fix HEAD check " Junio C Hamano
2026-03-30 18:49     ` Pablo
2026-03-31 22:21   ` Junio C Hamano

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=20260330111822.165188-1-pabloosabaterr@gmail.com \
    --to=pabloosabaterr@gmail.com \
    --cc=ayu.chandekar@gmail.com \
    --cc=chandrapratap3519@gmail.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jltobler@gmail.com \
    --cc=karthik.188@gmail.com \
    --cc=me@runxiyu.org \
    --cc=siddharthasthana31@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