{"thread":{"id":"28154","subject":"git-svn repo in weird state","startedAt":"2011-08-18T14:14:20Z","lastAt":"2011-08-19T09:54:57Z","messageCount":3,"participants":["Dave Zarzycki","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"173759","messageId":"85C67F68-AEF7-4E98-9388-C16BD04A68F8@apple.com","threadId":"28154","inReplyTo":null,"subject":"git-svn repo in weird state","fromName":"Dave Zarzycki","fromEmail":"zarzycki@apple.com","sentAt":"2011-08-18T14:14:20Z","receivedAt":"2011-08-18T14:14:20Z","isPatch":false,"sender":{"key":"zarzycki@apple.com","avatar":"https://avatars.githubusercontent.com/u/1071982?v=4"},"body":"I have a local git-svn repository that is now in a weird state and would any tips for how to debug this. Thanks!\n\ndavez\n\n\n\n$ git --version\ngit version 1.7.6\n$ git checkout master\nwarning: refname 'master' is ambiguous.\nAlready on 'master'\n$ git show-ref | grep master\nd510ee7a969c908a20ab8abab08dd3ad09870508 refs/heads/master\n$ git svn rebase\nwarning: refname 'master' is ambiguous.\nFirst, rewinding head to replay your work on top of it...\nFast-forwarded master to refs/remotes/svn/trunk.\nerror: Ref refs/heads/master is at d510ee7a969c908a20ab8abab08dd3ad09870508 but expected 014cd21f9f6e88e4515ed99c632308a954085a34\nfatal: Cannot lock the ref 'refs/heads/master'.\nCould not move back to refs/heads/master\nrebase refs/remotes/svn/trunk: command returned error: 1\n\n$ \n"},{"id":"173760","messageId":"2F128636-95A4-4216-894A-F0295A2D23EB@apple.com","threadId":"28154","inReplyTo":"85C67F68-AEF7-4E98-9388-C16BD04A68F8@apple.com","subject":"Re: git-svn repo in weird state","fromName":"Dave Zarzycki","fromEmail":"zarzycki@apple.com","sentAt":"2011-08-18T14:22:54Z","receivedAt":"2011-08-18T14:22:54Z","isPatch":false,"sender":{"key":"zarzycki@apple.com","avatar":"https://avatars.githubusercontent.com/u/1071982?v=4"},"body":"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?\n\n\nOn Aug 18, 2011, at 10:14 AM, Dave Zarzycki wrote:\n\n> I have a local git-svn repository that is now in a weird state and would any tips for how to debug this. Thanks!\n> \n> davez\n> \n> \n> \n> $ git --version\n> git version 1.7.6\n> $ git checkout master\n> warning: refname 'master' is ambiguous.\n> Already on 'master'\n> $ git show-ref | grep master\n> d510ee7a969c908a20ab8abab08dd3ad09870508 refs/heads/master\n> $ git svn rebase\n> warning: refname 'master' is ambiguous.\n> First, rewinding head to replay your work on top of it...\n> Fast-forwarded master to refs/remotes/svn/trunk.\n> error: Ref refs/heads/master is at d510ee7a969c908a20ab8abab08dd3ad09870508 but expected 014cd21f9f6e88e4515ed99c632308a954085a34\n> fatal: Cannot lock the ref 'refs/heads/master'.\n> Could not move back to refs/heads/master\n> rebase refs/remotes/svn/trunk: command returned error: 1\n> \n> $ \n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"},{"id":"173844","messageId":"4E4E32F1.9040808@drmicha.warpmail.net","threadId":"28154","inReplyTo":"2F128636-95A4-4216-894A-F0295A2D23EB@apple.com","subject":"Re: git-svn repo in weird state","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-08-19T09:54:57Z","receivedAt":"2011-08-19T09:54:57Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Dave Zarzycki venit, vidit, dixit 18.08.2011 16:22:\n> 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?\n\nBecause it's not in .git/refs/?\n\nMichael\n"}]}