1864468 - extra git remote makes lando to generate 00000's base commit

Status: RESOLVED FIXED

(Conduit :: Lando, defect)

Description

[:gerard-majax]

Filing as separate because https://bugzilla.mozilla.org/show_bug.cgi?id=1856590#c8 suggest the behavior glandium's was observing depended on branching from a project branch, while I was branching from bookmarks/central.

(In reply to Mike Hommey [:glandium] from comment #10)

FWIW, I did get a failure during patch application, but that's also because for complicated reasons, it found the base revision to be 0000000000000000000000000000000000000000.

We could add a workaround by setting --remote=<canonical remote name>

We could scan the result of git remote for remotes with the url for mozilla-unified or mozilla-central.

I have multiple remotes, including origin and local-bare:

$ LC_ALL=C git remote show origin | head
* remote origin
  Fetch URL: hg::https://hg.mozilla.org/mozilla-unified
  Push  URL: hg::https://hg.mozilla.org/mozilla-unified
  HEAD branch: branches/default/tip
  Remote branches:
    bookmarks/aurora                                                              tracked
    bookmarks/autoland                                                            tracked
    bookmarks/beta                                                                tracked
    bookmarks/central                                                             tracked
    bookmarks/esr10                                                               tracked
$ LC_ALL=C git remote show local-bare | head
* remote local-bare
  Fetch URL: git://nas.home/m-c/
  Push  URL: git://nas.home/m-c/
  HEAD branch: (unknown)
  Remote branches:
    android                                                 tracked
    bookmarks/central                                       tracked
    bug1432719_speechd_errors                               tracked
    bug1763819_leak_crashReporter                           tracked
    bug1774062_ctrl+s_bomb                                  tracked

I got the 000's base commit after I did branch from origin's bookmarks/central into my branch, then push it to local-bare. if I remove the pushed branch to this repo, I can get push-to-lando to work.

Comment 1

[Connor Sheehan [:sheehan]]

Are you still seeing this? Has it been fixed after bug 1866395?

Comment 2

[:gerard-majax]

I think it is fixed, I had to do this just a few minute ago:

• new branch out of bookmarks/central
• push to my m-c clone local-bare
• issue a mach try --push-to-lando

and there was no issue?

$ BUILD_DEBUG=1 ./mach try fuzzy --push-to-lando --full -q "'media 'linux | 'snap-upstream-test"
Task configuration changed, generating full task set
estimates: Runs 405 tasks (390 selected, 15 dependencies)
estimates: Total task duration 3 days, 15:47:18
estimates: In the top 19% of durations
estimates: Should take about 1:44:27 (Finished around 2023-12-08 10:55)
Access token is expired.
1. On your computer or mobile device navigate to: https://auth.mozilla.auth0.com/activate?user_code=XXXX
2. Enter the following code: XXXX
Waiting.......
Login successful.
Auth0 token validated.
Using 45ce85e7ef6528e8e7f446161a83c61fb28ca7cb as the hg base commit.
Submitting a single try config commit.
Patches gathered for submission.
Submitting patches to Lando.
Lando try submission success, took 2.92 seconds. Landing job id: 72983.

I'll wait for the try task to appear before closing

Comment 3

[:gerard-majax]

https://treeherder.mozilla.org/jobs?repo=try&revision=5a0bb7b4727ad6352b3cf599a59798cfbeea5c5b