git-codereview: fix active rebase detection

A sync + merge conflict + git rebase --continue can leave behind
a REBASE_HEAD even though it really should not. So don't use that
as the signal that there's an active rebase.

The rebase-merge directory is a better signal and seems to be
cleaned up more diligently than REBASE_HEAD.

Change-Id: Ie5bc20156e19fc7ce3e32333babea784242dc770
Reviewed-on: https://go-review.googlesource.com/c/review/+/293838
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
1 file changed
tree: 5f7935425f151b58a721ce134eb522e90e1f1d90
  1. .gitattributes
  2. AUTHORS
  3. CONTRIBUTING.md
  4. CONTRIBUTORS
  5. LICENSE
  6. PATENTS
  7. README.md
  8. codereview.cfg
  9. git-codereview/
  10. go.mod
README.md

git-codereview

The git-codereview tool is a command-line tool for working with Gerrit.

Download/Install

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.

Report Issues / Send Patches

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.