Skip to content

NOMERGE 6.6.2 hotfix#29127

Open
zoom-ua wants to merge 42 commits intojoshblum/v6.6.0from
joshblum/hotfix-v6.6.2
Open

NOMERGE 6.6.2 hotfix#29127
zoom-ua wants to merge 42 commits intojoshblum/v6.6.0from
joshblum/hotfix-v6.6.2

Conversation

@zoom-ua
Copy link
Copy Markdown
Contributor

@zoom-ua zoom-ua commented Apr 7, 2026

No description provided.

chrisnojima and others added 30 commits March 3, 2026 10:36
…ing the search to be focused (#29003)

* add tabIndex to stop going from hidden to showing through widget causing the search to be focused
* use dummy input for desktop chat search

* fix styling, use dummy for desktop also

* lint
The node engine's NativeTransport.packetize_data forwards all responses
to the renderer without processing them locally, so RPCs sent from the
node process never get responses. The logger's periodic dump was sending
appendGUILogs through the node engine, creating a session that stayed
outstanding forever.

Check process.type to skip log sending in the node (main) process.
The layout correctly computed moveOrCopy: true for files inside TLFs,
but no menu item was ever created from that flag. Add the missing
itemMoveOrCopy entry that calls setMoveOrCopySource and showMoveOrCopy
to open the destination picker.
* Copy edit exploding error messages, fix snippet for exploders

* x

* x
* additional logging around startup

* fix yarn
* Fix git clone failing when default branch is not master

When a user pushes only a non-master branch (e.g. main) to a Keybase
git repo, cloning fails with "remote HEAD refers to nonexistent ref,
unable to checkout" because gogit.Init() hardcodes HEAD to
refs/heads/master.

Three fixes:
- handleList: validate symref targets exist, rewrite HEAD to best
  available branch (prefer main > master > alphabetical first)
- handlePushBatch: after push, update stored HEAD if it points to a
  nonexistent ref (skipping delete refspecs)
- NewBrowser: resolve HEAD dynamically instead of hardcoding master,
  with fallback to empty browser for stale HEAD

Fixes #28943

* Fix PR #29004 feedback: deterministic HEAD repair, journal flush, and test

- Use main > master > alphabetical preference for HEAD repair branch
  selection instead of nondeterministic map iteration order
- Add waitForJournal after HEAD repair so the update is flushed
- Add TestBrowserHeadResolution covering non-master HEAD and stale HEAD

* Address PR #29004 feedback: extract helper, fix flush ordering, and harden test

- Extract bestBranchFromCandidates helper to deduplicate HEAD selection logic
- Move HEAD fixup before waitForJournal so the update is included in the flush
- Iterate args slice instead of refspecs map for deterministic branch selection
- Propagate journal flush error instead of swallowing it
- Use git checkout -B (idempotent) to avoid flakiness with init.defaultBranch
- Add assertion verifying the underlying KBFS repo HEAD symref is updated

* Use all repo branches (not just pushed refs) for HEAD fixup in handlePushBatch

The HEAD fixup was only considering refs from the current push batch when
selecting the best branch. This could pick a suboptimal branch if better
candidates (e.g. main) already existed in the repo. Now enumerates all
repo branches, consistent with how handleList selects the best HEAD target.

* Fix doc comment placement, close reference iterators

- Move bestBranchFromCandidates above handleList so its doc comment
  is not split
- Add defer refs.Close() in handleList
- Add defer allRefs.Close() in handlePushBatch HEAD fixup

* Scope symref rewrite to HEAD only, update NewBrowser doc comment

* Fix NewBrowser doc comment to match fallback behavior

* Fall back to master when HEAD points to a stale ref in NewBrowser

* Emit non-HEAD symrefs unchanged when their targets are unknown

* Move bestBranch declaration before error check in handlePushBatch

---------

Co-authored-by: Chris Nojima <christopher.nojima@zoom.us>
* set 100ms timeout on Linking.getInitialURL, more logs

* x
* fix fmt pod for new xcode

* update fmt dep to 12.1.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants