When starting a branch, do not use a tag or change value for branch.merge

When starting a branch, branch.merge is set to project revision unless
the revision is a SHA1. In that case, branch.merge is set to dest_branch
if defined or manifest default revision otherwise. This special handling
allows repo upload to work when the project revision is a SHA1.

Extend the special handling to also happen when the project revision
is a tag value or a change value so that repo upload will work in those
case as well.

Change-Id: Iff81ece40e770cd02535e80dcb023564d42dcf47
3 files changed
tree: 4edd8cc4d061a3c8971fd6d55a547320120ad10b
  1. .flake8
  2. .gitattributes
  3. .gitignore
  4. .mailmap
  5. .project
  6. .pydevproject
  8. README.md
  10. color.py
  11. command.py
  12. docs/
  13. editor.py
  14. error.py
  15. event_log.py
  16. git_command.py
  17. git_config.py
  18. git_refs.py
  19. git_ssh
  20. gitc_utils.py
  21. hooks/
  22. main.py
  23. manifest_xml.py
  24. pager.py
  25. progress.py
  26. project.py
  27. pyversion.py
  28. repo
  29. subcmds/
  30. tests/
  31. trace.py
  32. wrapper.py


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.