{"issue":{"created_at":"2011-11-19T16:14:15Z","state":"open","updated_at":"2011-11-29T15:50:44Z","comments":11,"user":{"gravatar_id":"c8c56e7cc86180729a188c0804032638","id":506899,"url":"https://api.github.com/users/sc68cal","login":"sc68cal","avatar_url":"https://secure.gravatar.com/avatar/c8c56e7cc86180729a188c0804032638?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"},"body":"During an rcheckin operation, a file was updated on the TFS side, stopping the rcheckin operation. After rebasing the commits that did not go back into TFS, I attempted to resume my workflow, but had difficulty doing any further rcheckin operations.\r\n\r\n[Backtrace](https://gist.github.com/1378989)\r\n\r\nDoing a subsequent tfs pull brought in further changes from the TFS side, but they were not connected to the history.\r\n\r\n![Imgur](http://i.imgur.com/F3x98.jpg)\r\n\r\nDoing a fresh `git tfs clone` did not cause any problems and I have been able to resume working as usual, but this seems like a very subtle bug that could cause trouble.\r\n\r\nI have saved the repo and will build a debug version so that I can step through it in Visual Studio.","assignee":null,"id":2288731,"number":106,"labels":[],"pull_request":{"patch_url":null,"html_url":null,"diff_url":null},"title":"Partly completed rcheckin leaves Git in bad state","closed_at":null,"html_url":"https://github.com/spraints/git-tfs/issues/106","url":"https://api.github.com/repos/spraints/git-tfs/issues/106","milestone":null},"action":"created","comment":{"created_at":"2011-11-29T15:50:44Z","updated_at":"2011-11-29T15:50:44Z","user":{"gravatar_id":"28ecd5a09c7cc3073097378e7a42b6f4","id":445893,"url":"https://api.github.com/users/ivan-danilov","login":"ivan-danilov","avatar_url":"https://secure.gravatar.com/avatar/28ecd5a09c7cc3073097378e7a42b6f4?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"},"body":"You can use `git cat-file -p <sha>` to view raw git objects like commits, trees and blobs. So, if look at first diverging commits you have 'same' commits with hashes <sha1> and <sha2> respectively you can execute `git cat-file -p <sha1>`, `git cat-file -p <sha2>` and manually look at which part is different.\r\n\r\nYou should see something like that for each execution:\r\n<pre>tree 7af5f92dc291d8a2b7cf07a91c5982316f994a91\r\nparent 733db4077d0fd75bf815b9a01477d59753776adc\r\nauthor ivan-danilov <smth@email.com> 1322148157 +0200\r\ncommitter ivan-danilov <smth@email.com> 1322494100 +0200\r\n\r\nMade column settings dialog work entirely (would be good to dissect by several commits)</pre>\r\n\r\nSo from that you can see which part is different actually: If `tree` is different - then there's some different content, `parent` is sha for parent commit, then author, committer and comment. Most probably there's some difference in comments.","id":2932233,"url":"https://api.github.com/repos/spraints/git-tfs/issues/comments/2932233"}}