| commit | 4aa052da7f65ad6eeb77cce14ef70dac82d242cc | [log] [tgz] |
|---|---|---|
| author | Russ Cox <rsc@golang.org> | Thu Jan 07 12:26:06 2021 -0500 |
| committer | Russ Cox <rsc@golang.org> | Wed Jan 13 14:39:58 2021 +0000 |
| tree | 774f94b2ae37b5e08a68504122663656f29e471c | |
| parent | c4d5d8fb54f168c51827b4901b8537fca9a2abc6 [diff] |
git-codereview: new sync-branch and related fixes This CL adds a new command, "git codereview sync-branch", which does the appropriate git merge for the current branch. This CL also fixes a bug in "git codereview branchpoint", and therefore also commands like "git codereview pending", which was getting the branchpoint wrong for merges, with the effect that a merge showed too many pending CLs. This CL also fixes a bug in "git codereview change", which was formerly willing to run "git checkout" with a pending merge, which had the effect of flattening the merge mysteriously. Now it detects the merge and refuses to run. All of this should make merges easier and less error-prone as we use dev branches more often. With the earlier CL in this stack that allows working directly on local branches, this is now a great way to run a merge updating dev.regabi: git change dev.regabi git sync-branch (with appropriate aliases to avoid typing "codereview"). Fixes golang/go#26201. Change-Id: Ic24603123ca5135a72004309f5bb208ff149c9eb Reviewed-on: https://go-review.googlesource.com/c/review/+/279772 Trust: Russ Cox <rsc@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Matthew Dempsky <mdempsky@google.com>
The git-codereview tool is a command-line tool for working with Gerrit.
The easiest way to install is to run go get -u golang.org/x/review/git-codereview. You can also manually git clone the repository to $GOPATH/src/golang.org/x/review.
Run git codereview hooks to install Gerrit hooks for your git repository.
This repository uses Gerrit for code changes. To learn how to submit changes to this repository, see https://golang.org/doc/contribute.html.
The main issue tracker for the review repository is located at https://github.com/golang/go/issues. Prefix your issue with “x/review:” in the subject line, so it is easy to find.