{"issue":{"state":"open","created_at":"2011-11-19T16:14:15Z","updated_at":"2011-11-29T15:16:31Z","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"},"comments":9,"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,"labels":[],"pull_request":{"patch_url":null,"html_url":null,"diff_url":null},"number":106,"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:16:31Z","updated_at":"2011-11-29T15:16:31Z","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":"I reset master back to before the disconnect, deleted the `tfs/default` remote branch, then did a `git tfs fetch` and was able to reproduce the behavior. There is still a divergence. \r\n\r\n![Screen shot](http://i.imgur.com/DdjlQ.png)","id":2931009,"url":"https://api.github.com/repos/spraints/git-tfs/issues/comments/2931009"}}