git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFD/PATCH 5/5] RFD: Disallow out-of-refspec refs within refs/remotes/* to be used as upstream

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 19, 2013, 19:51 UTC
Message-ID
<7vvc7iz4cz.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1366352442-501-6-git-send-email-johan@herland.net>
Johan Herland <johan@herland.net> writes:
Show 19 quoted lines
> The previous patch adds validation of upstream remote-tracking branches by
> parsing the configured refspecs, and making sure that the candidate upstream
> (if not already matching refs/heads/* or refs/remotes/*) is indeed a
> remote-tracking branch according to some remote's refspec. For a
> default/conventional setup, this check would automatically also cover
> everything within refs/remotes/*, meaning that the preceding check for
> refs/remotes/* is redundant (although quicker than the validation against
> refspecs). One could also argue that not everything inside refs/remotes/*
> should be automatically acceptable as an upstream, if one were to keep
> other (non-branch) type of remote-tracking refs there.
>
> This patch removes the simple check for refs/remotes/*, to make sure that
> _only_ validated remote-tracking branches (in addition to local branches)
> are allowed as upstreams.
>
> However, this means that for unconventional setups that place refs within
> refs/remotes/* without configuring a corresponding refspec, those refs will
> no longer be usable as upstreams. This breaks a few existing tests, which
> are marked as test_expect_failure by this patch, to make them easy to find.

I think these tests are too loosely written, making assumptions on what the back-then-current implementation actually does.

If refs/remotes/origin/koala/bear is a remote tracking branch for koala/bear branch taken from the origin, we will have a refspec that stores to refs/remotes/origin/koala/bear for _some_ remote (and in the most normal case it would be "origin").

Instead of expecting failures, I think it is a better change to make the test case more realistic by adding remote.origin.refspec as well.

Show 12 quoted lines
> diff --git a/t/t7201-co.sh b/t/t7201-co.sh
> index be9672e..7267ee2 100755
> --- a/t/t7201-co.sh
> +++ b/t/t7201-co.sh
> @@ -429,7 +429,7 @@ test_expect_success 'detach a symbolic link HEAD' '
>      test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
>  '
>  
> -test_expect_success \
> +test_expect_failure \
>      'checkout with --track fakes a sensible -b <name>' '
>      git update-ref refs/remotes/origin/koala/bear renamer &&
Previous: Johan Herland
Message 9 of 9 in “Improving the search for remote-tracking branches”
  1. 0/5 Improving the search for remote-tracking branchesJohan Herland, Apr 19, 2013
  2. 1/5 t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'Johan Herland, Apr 19, 2013
  3. 2/5 t2024: Show failure to use refspec when DWIMming remote branch namesJohan Herland, Apr 19, 2013
  4. 3/5 checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland, Apr 19, 2013
  5. Junio C HamanoApr 19, 2013
  6. Johan HerlandApr 20, 2013
  7. 4/5 branch.c: Look up refspecs to validate tracking branchesJohan Herland, Apr 19, 2013
  8. 5/5 RFD: Disallow out-of-refspec refs within refs/remotes/* to be used as upstreamJohan Herland, Apr 19, 2013
  9. Junio C HamanoApr 19, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.