我发生问题的原因是upstream configuration设置错了。
重新设置方法:
1,在Branch上点右键 -> Confirgure Branch
2,在弹出的对话框里的“upstream branch”里选择我们要的Branch。(我的错误是因为我的upsream branch指向了一个已经删除了的branch)
3,再点OK键就完成了。
再有就是可以看看“.git/config”文件,有没有什么问题。
这是有问题的文件,里面写master2.8,但这个Branch已经没了。
$ cat .git/config
[core]
symlinks = false
repositoryformatversion = 0
filemode = false
logallrefupdates = true
[remote "origin"]
url = gogs@git.xxx.io:xxx/xxxx.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "master2.5"]
remote = origin
merge = refs/heads/master2.5
[branch "master2.4"]
remote = origin
merge = refs/heads/master2.4
[branch "master2.7"]
remote = origin
merge = refs/heads/master2.8
[branch "bk_master2.6_before_delete_2.7_mistask_upload_code"]
remote = origin
merge = refs/heads/bk_master2.6_before_delete_2.7_mistask_upload_code
[branch "master2.6"]
remote = origin
merge = refs/heads/master2.6
[branch "cz1_master2.7"]
remote = origin
merge = refs/heads/cz1_master2.7
下面是用Eclipse修改没问题的config文件,可以看到,master2.8已经不存在了
$ cat .git/config
[core]
symlinks = false
repositoryformatversion = 0
filemode = false
logallrefupdates = true
[remote "origin"]
url = gogs@git.xxx.io:xxx/xxxx.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "master2.5"]
remote = origin
merge = refs/heads/master2.5
[branch "master2.4"]
remote = origin
merge = refs/heads/master2.4
[branch "master2.7"]
remote = origin
merge = refs/heads/master2.7
[branch "bk_master2.6_before_delete_2.7_mistask_upload_code"]
remote = origin
merge = refs/heads/bk_master2.6_before_delete_2.7_mistask_upload_code
[branch "master2.6"]
remote = origin
merge = refs/heads/master2.6
[branch "cz1_master2.7"]
remote = origin
merge = refs/heads/cz1_master2.7