git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-29 22:43:24 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'bf/fetch-set-head-fix' into jch

Browse Source 
Fetching into a bare repository incorrectly assumed it always used
a mirror layout when deciding to update remote-tracking HEAD, which
has been corrected.

* bf/fetch-set-head-fix:
  fetch set_head: fix non-mirror remotes in bare repositories

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Junio C Hamano
2025-01-21 15:15:08 -08:00
committed by Johannes Schindelin
parent 120b27442a 447cdec2e9
commit 1804320830
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/fetch.c
View File

@@ -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

10
t/t5505-remote.sh
View File

@@ -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 &&

13
t/t5510-fetch.sh
View File

@@ -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 &&