From: Bence Ferdinandy <bence@ferdinandy•com>
To: git@vger•kernel.org
Cc: Christian Hesse <mail@eworm•de>,
"Christian Hesse" <list@eworm•de>,
Bence Ferdinandy <bence@ferdinandy•com>
Subject: [PATCH] fetch set_head: fix non-mirror remotes in bare repositories
Date: Sun, 12 Jan 2025 17:51:22 +0100 [thread overview]
Message-ID: <20250112165125.130400-1-bence@ferdinandy.com> (raw)
In-Reply-To: <20250111202628.0e5894e4@leda.eworm.net>
In b1b713f722 (fetch set_head: handle mirrored bare repositories,
2024-11-22) it was implicitly assumed that all remotes will be mirrors
in a bare repository, thus fetching a non-mirrored remote could lead to
HEAD pointing to a non-existent reference. Make sure we only overwrite
HEAD if we are in a bare repository and fetching from a mirror.
Otherwise, proceed as normally, and create
refs/remotes/<nonmirrorremote>/HEAD instead.
Signed-off-by: Bence Ferdinandy <bence@ferdinandy•com>
Reported-by: Christian Hesse <list@eworm•de>
---
builtin/fetch.c | 15 ++++++++-------
t/t5505-remote.sh | 10 ++++++++++
t/t5510-fetch.sh | 13 +++++++++++++
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index fe2b26c74a..625d45be8b 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1618,9 +1618,9 @@ static void report_set_head(const char *remote, const char *head_name,
}
static int set_head(const struct ref *remote_refs, int follow_remote_head,
- const char *no_warn_branch)
+ const char *no_warn_branch, int mirror)
{
- int result = 0, create_only, is_bare, was_detached;
+ int result = 0, create_only, baremirror, was_detached;
struct strbuf b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT,
b_local_head = STRBUF_INIT;
const char *remote = gtransport->remote->name;
@@ -1655,9 +1655,9 @@ static int set_head(const struct ref *remote_refs, int follow_remote_head,
if (!head_name)
goto cleanup;
- is_bare = is_bare_repository();
- create_only = follow_remote_head == FOLLOW_REMOTE_ALWAYS ? 0 : !is_bare;
- if (is_bare) {
+ baremirror = is_bare_repository() && mirror;
+ create_only = follow_remote_head == FOLLOW_REMOTE_ALWAYS ? 0 : !baremirror;
+ if (baremirror) {
strbuf_addstr(&b_head, "HEAD");
strbuf_addf(&b_remote_head, "refs/heads/%s", head_name);
} else {
@@ -1665,7 +1665,7 @@ static int set_head(const struct ref *remote_refs, int follow_remote_head,
strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", remote, head_name);
}
/* make sure it's valid */
- if (!is_bare && !refs_ref_exists(refs, b_remote_head.buf)) {
+ if (!baremirror && !refs_ref_exists(refs, b_remote_head.buf)) {
result = 1;
goto cleanup;
}
@@ -1925,7 +1925,8 @@ static int do_fetch(struct transport *transport,
}
}
if (set_head(remote_refs, transport->remote->follow_remote_head,
- transport->remote->no_warn_branch))
+ transport->remote->no_warn_branch,
+ transport->remote->mirror))
;
/*
* Way too many cases where this can go wrong
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 519f7973e3..c75cfe968f 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -589,6 +589,16 @@ test_expect_success 'add --mirror setting HEAD' '
)
'
+test_expect_success 'non-mirror fetch does not interfere with mirror' '
+ mkdir headnotmain &&
+ (
+ cd headnotmain &&
+ git init --bare -b notmain &&
+ git remote add -f other ../two &&
+ test "$(git symbolic-ref HEAD)" = "refs/heads/notmain"
+ )
+'
+
test_expect_success 'add --mirror=fetch' '
mkdir mirror-fetch &&
git init -b main mirror-fetch/parent &&
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 2d9587059f..cfa63ae086 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -84,6 +84,19 @@ test_expect_success "fetch test remote HEAD" '
branch=$(git rev-parse refs/remotes/origin/main) &&
test "z$head" = "z$branch"'
+test_expect_success "fetch test remote HEAD in bare repository" '
+ cd "$D" &&
+ git init --bare barerepo &&
+ cd barerepo &&
+ git remote add upstream ../two &&
+ git fetch upstream &&
+ git rev-parse --verify refs/remotes/upstream/HEAD &&
+ git rev-parse --verify refs/remotes/upstream/main &&
+ head=$(git rev-parse refs/remotes/upstream/HEAD) &&
+ branch=$(git rev-parse refs/remotes/upstream/main) &&
+ test "z$head" = "z$branch"'
+
+
test_expect_success "fetch test remote HEAD change" '
cd "$D" &&
cd two &&
base-commit: fbe8d3079d4a96aeb4e4529cc93cc0043b759a05
--
2.48.0.1.g32c193c8ca
next prev parent reply other threads:[~2025-01-12 16:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-11 19:26 fatal: Not a valid object name HEAD Christian Hesse
2025-01-12 14:17 ` Bence Ferdinandy
2025-01-13 16:30 ` Junio C Hamano
2025-01-12 16:51 ` Bence Ferdinandy [this message]
2025-01-23 21:00 ` [PATCH] fetch set_head: fix non-mirror remotes in bare repositories Junio C Hamano
2025-01-23 21:42 ` Bence Ferdinandy
2025-01-23 22:00 ` Eric Sunshine
2025-01-24 14:07 ` Christian Hesse
2025-01-24 17:17 ` Junio C Hamano
2025-01-24 5:56 ` Patrick Steinhardt
2025-01-24 10:30 ` Eric Sunshine
2025-01-24 16:07 ` Junio C Hamano
2025-01-26 22:01 ` Bence Ferdinandy
2025-01-26 22:01 ` Bence Ferdinandy
2025-01-26 22:02 ` [PATCH v2 1/2] fetch set_head: refactor to use remote directly Bence Ferdinandy
2025-01-26 22:02 ` [PATCH v2 2/2] fetch set_head: fix non-mirror remotes in bare repositories Bence Ferdinandy
2025-01-27 7:30 ` Patrick Steinhardt
2025-01-27 20:18 ` 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=20250112165125.130400-1-bence@ferdinandy.com \
--to=bence@ferdinandy$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=list@eworm$(echo .)de \
--cc=mail@eworm$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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