upload: reject --fix with --ignore-hooks or --no-verify

--fix asks the pre-upload hook to apply its fixups, but:
* --no-verify skips the hook entirely, so --fix silently does nothing.
* --ignore-hooks uploads the original commits even if the hook fails,
  so any fixups applied to the working tree are not part of the
  upload. Whether --fix should then apply fixups or be ignored is
  ambiguous.

Reject both combinations up front, before any hook runs, instead of
picking an interpretation.

Bug: 562921767
Test: python3 -m pytest tests/test_subcmds_upload.py
Change-Id: Ib00ae69004642f2e763212b82e7c39f3b4da52eb
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/642664
Tested-by: Rahul Yadav <yadavrah@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Rahul Yadav <yadavrah@google.com>
2 files changed
tree: 18cce3052ba35a0ba5e3003f9098e97597c361b8
  1. .github/
  2. agents/
  3. docs/
  4. hooks/
  5. man/
  6. release/
  7. subcmds/
  8. tests/
  9. .flake8
  10. .gitattributes
  11. .gitignore
  12. .gitreview
  13. .mailmap
  14. .project
  15. .pydevproject
  16. cipd_manifest.txt
  17. cipd_manifest.versions
  18. color.py
  19. command.py
  20. completion.bash
  21. completion.zsh
  22. constraints.txt
  23. CONTRIBUTING.md
  24. editor.py
  25. error.py
  26. event_log.py
  27. fetch.py
  28. git_command.py
  29. git_config.py
  30. git_refs.py
  31. git_ssh
  32. git_status.py
  33. git_superproject.py
  34. git_trace2_event_log.py
  35. git_trace2_event_log_base.py
  36. hooks.py
  37. LICENSE
  38. main.py
  39. MANIFEST.in
  40. manifest_xml.py
  41. pager.py
  42. platform_utils.py
  43. platform_utils_win32.py
  44. progress.py
  45. project.py
  46. pyproject.toml
  47. README.md
  48. repo
  49. repo_logging.py
  50. repo_trace.py
  51. requirements.json
  52. run_tests
  53. run_tests.uv.lock
  54. run_tests.vpython3.8
  55. setup.py
  56. ssh.py
  57. 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

Shell Completion

Repo includes completion scripts for Bash and Zsh.

Bash

To enable completion in Bash, source completion.bash in your ~/.bashrc:

source /path/to/git-repo/completion.bash

Zsh

To enable completion in Zsh, you can either:

  1. Copy or symlink completion.zsh to a file named _repo in a directory in your $fpath:

    mkdir -p ~/.zsh/completion
    # You can copy the file:
    cp /path/to/git-repo/completion.zsh ~/.zsh/completion/_repo
    # Or symlink it:
    ln -s /path/to/git-repo/completion.zsh ~/.zsh/completion/_repo
    

    Then add that directory to your fpath in ~/.zshrc before compinit:

    fpath=(~/.zsh/completion $fpath)
    autoload -Uz compinit
    compinit
    
  2. Or source the file directly and call compdef in your ~/.zshrc:

    source /path/to/git-repo/completion.zsh
    compdef _repo repo