tree 5f7935425f151b58a721ce134eb522e90e1f1d90
parent 840efbcaa4b8a3f0bd99f59d1eb822fecdd4bd74
author Russ Cox <rsc@golang.org> 1613683218 -0500
committer Russ Cox <rsc@golang.org> 1613683549 +0000

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>