Closed
Bug 1945697
Opened 11 days ago
Closed 8 days ago
default_branch / push_target management bugs in lando
Categories
(Conduit :: Lando, defect)
Conduit
Lando
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: shtrom, Assigned: shtrom)
References
(Blocks 1 open bug)
Details
Attachments
(1 file)
- when
default_branch
is set, butpush_target
isn't on a repo in lando,default_branch
is ignore, and changes are pushed to the github default branch for the repo; thedefault_branch
should be used as apush_target
in https://github.com/mozilla-conduit/lando/blob/main/src/lando/api/legacy/workers/landing_worker.py#L336 https://github.com/mozilla-conduit/lando/blob/main/src/lando/main/scm/git.py#L115 - the worker then being on a wrong branch (prior to re-landing) led to all that branch getting pushed, rather than just the new commit; the cleanup / branch reset around https://github.com/mozilla-conduit/lando/blob/main/src/lando/main/scm/git.py#L271 doesn't work as expected
likely due to[target_cset
being missused in https://github.com/mozilla-conduit/lando/blob/main/src/lando/api/legacy/workers/landing_worker.py#L241C1-L241C11 (should be a branch in git?)target_cset
is the revision to apply try patches on, which may not alway be the tip of the branch]
Assignee | ||
Updated•10 days ago
|
Assignee | ||
Updated•10 days ago
|
Assignee: nobody → omehani
Assignee | ||
Comment 1•10 days ago
|
||
Assignee | ||
Updated•10 days ago
|
Attachment #9463944 -
Attachment description: [mozilla-conduit] GitSCM: fix default_branch and target_cset bugs (bug 1945697) #219 → [mozilla-conduit/lando] GitSCM: fix default_branch and target_cset bugs (bug 1945697) #219
Assignee | ||
Comment 2•10 days ago
|
||
repro:
- repository in lando where the
default_branch
is not the git repo's default branch, and push_target is unset
-> landing goes to git repo's default branch - wrong branch checked out in local, push_target set correctly
-> landing goes to correct branch but contains changes from wrong branch
Assignee | ||
Updated•10 days ago
|
Status: NEW → ASSIGNED
Assignee | ||
Updated•8 days ago
|
Status: ASSIGNED → RESOLVED
Closed: 8 days ago
Resolution: --- → FIXED
You need to log in
before you can comment on or make changes to this bug.
Description
•