Force a fetch when superproject has a newer SHA1 for remote branch.

For older git-repo versions, we might have only fetched the SHA1
revision that was provided by the project, but have remote branch left
intact as long as they exist. When the remote branch become stale,
some repo operations like rebase would fail, and repo sync would not
correct this situation.

Fix this by tightening the requirement to also require the superproject
provided SHA1 be an ancestor or equal to the tip-of-tree of the remote
branch.

Bug: [google internal] b/193798453
Change-Id: Ie34c5d860dabb1cbd9f822da929088ec69c79cf6
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/312642
Tested-by: Xin Li <delphij@google.com>
Reviewed-by: Raman Tenneti <rtenneti@google.com>
1 file changed
tree: 36a0f156613796dc4a24ea84d0f31833f0368d62
  1. .flake8
  2. .gitattributes
  3. .github/
  4. .gitignore
  5. .mailmap
  6. .project
  7. .pydevproject
  8. LICENSE
  9. MANIFEST.in
  10. README.md
  11. SUBMITTING_PATCHES.md
  12. color.py
  13. command.py
  14. completion.bash
  15. docs/
  16. editor.py
  17. error.py
  18. event_log.py
  19. git_command.py
  20. git_config.py
  21. git_refs.py
  22. git_ssh
  23. git_superproject.py
  24. git_trace2_event_log.py
  25. gitc_utils.py
  26. hooks.py
  27. hooks/
  28. main.py
  29. man/
  30. manifest_xml.py
  31. pager.py
  32. platform_utils.py
  33. platform_utils_win32.py
  34. progress.py
  35. project.py
  36. release/
  37. repo
  38. repo_trace.py
  39. requirements.json
  40. run_tests
  41. setup.py
  42. ssh.py
  43. subcmds/
  44. tests/
  45. tox.ini
  46. 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