Re: [Freemint-discuss] Bintray integration / git force-push needed

[David G. <dga...@gm...>]

Hi Miro, thanks for tanking the time to explain me this so I can understand it.


2018-03-18 6:21 GMT+01:00 Miro Kropáček <mir...@gm...>:
> Hi David,
>
> On 14 March 2018 at 10:32, David Gálvez <dga...@gm...> wrote:
>>
>> OK. Perhaps not very important but some differentiate commits now are
>> together with others in one big commit.
>>
>> For example this PCI-BIOS differentiate commit:
>>
>> https://github.com/DavidGZ/freemint/commit/9d0a0b5701f3421bc9cc61eb352c6cedbfaf9d50#diff-ae395915bb2dac4ca2ce7c3217a8d1ab
>>
>> Now is mixed with some other commits with no relation:
>>
>> https://github.com/freemint/freemint/commit/72818b654b732896deaa31d9a686a3951b96f71a#diff-ae395915bb2dac4ca2ce7c3217a8d1ab
>
> That would suck a lot, wouldn't it? Fortunately, that's not the case. The
> commit you're looking for is from Alan's branch. The one you have in mind is
> of course in the main, master, branch all along:
> https://github.com/freemint/freemint/commit/1340007b#diff-dce566b7
>
> Basically it looks like this:
>
> commit1 -> commit2 -> commit3 (master) * -> commit 4 (still in master, your
> changes) -> ... -> merge back from Alan's branch -> ...
>                                                                      ->
> Alan's branch -> Alan's commit 4 -> ... -> Alan's merge from trunk (master,
> "lots of api changes") -> ... -> merge back to master
>
> So you don't care what kind of merges happened in Alan's branch, he can do
> whatever he likes there, only the end result (merging usbtos back to master)
> matters.

But I still don't understand why git sometime shows me Alan's branch
history and sometimes main branch history.

For example for "git log sys/kentry.c" git shows me "commit
1340007b4dd3cd98ee98f2a231df416fcbc6a1e2" from main branch:

commit d1759b9c15f0253ffdbb70ad646d568563fb9e62
Author: David Gálvez <dga...@gm...>
Date:   Fri Feb 16 19:04:41 2018 +0100

    Delete CVS's keyword $Id$ from a bunch of files

    This keyword is unused since the migration to Git.

commit b86bf7b52f5c8b456654e8c7145d9a98eeb0d80c
Author: Alan Hourihane <al...@fa...>
Date:   Sun Apr 26 16:16:04 2015 +0000

    Export SCSIDRV interface to kentry.
    Contributed by David Galvez.

commit f165a8f240d228cd21396ee149576f59c055aea2
Author: Alan Hourihane <al...@fa...>
Date:   Fri Apr 17 17:04:52 2015 +0000

    Add XHDI driver to kentry structure.
    Contributed by David Gálvez.

commit 1340007b4dd3cd98ee98f2a231df416fcbc6a1e2
Author: Alan Hourihane <al...@fa...>
Date:   Wed Mar 26 21:59:14 2014 +0000

    Add PCI-BIOS functions to kentry.
    Contributed by David Galvez.

commit dce566b718dd03990b378664e5f58bd341a6b198
Author: Alan Hourihane <al...@fa...>
Date:   Wed Mar 26 10:16:36 2014 +0000

    Remove XHDI_MASS_STORAGE_SUPPORT define.
    Contributed by David Galvez.





But for "git log sys/libkern/kernel_module.h" git shows me "commit
72818b654b732896deaa31d9a686a3951b96f71a" from Alan's branch and not
the commit I mentioned above where the file was originally changed in
the main branch:

commit d1759b9c15f0253ffdbb70ad646d568563fb9e62
Author: David Gálvez <dga...@gm...>
Date:   Fri Feb 16 19:04:41 2018 +0100

    Delete CVS's keyword $Id$ from a bunch of files

    This keyword is unused since the migration to Git.

commit b86bf7b52f5c8b456654e8c7145d9a98eeb0d80c
Author: Alan Hourihane <al...@fa...>
Date:   Sun Apr 26 16:16:04 2015 +0000

    Export SCSIDRV interface to kentry.
    Contributed by David Galvez.

commit 080a0ae516eeb6908e9789a7be5f7a3d068add3c
Author: Alan Hourihane <al...@fa...>
Date:   Sat Apr 18 11:07:18 2015 +0000

    Fix typo in structure's name,
    Contributed by David Gálvez.

commit f165a8f240d228cd21396ee149576f59c055aea2
Author: Alan Hourihane <al...@fa...>
Date:   Fri Apr 17 17:04:52 2015 +0000

    Add XHDI driver to kentry structure.
    Contributed by David Gálvez.

commit 72818b654b732896deaa31d9a686a3951b96f71a
Author: Alan Hourihane <al...@fa...>
Date:   Tue Apr 8 18:33:42 2014 +0000

    Lots of API updates.
    Lots of TOSONLY updates.
    Add USB mouse driver.
    Merge from trunk.

commit c54e4dc1b355d3c81e678b810773a8e214e96ad8
Author: Alan Hourihane <al...@fa...>
Date:   Thu Mar 27 18:38:58 2014 +0000

    Add c_conout

commit e01e106894b1618a49748bf06a9a578f037cc323
Author: Alan Hourihane <al...@fa...>
Date:   Mon Feb 18 23:35:32 2013 +0000

    Add machine dependent module paths.
    Contributed by Miro Kropacek.