Skip to content

Missing some commits after gitlab migration

I was debugging a meek server setup and noticed that the meek repository I had checked out from before the gitlab migration has a git history inconsistent with the repository on Gitlab.

On my machine:

commit 46e612d2e9afd6e5dfa54c473ed17aeab49001af (HEAD -> main)
Author: David Fifield <david@bamsoftware.com>
Date:   Wed Dec 29 22:06:41 2021 -0700

    Fix the locking around rt.rt.
    
    sync.Once does not prevent other goroutines from accessing a variable
    that has not been defined yet.

commit 88fd7233036450e0d3278f3afe0a9995974ae120
Author: David Fifield <david@bamsoftware.com>
Date:   Wed Dec 29 21:35:06 2021 -0700

    Only lock the assignment to rt.rt, not the whole RoundTrip.
    
    We need to guard against concurrent modification of rt.rt, but once it
    is set, we many concurrently call rt.rt.RoundTrip. The way this was
    written before, it was preventing more than one RoundTrip from happening
    at once. (Which was not noticeable, because the protocol serialized all
    RoundTrips.)

commit 6600c52acb7979b08dd0916a7a779dd0e5dde0b0
Author: David Fifield <david@bamsoftware.com>
Date:   Tue Sep 14 13:22:10 2021 -0600

    Add missing transport to ServerTransportListenAddr in meek-server man page.

On Gitlab:

commit e195aff85633786ee4b8f175cb7a2ec8ee12952b (HEAD -> main, origin/main, origin/HEAD)
Author: meskio <meskio@torproject.org>
Date:   Tue Apr 18 19:04:02 2023 +0200

    Add CI

commit 048441a54233c0e64bd3f9821b2cc9f8a36f5aea
Author: meskio <meskio@torproject.org>
Date:   Tue Apr 18 18:52:29 2023 +0200

    Move the project to gitlab

commit cb192ff42a3662b6cbbfc901114c499366c7b8a0
Author: meskio <meskio@torproject.org>
Date:   Tue Apr 18 17:49:11 2023 +0200

    Use goptlib from gitlab
    
    Related: tpo/anti-censorship/team/-/issues/86

commit 6600c52acb7979b08dd0916a7a779dd0e5dde0b0
Author: David Fifield <david@bamsoftware.com>
Date:   Tue Sep 14 13:22:10 2021 -0600

    Add missing transport to ServerTransportListenAddr in meek-server man page.

Did something happen with the migration that resulted in some commits getting dropped?