Google Git
Sign in
gerrit / git-repo / 653f8b711be3344e8c617512629270661b24fa86
commit653f8b711be3344e8c617512629270661b24fa86[log] [tgz]
authorDavid Pursehouse <dpursehouse@collab.net>Wed Apr 08 10:38:41 2020 +0900
committerDavid Pursehouse <dpursehouse@collab.net>Wed Apr 08 01:47:54 2020 +0000
treeee9624d6cd4b8b38f8f09dce86d1a7fd193dda71
parent9bc283e49bcb2663dc8c06a4efad289a3683aaa4 [diff]
commit-msg: Insert Change-Id at start of trailers

In older versions of Gerrit the Change-Id field was inserted at the
start of the trailers. Commit 68296f71804feab2e0ae18ae33f834a8a41621e4
simplified the trailers code by using git trailers instead of custom
code but now inserts Change-Id at the end of the trailers section.

A consequence of this is that folks who sign-off their commits using
`git commit -s` now has the sign-off appear first followed by
Change-Id. If the user then runs `git commit -s --amend` to update
the change because the Sign-off-by line is not last, git inserts
a 2nd duplicate Signed-off-by line.

This patch simply restores the previous behaviour of the Gerrit
commit-msg hook where Change-Id would be inserted before the
Sign-off-by line to avoid this issue.

Backported from [1] by Thanh Ha.

[1] https://gerrit-review.googlesource.com/c/gerrit/+/262072

Bug: https://crbug.com/12546
Change-Id: I1406c763a3935761247f6771f55e02367f698e6e
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/262352
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: David Pursehouse <dpursehouse@collab.net>
1 file changed
tree: ee9624d6cd4b8b38f8f09dce86d1a7fd193dda71
  1. .github/
  2. docs/
  3. hooks/
  4. release/
  5. subcmds/
  6. tests/
  7. .flake8
  8. .gitattributes
  9. .gitignore
  10. .mailmap
  11. .project
  12. .pydevproject
  13. color.py
  14. command.py
  15. editor.py
  16. error.py
  17. event_log.py
  18. git_command.py
  19. git_config.py
  20. git_refs.py
  21. git_ssh
  22. gitc_utils.py
  23. LICENSE
  24. main.py
  25. MANIFEST.in
  26. manifest_xml.py
  27. pager.py
  28. platform_utils.py
  29. platform_utils_win32.py
  30. progress.py
  31. project.py
  32. pyversion.py
  33. README.md
  34. repo
  35. repo_trace.py
  36. run_tests
  37. setup.py
  38. SUBMITTING_PATCHES.md
  39. tox.ini
  40. 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