Git: refname 'master' is ambiguous

问题:

I've looked at all of the other ambiguous refname questions and none of them seem to help. Why am I getting this warning?

$ git checkout master warning: refname 'master' is ambiguous. $ git show-ref master eef61c00da690f093063ac5a728e22fd21648104 refs/heads/master $ git branch -a   checkers   exercises * master $ git remote -v $  

回答1:

TL;DR: save and delete the tag, as Ashutosh Jindal comments (see "Rename a tag in git?"):

git tag tag-master master git tag -d master 

---

Original answer:

Most of the sources I see (like this FAQ) point to the same cause:

When you try to checkout a local branch, you get a

warning: refname 'branch-name' is ambiguous 

This can happen if you've created a local branch with the same name as a remote tag.
Git should be checking out your local branch, but instead it's trying to checkout the tag, and it gets confused.

The initial import of several trees were problematic, since they contained identically named branches and tags. We have since addressed a lot of these issues, by renaming away the tags.

In your case, you don't have a remote, but local tags named like your branch could be enough.

The ambiguity is specified in gitrevision

, e.g. master, heads/master, refs/heads/master

A symbolic ref name. E.g. master typically means the commit object referenced by refs/heads/master.
If you happen to have both heads/master and tags/master, you can explicitly say heads/master to tell git which one you mean.
When ambiguous, a is disambiguated by taking the first match in the following rules:

If $GIT_DIR/ exists, that is what you mean (this is usually useful only for HEAD, FETCH_HEAD, ORIG_HEAD, MERGE_HEAD and CHERRY_PICK_HEAD);

• otherwise, refs/ if it exists;
• otherwise, refs/tags/ if it exists;
• otherwise, refs/heads/ if it exists;
• otherwise, refs/remotes/ if it exists;
• otherwise, refs/remotes//HEAD if it exists.

So check where master can be found in your repo.

And git checkout heads/master would always work.
Warning: by default, this would checkout the branch in a DETACHED HEAD mode. See "Why does git checkout with explicit 'refs/heads/branch' give detached HEAD?".

To avoid that, and still use an unambiguous ref, type:

git checkout -B master heads/master 

回答2:

Although this doesn't apply to the OP's situation, I got myself a refname is ambiguous warning after accidentally doing a git branch origin/branch instead of a git checkout origin/branch. This created a local branch named origin/branch, which made it ambiguous with the remote branch. Solving the problem was as simple as git branch -D origin/branch (safe because -D operates on local branches).

回答3:

This just happened to me. I somehow had a file .git/master containing a sha. Not sure how that got there, but when I deleted it, the error went away. If you read the accepted answer carefully, this is "expected behavior" but you won't see that .git/master if you do e.g. git show-ref master because it follows slightly different rules.

文章来源: Git: refname 'master' is ambiguous