Google Git
Sign in
android / tools / repo / e4872ac8baec782c86222ca93efb4a7c9b9e0c7b
commite4872ac8baec782c86222ca93efb4a7c9b9e0c7b[log] [tgz]
authorJeroen Dhollander <jeroendh@google.com>Wed Oct 15 17:27:09 2025 +0200
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>Wed Oct 15 08:32:00 2025 -0700
tree1dc658cef9a04937e4240eddec28b050d97ee094
parent46232648091f5490ac31eba2ec54c8b9c20729bf [diff]
sync: Use 'git rebase' during 'repo sync --rebase'

'repo sync --rebase' should do a rebase if it encounters local commits
during a 'repo sync'.
This was broken by
https://gerrit-review.git.corp.google.com/c/git-repo/+/437421,
which caused this to execute the '_doff' hook (which stands for
'do fast forward'), which is implemented using 'git merge --no-stat'.

This caused *multiple* actual editor windows to pop up (*) during
'repo sync --rebase', asking the user to enter a commit message for the
merge.

In this CL I explicitly make that code path do a 'git rebase'.

(*) and if you use a terminal editor like 'vim', this means you have 2+ concurrent vim windows rendered in the same terminal, while 'repo sync' keeps on printing other output lines, again in the same terminal. The result is .... not pretty to say the least :(

Bug: b:434565811
Test: Used it myself for over a week.
Change-Id: I0bf3ff181f15b9d5b2e3f85f7f84e302139fdab7
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/518602
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Jeroen Dhollander <jeroendh@google.com>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
1 file changed
tree: 1dc658cef9a04937e4240eddec28b050d97ee094
  1. .github/
  2. docs/
  3. hooks/
  4. man/
  5. release/
  6. subcmds/
  7. tests/
  8. .flake8
  9. .gitattributes
  10. .gitignore
  11. .gitreview
  12. .isort.cfg
  13. .mailmap
  14. .project
  15. .pydevproject
  16. color.py
  17. command.py
  18. completion.bash
  19. constraints.txt
  20. CONTRIBUTING.md
  21. editor.py
  22. error.py
  23. event_log.py
  24. fetch.py
  25. git_command.py
  26. git_config.py
  27. git_refs.py
  28. git_ssh
  29. git_superproject.py
  30. git_trace2_event_log.py
  31. git_trace2_event_log_base.py
  32. hooks.py
  33. LICENSE
  34. main.py
  35. MANIFEST.in
  36. manifest_xml.py
  37. pager.py
  38. platform_utils.py
  39. platform_utils_win32.py
  40. progress.py
  41. project.py
  42. pyproject.toml
  43. README.md
  44. repo
  45. repo_logging.py
  46. repo_trace.py
  47. requirements.json
  48. run_tests
  49. run_tests.vpython3
  50. run_tests.vpython3.8
  51. setup.py
  52. ssh.py
  53. tox.ini
  54. wrapper.py
README.md

repo

Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git. The repo command is an executable Python script that you can put anywhere in your path.

Contact

Please use the repo-discuss mailing list or issue tracker for questions.

You can file a new bug report under the “repo” component.

Please do not e-mail individual developers for support. They do not have the bandwidth for it, and often times questions have already been asked on repo-discuss or bugs posted to the issue tracker. So please search those sites first.

Install

Many distros include repo, so you might be able to install from there.

# Debian/Ubuntu.
$ sudo apt-get install repo

# Gentoo.
$ sudo emerge dev-vcs/repo

You can install it manually as well as it's a single script.

$ mkdir -p ~/.bin
$ PATH="${HOME}/.bin:${PATH}"
$ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
$ chmod a+rx ~/.bin/repo