{"thread":{"id":"39674","subject":"BUG: checkout won't checkout?","startedAt":"2015-06-18T22:07:18Z","lastAt":"2015-06-18T22:56:47Z","messageCount":7,"participants":["Luke Diamand","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"264257","messageId":"CAE5ih7-=WPme_BxgAjtm9hrShxTk1z+uDM-LXzc3BcN3n2vqAg@mail.gmail.com","threadId":"39674","inReplyTo":null,"subject":"BUG: checkout won't checkout?","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2015-06-18T22:07:18Z","receivedAt":"2015-06-18T22:07:18Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"This is probably user error, but I'm not sure what I'm doing wrong.\nI'm posting here in case anyone else gets the same thing\n\nI'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today.\n\nI've somehow ended up with history skipping back in time, but git not\nprepared to let let me fix it, or something.\n\n$ git diff upstream/master -- subtree\n - lots of deltas, which look like I've reverted this back several\nrevisions (which I haven't AFAIK)\n$ git checkout upstream/master -- subtree\n$ git diff upstream/master -- subtree\n-- still lots of deltas\n$ git checkout upstream/master -- subtree\n$ git commit -m 'Revert unwanted changes'\n$ git diff upstream/master -- subtree\n-- still lots of deltas\n\nWhat am I doing wrong? Have I ended up in the middle of some weird\nstate (cherry-pick and rebase isn't in progress AFAIK).\n"},{"id":"264259","messageId":"CAE5ih7_ferSqBGnk=08DegqqpgpO7Mq8XWu4k-KAP4ENdxE_rg@mail.gmail.com","threadId":"39674","inReplyTo":"CAE5ih7-=WPme_BxgAjtm9hrShxTk1z+uDM-LXzc3BcN3n2vqAg@mail.gmail.com","subject":"Re: BUG: checkout won't checkout?","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2015-06-18T22:13:25Z","receivedAt":"2015-06-18T22:13:25Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"The other thing about these files is that they were all deleted a few\nweeks ago and have now come back.\n\nOn 18 June 2015 at 23:07, Luke Diamand wrote:\n> This is probably user error, but I'm not sure what I'm doing wrong.\n> I'm posting here in case anyone else gets the same thing\n>\n> I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today.\n>\n> I've somehow ended up with history skipping back in time, but git not\n> prepared to let let me fix it, or something.\n>\n> $ git diff upstream/master -- subtree\n> - lots of deltas, which look like I've reverted this back several\n> revisions (which I haven't AFAIK)\n> $ git checkout upstream/master -- subtree\n> $ git diff upstream/master -- subtree\n> -- still lots of deltas\n> $ git checkout upstream/master -- subtree\n> $ git commit -m 'Revert unwanted changes'\n> $ git diff upstream/master -- subtree\n> -- still lots of deltas\n>\n> What am I doing wrong? Have I ended up in the middle of some weird\n> state (cherry-pick and rebase isn't in progress AFAIK).\n"},{"id":"264261","messageId":"xmqq4mm4d53f.fsf@gitster.dls.corp.google.com","threadId":"39674","inReplyTo":"CAE5ih7-=WPme_BxgAjtm9hrShxTk1z+uDM-LXzc3BcN3n2vqAg@mail.gmail.com","subject":"Re: BUG: checkout won't checkout?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-18T22:28:04Z","receivedAt":"2015-06-18T22:28:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Luke Diamand writes:\n\n> This is probably user error, but I'm not sure what I'm doing wrong.\n> I'm posting here in case anyone else gets the same thing\n>\n> I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today.\n>\n> I've somehow ended up with history skipping back in time, but git not\n> prepared to let let me fix it, or something.\n>\n> $ git diff upstream/master -- subtree\n> - lots of deltas, which look like I've reverted this back several\n> revisions (which I haven't AFAIK)\n\nAre you on the right branch that you think you are working on?\n\n> $ git checkout upstream/master -- subtree\n> $ git diff upstream/master -- subtree\n> -- still lots of deltas\n\nDoes this show _ONLY_ additions? Or does it include modifications\nand removals?\n"},{"id":"264262","messageId":"xmqqzj3wbqcc.fsf@gitster.dls.corp.google.com","threadId":"39674","inReplyTo":"xmqq4mm4d53f.fsf@gitster.dls.corp.google.com","subject":"Re: BUG: checkout won't checkout?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-18T22:32:03Z","receivedAt":"2015-06-18T22:32:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n>> $ git checkout upstream/master -- subtree\n>> $ git diff upstream/master -- subtree\n>> -- still lots of deltas\n>\n> Does this show _ONLY_ additions? Or does it include modifications\n> and removals?\n\nThe reason I ask this question is because of \n\nhttp://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234924\n"},{"id":"264264","messageId":"CAE5ih79KhNXqvSNW-w8pMmiys2Dv24Rt4KFdRdoA9EuPDS3ELw@mail.gmail.com","threadId":"39674","inReplyTo":"xmqq4mm4d53f.fsf@gitster.dls.corp.google.com","subject":"Re: BUG: checkout won't checkout?","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2015-06-18T22:47:03Z","receivedAt":"2015-06-18T22:47:03Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On 18 June 2015 at 23:28, Junio C Hamano wrote:\n> Luke Diamand writes:\n>\n>> This is probably user error, but I'm not sure what I'm doing wrong.\n>> I'm posting here in case anyone else gets the same thing\n>>\n>> I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today.\n>>\n>> I've somehow ended up with history skipping back in time, but git not\n>> prepared to let let me fix it, or something.\n>>\n>> $ git diff upstream/master -- subtree\n>> - lots of deltas, which look like I've reverted this back several\n>> revisions (which I haven't AFAIK)\n>\n> Are you on the right branch that you think you are working on?\n\nYes.\n\n>\n>> $ git checkout upstream/master -- subtree\n>> $ git diff upstream/master -- subtree\n>> -- still lots of deltas\n>\n> Does this show _ONLY_ additions? Or does it include modifications\n> and removals?\n\nThere are indeed _ONLY_ additions.\n"},{"id":"264265","messageId":"xmqqvbekbpc0.fsf@gitster.dls.corp.google.com","threadId":"39674","inReplyTo":"CAE5ih79KhNXqvSNW-w8pMmiys2Dv24Rt4KFdRdoA9EuPDS3ELw@mail.gmail.com","subject":"Re: BUG: checkout won't checkout?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-18T22:53:51Z","receivedAt":"2015-06-18T22:53:51Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Luke Diamand writes:\n\n>>> $ git checkout upstream/master -- subtree\n>>> $ git diff upstream/master -- subtree\n>>> -- still lots of deltas\n>>\n>> Does this show _ONLY_ additions? Or does it include modifications\n>> and removals?\n>\n> There are indeed _ONLY_ additions.\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234912\nhttp://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234924\n\nIn short, it is an intended behaviour, both Peff and I consider that\nthe intention is bad and the behaviour should be changed.\n\nBut nothing has happened yet (it is listed as one of the \"leftover\nbits\" http://git-blame.blogspot.com/p/leftover-bits.html).\n"},{"id":"264267","messageId":"CAE5ih78-1EDFTNhxy-PZBtT=HHNMPa=nX0UyfoXYXZXEKy0hPw@mail.gmail.com","threadId":"39674","inReplyTo":"xmqqvbekbpc0.fsf@gitster.dls.corp.google.com","subject":"Re: BUG: checkout won't checkout?","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2015-06-18T22:56:47Z","receivedAt":"2015-06-18T22:56:47Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On 18 June 2015 at 23:53, Junio C Hamano wrote:\n> Luke Diamand writes:\n>\n>>>> $ git checkout upstream/master -- subtree\n>>>> $ git diff upstream/master -- subtree\n>>>> -- still lots of deltas\n>>>\n>>> Does this show _ONLY_ additions? Or does it include modifications\n>>> and removals?\n>>\n>> There are indeed _ONLY_ additions.\n>\n> http://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234912\n> http://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234924\n>\n> In short, it is an intended behaviour, both Peff and I consider that\n> the intention is bad and the behaviour should be changed.\n\nOK, thanks, it makes sense now!\n\n>\n> But nothing has happened yet (it is listed as one of the \"leftover\n> bits\" http://git-blame.blogspot.com/p/leftover-bits.html).\n\nOK, I'll keep it in mind.\n\nLuke\n"}]}