refname模棱两可，并且拉取失败 [英] refname is ambiguous and pull failing

问题描述

我运行了以下命令，因为我想将生产分支移回而无需先结帐：

I ran the following command as I wanted to move my production branch back without having to checkout first:

git branch -f production HEAD~1

结帐生产时，我现在收到以下警告：

I am now getting the following warning when I checkout production:

warning: refname 'production' is ambiguous.

然后我运行：

git pull

我收到以下错误：

First, rewinding head to replay your work on top of it...
Fast-forwarded production to 7463e01c536ad52746b8879ef3d70ffd5a8db31e.
error: Ref refs/heads/production is at 252038dfa22caba8a816a68dcb005c625e44c51f but expected ae5b621609c1b5b430e3d30711157298f842942a
fatal: Cannot lock the ref 'refs/heads/production'
Could not move back to refs/heads/production

我可以拉其他分支。我该如何解决？

I can pull on other branches though. How can I fix this?

其他信息

git tag 不返回任何输出。我以前有一个生产资料库，但现在将其重命名为可以使用

git tag doesn't return any output. I previously had a production repository, but I've now renamed it to live

> ~/repo (chris-membership-fees)$ git show-ref | grep production
88e0c37c9ae4ff6967ddd027b62b62fa2c0ac272 refs/heads/production
9d739cff44a898f0c68da33fb22a230985e479ce refs/remotes/backup/production

~/repo (chris-membership-fees)$ git branch -a | grep production
  production
  remotes/backup/production

日志

我将第一个修订版本标记为a，将第二个修订版本标记为b（请注意，由于现在生产不同，修订版本号已更改）。这是日志，通过修饰来简化

I tagged the first revision as a and the second as b (note that the revision numbers have changed as production is now different). This is the log, simplified by decoration

* commit 7463e01c536ad52746b8879ef3d70ffd5a8db31e (**tag: a**, backup/live-master, production, live-master)
| 
| Date:   Wed Dec 28 11:47:49 2011 +1100
| 
|     Merge remote-tracking branch 'origin/joseph-quick-fix'
|  
* commit f35f0259c4e36d46dd1df71b3293bef6105cef98 (origin/hotfix-googleplusdirectconnect)
| 
| Date:   Fri Dec 23 12:25:27 2011 +1100
| 
|     Add google plus link tag to home page for direct connect
|    
*   commit 8b3a30ef2909439ac18b65ebbb316eb0cdd2d61c
|\  Merge: f696f3e 88e0c37
| | 
| | Date:   Wed Dec 21 14:28:45 2011 +1100
| | 
| |     Merge branch 'master' into chris-hotfix
| |   
* | commit f696f3e2b8f4a19ec2b2c2a3638c68e7a52836e3 (origin/chris-hotfix, backup/chris-hotfix, chris-hotfix)
| | 
| | Date:   Wed Dec 21 11:56:10 2011 +1100
| | 
| |     Fixed buyer price info
| |     
| *   commit 88e0c37c9ae4ff6967ddd027b62b62fa2c0ac272
| |\  Merge: c9655da ae5b621
| |/  
|/|   Date:   Wed Dec 21 11:53:36 2011 +1100
| |   
| |       Merge branch 'master' of git.freelancer.com:production into production
| |   
* | commit ae5b621609c1b5b430e3d30711157298f842942a (HEAD, **tag: b**)
| | 
| | Date:   Wed Dec 21 10:51:47 2011 +1100
| | 
| |     Merge branch 'master' of git.freelancer.com:production
| |   
| * commit c9655da9c1627ab53720ae818affdd1e6f14119f (origin/game-shadow2)
| | 
| | Date:   Tue Dec 20 18:41:57 2011 -0500
| | 
| |     * Removed debugging code
| |     
| *   commit ca88d33538bd3b99ea7c186b5b531e611847989d
| |\  Merge: 99e983a c397a8b
| |/  
|/|   Date:   Tue Dec 20 17:25:24 2011 -0500
| |   
| |       Merge remote-tracking branch 'production/master' into shadow2

推荐答案

感谢Git上的Johannes Sixt 邮件列表。

Thanks to Johannes Sixt on the Git mailing list.

最可能的原因是，您直接在.git目录的
中获得了生产参考。也许您或您的一个脚本使用了'git update-ref production ae5b621'意外地创建了
，即，没有
给出完整的引用路径名

The most likely reason is that you have a ref 'production' directly in the .git directory. Perhaps you or one of your scripts created it accidentally using 'git update-ref production ae5b621', i.e., without giving the full ref path name

它实际上不在.git根目录中，但是我在分支机构中有一个空的生产文件夹。

It wasn't actually in the .git root directory, but I had an empty production folder in branches.

这篇关于refname模棱两可，并且拉取失败的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！