Re: Bug report
- From
- Aleksandar Pavic <pavic.aleksandar@nsinfo.co.rs>
- Date
- Aug 31, 2017, 14:55 UTC
- Message-ID
- <e334fd40-0bf2-21d8-e647-ef1195911e04@nsinfo.co.rs>
- In-Reply-To
- <CA++fsGHFwoLvwO121aDEgi1dZbwwfogdWbxxRx+ci7T1RDCAnw@mail.gmail.com>
Hm, thanks, but the link was not helpful, there are no merge commits to master branch.
Those changes should have not been undone, that's how we caught it, because 1 line peace of code introduced new feature (+-10% tolerance on credit card verification amount).
So most likeley they were undone, but our tree is pretty simple, we have master and production branches.
On 31.08.2017. 16:19, Dov Grobgeld wrote:
Show 39 quoted lines
> The following answer that I got back in 2015 from Jeff King might be > relevant to your problem: > > https://marc.info/?l=git&m=144178948506788&w=2 > > Regards, > Dov > > On Thu, Aug 31, 2017 at 9:36 AM, Kevin Daudt <me@ikke.info> wrote: >> On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote: >>> I have a file >>> >>> app/Controller/CustomerCardVerificationController.php >>> >>> And when I take a look at changes log, I get this (no matter which tool I >>> use): >>> >>> 2017-07-31 19:41 dule o membership renew payment email >>> 2017-06-07 08:59 Dusan Tatic o cc refund clean >>> 2017-04-15 00:16 Miodrag Dragić o refound admin payment >>> 2017-03-20 12:02 Dusan Tatic o CardVerification card connect >>> 2017-03-16 15:59 Aleksandar Pavic o paypal >>> 2017-03-10 13:34 Aleksandar Pavic o Production branch >>> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev >>> >>> However if I manually browse thru revisions and open revision from >>> 03/27/2017 07:05 PM >>> >>> I can see the change in that file which is unlisted above, at revision >>> ff9f4946e109bd234d438e4db1d319b1f6cb6580 >>> >>> And I'm at master branch all the time... >>> >>> We wouldn't have noticed that if it weren't one important feature... >>> >> What does git branch --contains ff9f4946e109bd234d438e4db1d319b1f6cb6580 >> return? >> >> Where did you find this commit?