threads / discuss / 55477

How to checkout a branch (and not a tag)

Subject: How to checkout a branch (and not a tag)

## tl;dr

3 messages between Apr 11, 2021 and Apr 11, 2021.

replies: 2people: 2as markdown or json

Jeffrey Walton· Apr 11, 2021, 23:04 UTC · lore

I'm trying to checkout a branch called REL1_35 from https://github.com/wikimedia/mediawiki-skins-Cosmos. The repo also has a tag called REL1_35.

When I perform the following I apparently get the tag (with old files) and not the branch (with updated files):

    wiki_rel=REL1_53
    ...
    git fetch origin && git reset --hard "origin/${wiki_rel}" && \
        git checkout -f "${wiki_rel}" && git pull && git clean -xdf

I found https://groups.google.com/g/git-users/c/FfzGmqj6sNQ, but I am not following it. My .git/config looks like it is using the proper reference:

# cat skins/Cosmos/.git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = https://github.com/Universal-Omega/MediaWiki-Cosmos-skin.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "REL1_35"]
        remote = origin
        merge = refs/heads/REL1_35
How do I checkout the branch (and not a tag)?
Thanks in advance.
Junio C Hamano· Apr 11, 2021, 23:22 UTC · re: Jeffrey Walton · lore

Re: How to checkout a branch (and not a tag)

Jeffrey Walton <noloader@gmail.com> writes:
Show 8 quoted lines
> I'm trying to checkout a branch called REL1_35 from
> https://github.com/wikimedia/mediawiki-skins-Cosmos. The repo also has
> a tag called REL1_35.
>
> When I perform the following I apparently get the tag (with old files)
> and not the branch (with updated files):
>
>     wiki_rel=REL1_53

Hopefully this typo is not part of what contributed to your problem. Assuming that you actually used REL1_35 here...

>     ...
>     git fetch origin && git reset --hard "origin/${wiki_rel}" && \

...this should get their branches in refs/remotes/origin/, and would reset whatever local branch you are on to origin/REL1_35. So at this point, HEAD is the same as their REL1_35 branch.

>         git checkout -f "${wiki_rel}"

And this causes the tag/REL1_35, which was obtained from them, to be checked out to a detached HEAD.

What are you trying to do here? Do you want your own local REL1_35 branch, that starts at the same commit as their REL1_35 branch? If so, then instead of that "checkout", you would probably do

	git checkout -b REL1_35
Or whole thing up to this point would be
	git fetch origin &&
	git checkout -t -b REL1_35 origin/REL1_35

and then after this, your "git pull" while on your REL1_35 brnch would integrate with their REL1_35 branch [*]

[Footnote]
* Unless you have other funny configuration variables in the
  repository possibly from earlier random hacking, that is.
  Depending on the state of the repository before you started the
  "git fetch origin" step, commands like "git pull" and "git push"
  would behave differently.
Jeffrey Walton· Apr 11, 2021, 23:29 UTC · re: Junio C Hamano · lore

Re: How to checkout a branch (and not a tag)

On Sun, Apr 11, 2021 at 7:22 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 14 quoted lines
>
> Jeffrey Walton <noloader@gmail.com> writes:
>
> > I'm trying to checkout a branch called REL1_35 from
> > https://github.com/wikimedia/mediawiki-skins-Cosmos. The repo also has
> > a tag called REL1_35.
> >
> > When I perform the following I apparently get the tag (with old files)
> > and not the branch (with updated files):
> >
> >     wiki_rel=REL1_53
>
> Hopefully this typo is not part of what contributed to your problem.
> Assuming that you actually used REL1_35 here...
Yes, typo.
Show 14 quoted lines
> >     ...
> >     git fetch origin && git reset --hard "origin/${wiki_rel}" && \
>
> ...this should get their branches in refs/remotes/origin/, and would
> reset whatever local branch you are on to origin/REL1_35.  So at this
> point, HEAD is the same as their REL1_35 branch.
>
> >         git checkout -f "${wiki_rel}"
>
> And this causes the tag/REL1_35, which was obtained from them, to be
> checked out to a detached HEAD.
>
> What are you trying to do here?  Do you want your own local REL1_35
> branch, that starts at the same commit as their REL1_35 branch?
I want an exact copy of the remote branch.

After I get that copy, I usually delete unneeded fodder, like test gear and documentation.

Jeff

← back to recent threads