repo v2.46 prerelease

Yiwei Zhang

unread,

Jul 4, 2024, 1:40:58 AMJul 4

to Repo and Gerrit Discussion

Hi all,

repo v2.46 has been created. Since this is the last working day of this week, it will be promoted to stable early next week.

Changelog:
0444ddf (Mike Frysinger) project: ignore more curl failure modes (tag: v2.46)
9bf8236 (Shik Chen) logging: Fix log formatting with colored output
87f52f3 (Mike Frysinger) upload: add a --topic option for setting topic explicitly
562cea7 (Erik Elmeke) sync: Abort rebase in progress if force-checkout is set
eede374 (Erik Elmeke) ssh: Set git protocol version 2 on SSH ControlMaster
2c5fb84 (Mike Frysinger) upload: drop check for uncommitted local changes
12f6dc4 (Mike Frysinger) git: raise hard version to 1.9.1
5591d99 (Mike Frysinger) release: update-hooks: helper for automatically syncing hooks
9d86545 (Mike Frysinger) gitc: delete a few more dead references
cbd78a9 (Mike Frysinger) man: regenerate man pages
46819a7 (Kaiyi Li) Remove platform_utils.realpath
159389f (Kaiyi Li) Fix drive mounted directory on Windows
4406642 (Mike Frysinger) git_command: unify soft/hard versions with requirements.json

Best,

Yiwei

Yiwei Zhang

unread,

Jul 8, 2024, 12:26:22 PM (14 days ago) Jul 8

to Repo and Gerrit Discussion

v2.46 has been promoted to stable.

Best,

Yiwei

Hamid Narimani

unread,

Jul 8, 2024, 1:54:20 PM (14 days ago) Jul 8

to Repo and Gerrit Discussion

Hi Yiwei,

I am seeing this issue:

repo sync --force-sync -j12

Fetching: 100% (1194/1194), done in 49.878s

info: A new version of repo is available

warning: repo is not tracking a remote branch, so it will not receive updates

================================================================================

Repo command failed: RepoUnhandledExceptionError

GitCommandError: 'reset --keep v2.46^0' on repo failed

stderr: error: Entry 'git_command.py' not uptodate. Cannot merge.

fatal: Could not reset index file to revision 'v2.46^0'.

Yiwei Zhang

unread,

Jul 8, 2024, 6:11:06 PM (14 days ago) Jul 8

to Hamid Narimani, Repo and Gerrit Discussion

Hi Hamid,

Does running `repo selfupdate` solve the problem for you?

--
--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

---
You received this message because you are subscribed to a topic in the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/repo-discuss/sSLGP_R4Z84/unsubscribe.
To unsubscribe from this group and all its topics, send an email to repo-discuss...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/repo-discuss/612b47a4-75b0-4f61-944a-2184760759a0n%40googlegroups.com.

Hamid Narimani

unread,

Jul 8, 2024, 7:05:36 PM (14 days ago) Jul 8

to Repo and Gerrit Discussion

Yes,It does. Thank you

Victor Chang

unread,

Jul 9, 2024, 5:44:13 AM (13 days ago) Jul 9

to Repo and Gerrit Discussion

`repo selfupdate` failed in my case

$ repo selfupdate

info: A new version of repo is available
warning: repo is not tracking a remote branch, so it will not receive updates
================================================================================
Repo command failed: RepoUnhandledExceptionError
  GitCommandError: 'reset --keep v2.46^0' on repo failed
stderr: error: Entry 'git_command.py' not uptodate. Cannot merge.

fatal: Could not reset index file to revision 'v2.46^0'.

$ cd .repo/repo && git status

On branch default

Your branch is behind 'origin/stable' by 13 commits, and can be fast-forwarded.

(use "git pull" to update your local branch)

nothing to commit, working tree clean

I resolved it by `cd .repo/repo && git rebase`. then `cd - && repo selfupdate`.

Reply all

Reply to author

Forward