I checked my local repository, and find that when: remote.origin.url= https://git-wip-us.apache.org/repos/asf/hbase.git then the output of "git branch -r | grep -i master" would be: ======================== origin/0.90_master_rewrite origin/HEAD -> origin/master origin/master ========================
and when: remote.origin.url=git://git.apache.org/hbase.git then the output of "git branch -r | grep -i master" would be: ======================== origin/0.90_master_rewrite origin/HEAD -> origin/master origin/Master ======================== The problem happens when remote.origin.url=git://git.apache.org/hbase.git Best Regards, Yu On 12 April 2016 at 22:46, Sean Busbey <bus...@cloudera.com> wrote: > I similarly do not see it listed in our set of head refs: > > https://git1-us-west.apache.org/repos/asf?p=hbase.git;a=heads > > On Tue, Apr 12, 2016 at 9:19 AM, Ted Yu <yuzhih...@gmail.com> wrote: > > $ git clone -b Master https://github.com/apache/hbase.git ma > > ... > > warning: Remote branch Master not found in upstream origin, using HEAD > > instead > > > > Where did you see the Master branch ? > > > > On Tue, Apr 12, 2016 at 6:20 AM, Yu Li <car...@gmail.com> wrote: > > > >> Hi All, > >> > >> As titled, there seems to be a new origin/Master branch created > recently, > >> and when trying to pull the changes, my git client complains: > >> ========================== > >> error: Ref refs/remotes/origin/master is at > >> 90d3b03b674e6718ffcd3eaef00845be5e77656f but expected > >> c2f67a053ebe687773e5e35aa7c060de964dbb68 > >> error: Cannot lock the ref 'refs/remotes/origin/master'. > >> From git://git.apache.org/hbase > >> ! c2f67a0..ff9c92e master -> origin/master (unable to update > local > >> ref) > >> ========================== > >> > >> This link > >> < > >> > http://stackoverflow.com/questions/11796580/git-pull-error-error-remote-ref-is-at-but-expected > >> > > >> explains the root cause of the problem, simply copy-paste as follows: > >> ========================== > >> If you are running git under a file system that is not case sensitive > >> (Windows or OS X) this will occur if there are two branches with the > same > >> name but different capitalisation, e.g. user_model_changes and > >> User_model_changes as both of the remote branches will match the same > >> tracking ref. > >> ========================== > >> > >> So, my question is that what the new origin/Master branch is created for > >> and could we remove it? Or plz kindly let me know if anyway to make git > >> pull work if we have to keep the branch. Many thanks. > >> > >> Best Regards, > >> Yu > >> > > > > -- > busbey >
