After introspecting the .git directory, it seems like a stale .git/master was created somehow. Why does git-show-ref not show .git/master as a ref? On Aug 18, 2011, at 10:14 AM, Dave Zarzycki wrote: > I have a local git-svn repository that is now in a weird state and would any tips for how to debug this. Thanks! > > davez > > > > $ git --version > git version 1.7.6 > $ git checkout master > warning: refname 'master' is ambiguous. > Already on 'master' > $ git show-ref | grep master > d510ee7a969c908a20ab8abab08dd3ad09870508 refs/heads/master > $ git svn rebase > warning: refname 'master' is ambiguous. > First, rewinding head to replay your work on top of it... > Fast-forwarded master to refs/remotes/svn/trunk. > error: Ref refs/heads/master is at d510ee7a969c908a20ab8abab08dd3ad09870508 but expected 014cd21f9f6e88e4515ed99c632308a954085a34 > fatal: Cannot lock the ref 'refs/heads/master'. > Could not move back to refs/heads/master > rebase refs/remotes/svn/trunk: command returned error: 1 > > $ > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html