mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
47c6ef1c8d
A wildcard refspec is internally parsed into a refspec structure with src and dst strings. Many parts of the code assumed that these do not include the trailing "/*" when matching the wildcard pattern with an actual ref we see at the remote. What this meant was that we needed to make sure not just that the prefix matched, and also that a slash followed the part that matched. But a codepath that scans the result from ls-remote and finds matching refs forgot to check the "matching part must be followed by a slash" rule. This resulted in "refs/heads/b1" from the remote side to mistakenly match the source side of "refs/heads/b/*:refs/remotes/b/*" refspec. Worse, the refspec crafted internally by "git-clone", and a hardcoded preparsed refspec that is used to implement "git-fetch --tags", violated this "parsed widcard refspec does not end with slash" rule; simply adding the "matching part must be followed by a slash" rule then would have broken codepaths that use these refspecs. This commit changes the rule to require a trailing slash to parsed wildcard refspecs. IOW, "refs/heads/b/*:refs/remotes/b/*" is parsed as src = "refs/heads/b/" and dst = "refs/remotes/b/". This allows us to simplify the matching logic because we only need to do a prefixcmp() to notice "refs/heads/b/one" matches and "refs/heads/b1" does not. Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
31 lines
555 B
Bash
Executable file
31 lines
555 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='fetch follows remote tracking branches correctly'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
>file &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m Initial &&
|
|
git branch b-0 &&
|
|
git branch b1 &&
|
|
git branch b/one &&
|
|
test_create_repo other &&
|
|
(
|
|
cd other &&
|
|
git config remote.origin.url .. &&
|
|
git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
|
|
)
|
|
'
|
|
|
|
test_expect_success fetch '
|
|
(
|
|
cd other && git fetch origin &&
|
|
test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
|
|
)
|
|
'
|
|
|
|
test_done
|