diff options
Diffstat (limited to 'git-codereview/branch_test.go')
| -rw-r--r-- | git-codereview/branch_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-codereview/branch_test.go b/git-codereview/branch_test.go index e4530eb..9e999b7 100644 --- a/git-codereview/branch_test.go +++ b/git-codereview/branch_test.go @@ -166,9 +166,11 @@ func TestBranchpointMerge(t *testing.T) { hash := strings.TrimSpace(trun(t, gt.client, "git", "rev-parse", "HEAD")) - // merge dev.branch - testMain(t, "change", "work") + // Merge dev.branch but delete the codereview.cfg that comes in, + // or else we'll think we are on the wrong branch. trun(t, gt.client, "git", "merge", "-m", "merge", "origin/dev.branch") + trun(t, gt.client, "git", "rm", "codereview.cfg") + trun(t, gt.client, "git", "commit", "-m", "rm codereview.cfg") // check branchpoint is old head (despite this commit having two parents) bp := CurrentBranch().Branchpoint() |