[Phpmyadmin-devel] need help understanding what happened with a merge

[Dieter Adriaenssens]

Hi,

2010/11/30 Michal Čihař <michal at cihar.com>:
> Hi
>
> Dne Mon, 29 Nov 2010 19:52:50 +0100
> Dieter Adriaenssens <dieter.adriaenssens at gmail.com> napsal(a):
>
>> I was looking to solve a bug [0], and found some differences between
>> master and QA_3_3 (where QA_3_3 seemed correct). I wondered why it was
>> changed and found that the change was introduced by a merge I did [1]
>> : commit 20a402ba29776f2ed1ba3122e48df98bfc11cafe
>>
>> But what's strange about this commit is that it seems to merge two
>> commits. One of mine, where I solved a bug (diff1 [2]) and another one
>> (diff2 [3]), where the reported bug [0] is introduced.
>
> It merges just two commits - 7a23444 366d50a, both of them pretty
> easy.
>
>> When I try to figure out where this commit comes from, I only find it
>> was committed by me. But I'm quite sure I didn't. Moreover because
>> that commit changes a lot of files, and I changed only ChangeLog and
>> server_status.php
>
> I guess you just misunderstood diff1 and diff2 links in gitweb - diff1
> shows diff of first commit in merge to merge commit, so that is
> equivalent to:
>
> git diff 7a23444..20a402b
>
> and
>
> git diff 366d50a..20a402b
>
> The first diff actually means diff of old master HEAD to new master
> HEAD, the only difference being your merge commit.
>
> The second one shows difference between QA_3_3 (which you were
> merging) and new master HEAD. What means it shows all changes made for
> 3.4, what is indeed huge diff.

I was indeed confused by diff2. Thanks for explaining.

>
> To find guilty commit it is better to use git blame:
>
> git blame server_status.php
>
> ...and I guess it is mine bc97eaeb.

git blame looks like a really useful and powerful tool. I learned
something today, thanks.
I will take a look at your commit later, and figure out how your fix
can be improved to solve the reported bug in the status page.

Kind regards,

Dieter Adriaenssens