{"thread":{"id":"46688","subject":"Bug report","startedAt":"2017-08-30T22:38:21Z","lastAt":"2017-09-02T08:49:54Z","messageCount":6,"participants":["Aleksandar Pavic","Kevin Daudt","Dov Grobgeld","Stephan Beyer","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"327472","messageId":"db0580dc-3ce0-47ba-b82a-b1e50b9d0a3a@nsinfo.co.rs","threadId":"46688","inReplyTo":null,"subject":"Bug report","fromName":"Aleksandar Pavic","fromEmail":"pavic.aleksandar@nsinfo.co.rs","sentAt":"2017-08-30T21:25:00Z","receivedAt":"2017-08-30T22:38:21Z","isPatch":false,"sender":{"key":"pavic.aleksandar@nsinfo.co.rs","avatar":null},"body":" I have a file\n\n app/Controller/CustomerCardVerificationController.php\n\nAnd when I take a look at changes log, I get this (no matter which tool \nI use):\n\n2017-07-31 19:41 dule o membership renew payment email\n2017-06-07 08:59 Dusan Tatic o cc refund clean\n2017-04-15 00:16 Miodrag Dragić o refound admin payment\n2017-03-20 12:02 Dusan Tatic o CardVerification card connect\n2017-03-16 15:59 Aleksandar Pavic o paypal\n2017-03-10 13:34 Aleksandar Pavic o Production branch\n2017-03-10 13:01 Aleksandar Pavic I Migrating dev\n\nHowever if I manually browse thru revisions and open revision from \n03/27/2017 07:05 PM\n\nI can see the change in that file which is unlisted above, at revision \nff9f4946e109bd234d438e4db1d319b1f6cb6580\n\nAnd I'm at master branch all the time...\n\nWe wouldn't have noticed that if it weren't one important feature...\n\n"},{"id":"327477","messageId":"20170831063614.GI3839@alpha.vpn.ikke.info","threadId":"46688","inReplyTo":"db0580dc-3ce0-47ba-b82a-b1e50b9d0a3a@nsinfo.co.rs","subject":"Re: Bug report","fromName":"Kevin Daudt","fromEmail":"me@ikke.info","sentAt":"2017-08-31T06:36:14Z","receivedAt":"2017-08-31T06:43:00Z","isPatch":false,"sender":{"key":"me@ikke.info","avatar":"https://avatars.githubusercontent.com/u/135698?v=4"},"body":"On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:\n> I have a file\n> \n> app/Controller/CustomerCardVerificationController.php\n> \n> And when I take a look at changes log, I get this (no matter which tool I\n> use):\n> \n> 2017-07-31 19:41 dule o membership renew payment email\n> 2017-06-07 08:59 Dusan Tatic o cc refund clean\n> 2017-04-15 00:16 Miodrag Dragić o refound admin payment\n> 2017-03-20 12:02 Dusan Tatic o CardVerification card connect\n> 2017-03-16 15:59 Aleksandar Pavic o paypal\n> 2017-03-10 13:34 Aleksandar Pavic o Production branch\n> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev\n> \n> However if I manually browse thru revisions and open revision from\n> 03/27/2017 07:05 PM\n> \n> I can see the change in that file which is unlisted above, at revision\n> ff9f4946e109bd234d438e4db1d319b1f6cb6580\n> \n> And I'm at master branch all the time...\n> \n> We wouldn't have noticed that if it weren't one important feature...\n> \n\nWhat does git branch --contains ff9f4946e109bd234d438e4db1d319b1f6cb6580\nreturn?\n\nWhere did you find this commit?\n"},{"id":"327483","messageId":"CA++fsGHFwoLvwO121aDEgi1dZbwwfogdWbxxRx+ci7T1RDCAnw@mail.gmail.com","threadId":"46688","inReplyTo":"20170831063614.GI3839@alpha.vpn.ikke.info","subject":"Re: Bug report","fromName":"Dov Grobgeld","fromEmail":"dov.grobgeld@gmail.com","sentAt":"2017-08-31T14:19:16Z","receivedAt":"2017-08-31T14:19:27Z","isPatch":false,"sender":{"key":"dov.grobgeld@gmail.com","avatar":"https://gravatar.com/avatar/b74b57a9ce04ef5f356927856e125f1e70e7ce38772c5b8793b854b830f0fe6c?d=mp&s=160"},"body":"The following answer that I got back in 2015 from Jeff King might be\nrelevant to your problem:\n\nhttps://marc.info/?l=git&m=144178948506788&w=2\n\nRegards,\nDov\n\nOn Thu, Aug 31, 2017 at 9:36 AM, Kevin Daudt wrote:\n> On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:\n>> I have a file\n>>\n>> app/Controller/CustomerCardVerificationController.php\n>>\n>> And when I take a look at changes log, I get this (no matter which tool I\n>> use):\n>>\n>> 2017-07-31 19:41 dule o membership renew payment email\n>> 2017-06-07 08:59 Dusan Tatic o cc refund clean\n>> 2017-04-15 00:16 Miodrag Dragić o refound admin payment\n>> 2017-03-20 12:02 Dusan Tatic o CardVerification card connect\n>> 2017-03-16 15:59 Aleksandar Pavic o paypal\n>> 2017-03-10 13:34 Aleksandar Pavic o Production branch\n>> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev\n>>\n>> However if I manually browse thru revisions and open revision from\n>> 03/27/2017 07:05 PM\n>>\n>> I can see the change in that file which is unlisted above, at revision\n>> ff9f4946e109bd234d438e4db1d319b1f6cb6580\n>>\n>> And I'm at master branch all the time...\n>>\n>> We wouldn't have noticed that if it weren't one important feature...\n>>\n>\n> What does git branch --contains ff9f4946e109bd234d438e4db1d319b1f6cb6580\n> return?\n>\n> Where did you find this commit?\n"},{"id":"327485","messageId":"e334fd40-0bf2-21d8-e647-ef1195911e04@nsinfo.co.rs","threadId":"46688","inReplyTo":"CA++fsGHFwoLvwO121aDEgi1dZbwwfogdWbxxRx+ci7T1RDCAnw@mail.gmail.com","subject":"Re: Bug report","fromName":"Aleksandar Pavic","fromEmail":"pavic.aleksandar@nsinfo.co.rs","sentAt":"2017-08-31T14:55:50Z","receivedAt":"2017-08-31T14:56:10Z","isPatch":false,"sender":{"key":"pavic.aleksandar@nsinfo.co.rs","avatar":null},"body":"Hm, thanks, but the link was not helpful, there are no merge commits to \nmaster branch.\n\nThose changes should have not been undone, that's how we caught it, \nbecause 1 line peace of code introduced new feature (+-10% tolerance on \ncredit card verification amount).\n\nSo most likeley they were undone, but our tree is pretty simple, we have \nmaster and production branches.\n\n\n\nOn 31.08.2017. 16:19, Dov Grobgeld wrote:\n> The following answer that I got back in 2015 from Jeff King might be\n> relevant to your problem:\n>\n> https://marc.info/?l=git&m=144178948506788&w=2\n>\n> Regards,\n> Dov\n>\n> On Thu, Aug 31, 2017 at 9:36 AM, Kevin Daudt wrote:\n>> On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:\n>>> I have a file\n>>>\n>>> app/Controller/CustomerCardVerificationController.php\n>>>\n>>> And when I take a look at changes log, I get this (no matter which tool I\n>>> use):\n>>>\n>>> 2017-07-31 19:41 dule o membership renew payment email\n>>> 2017-06-07 08:59 Dusan Tatic o cc refund clean\n>>> 2017-04-15 00:16 Miodrag Dragić o refound admin payment\n>>> 2017-03-20 12:02 Dusan Tatic o CardVerification card connect\n>>> 2017-03-16 15:59 Aleksandar Pavic o paypal\n>>> 2017-03-10 13:34 Aleksandar Pavic o Production branch\n>>> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev\n>>>\n>>> However if I manually browse thru revisions and open revision from\n>>> 03/27/2017 07:05 PM\n>>>\n>>> I can see the change in that file which is unlisted above, at revision\n>>> ff9f4946e109bd234d438e4db1d319b1f6cb6580\n>>>\n>>> And I'm at master branch all the time...\n>>>\n>>> We wouldn't have noticed that if it weren't one important feature...\n>>>\n>> What does git branch --contains ff9f4946e109bd234d438e4db1d319b1f6cb6580\n>> return?\n>>\n>> Where did you find this commit?\n\n"},{"id":"327486","messageId":"be66e3d8-3673-fe5e-c65d-2dc9a7202315@gmx.net","threadId":"46688","inReplyTo":"20170831063614.GI3839@alpha.vpn.ikke.info","subject":"Re: Bug report","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2017-08-31T16:23:06Z","receivedAt":"2017-08-31T16:23:18Z","isPatch":false,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"On 08/31/2017 08:36 AM, Kevin Daudt wrote:\n> On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:\n>> I have a file\n>>\n>> app/Controller/CustomerCardVerificationController.php\n>>\n>> And when I take a look at changes log, I get this (no matter which tool I\n>> use):\n>>\n>> 2017-07-31 19:41 dule o membership renew payment email\n>> 2017-06-07 08:59 Dusan Tatic o cc refund clean\n>> 2017-04-15 00:16 Miodrag Dragić o refound admin payment\n>> 2017-03-20 12:02 Dusan Tatic o CardVerification card connect\n>> 2017-03-16 15:59 Aleksandar Pavic o paypal\n>> 2017-03-10 13:34 Aleksandar Pavic o Production branch\n>> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev\n>>\n>> However if I manually browse thru revisions and open revision from\n>> 03/27/2017 07:05 PM\n>>\n>> I can see the change in that file which is unlisted above, at revision\n>> ff9f4946e109bd234d438e4db1d319b1f6cb6580\n\nI am not sure if I fully understand but I guess your commit ff9f4946e1\nhas been commited at detached HEAD.\n\nYou could do\n\tgit log --oneline --graph master ff9f4946e1\nto see where the \"missing\" commit lies.\nAnd probably a\n\tgit cherry-pick ff9f4946e1\nmight pick your missing feature.\n\nStephan\n"},{"id":"327529","messageId":"20170902084944.2mw64l5wod6vj3fh@sigill.intra.peff.net","threadId":"46688","inReplyTo":"db0580dc-3ce0-47ba-b82a-b1e50b9d0a3a@nsinfo.co.rs","subject":"Re: Bug report","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-09-02T08:49:44Z","receivedAt":"2017-09-02T08:49:54Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:\n\n> I have a file\n> \n> app/Controller/CustomerCardVerificationController.php\n> \n> And when I take a look at changes log, I get this (no matter which tool I\n> use):\n> \n> 2017-07-31 19:41 dule o membership renew payment email\n> 2017-06-07 08:59 Dusan Tatic o cc refund clean\n> 2017-04-15 00:16 Miodrag Dragić o refound admin payment\n> 2017-03-20 12:02 Dusan Tatic o CardVerification card connect\n> 2017-03-16 15:59 Aleksandar Pavic o paypal\n> 2017-03-10 13:34 Aleksandar Pavic o Production branch\n> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev\n>\n> However if I manually browse thru revisions and open revision from\n> 03/27/2017 07:05 PM\n> \n> I can see the change in that file which is unlisted above, at revision\n> ff9f4946e109bd234d438e4db1d319b1f6cb6580\n\nHow are you invoking the log? Are you doing:\n\n git log app/Controller/CustomerCardVerificationController.php\n\nor similar? If that is the case, then history simplification may be\ncausing the results you see. And even you don't _see_ any merges in the\noutput, that is because they were simplified away. And the commit you\nare looking for may have been on a side branch that was simplified away.\n\nIf you do:\n\n git log --full-history app/...\n\ndoes the commit you are interested in show up? If so, then it was\nremoved due to history simplification. And if you are surprised that a\nside branch was simplified away, that is most likely because there is a\nmis-merge in your history (some merge which threw away the changes on a\nside branch).\n\nTry:\n\n git log --graph --oneline --name-status --full-history app/...\n\nto see the whole shape of history, including which commits touched the\nfile.\n\nYou can read more about it in the \"History Simplification\" section of\n\"git help log\".\n\n-Peff\n"}]}