Git获取远程仓库数据失败：origin被拒绝

Question

Git获取远程仓库数据失败：origin被拒绝

4

突然间我无法从远程获取数据了...

$git fetch origin
! [rejected]        master     -> origin/master  (non-fast-forward)

我不知道要寻找什么或发生了什么事情，因为它一直在工作到现在。关于配置方面并没有太多可说的。

[remote "origin"]
    url = http://xx.xxx.xx/project.git
    fetch = refs/tags/*:refs/tags/*
    fetch = refs/heads/*:refs/remotes/origin/*
    push = refs/tags/*:refs/tags/*
    push = refs/heads/master:refs/heads/master

其他同事可能在远程上做了些什么，但我们长期以来一直这样操作而没有遇到问题...

- Glasnhost

嗯，我执行了 $git fetch origin +refs/heads/master，似乎它起作用了...但我现在无法与远程合并：$ git merge origin master --> 致命错误：'origin' 没有指向一个提交 - Glasnhost

1个回答

网页内容由stack overflow 提供, 点击上面的

可以查看英文原文，
原文链接

- kostix · Accepted Answer

As you figured out by yourself, your fetch refspec is non-standard: the "+" prefix is missing. It is valid, just it's not what Git sets by default, as by default it overwrites the contents of remote branches when it fetches.

The default refspec Git adds for a named remote looks like this:
```
$ git config --get remote.origin.fetch
+refs/heads/*:refs/remotes/origin/*
```
So you should possibly just undo what you done by hand and stick with the defaults until you really understand how refspecs and fetching work (by reading the git-fetch manual page at least).
git merge origin master means «merge the branches "origin" and "master" into the local branch» (doing the so-called "octopus merge").

You either wanted git pull origin master (which means «fetch the branch "master" from "origin" and then merge it into the currently checked out branch») or git fetch origin followed by git merge origin/master, where "origin/master" refers to the remote branch supposedly created/updates as the result of git fetch origin doing its work (subject to the first point above).

底线是，似乎你试图通过编辑配置文件来创建一个远程，而不是只运行 git remote add <name> <git_url>。除非你真的了解内部工作原理，否则不要这样做。

同时，也需要阅读有关远程分支的文章。