diff options
| author | Josh Bleecher Snyder <josharian@gmail.com> | 2016-06-10 06:50:20 -0700 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2016-06-14 01:08:23 +0000 |
| commit | 4a86a651c993b954a45140a6ae77b4510674faaf (patch) | |
| tree | 78a94aebd9aa75f78737731702d0b66e7602e284 /git-codereview | |
| parent | 55c7d78c71a67acd97b52778826c5fe108bfc529 (diff) | |
| download | go-x-review-4a86a651c993b954a45140a6ae77b4510674faaf.tar.xz | |
git-codereview: specify --no-track on checkout
My global git config contains
```
[branch]
autosetupmerge = always
```
As a result, git checkout creates a tracking branch,
so the current branch is master instead of origin/master.
Override the config by specifying --no-track.
Fixes golang/go#9379
Change-Id: I00e0f756606f2b7cb2354cb26e8e58eb7cd33274
Reviewed-on: https://go-review.googlesource.com/23969
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'git-codereview')
| -rw-r--r-- | git-codereview/branch_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-codereview/branch_test.go b/git-codereview/branch_test.go index c01680f..8d1b2fd 100644 --- a/git-codereview/branch_test.go +++ b/git-codereview/branch_test.go @@ -18,7 +18,7 @@ func TestCurrentBranch(t *testing.T) { checkCurrentBranch(t, "master", "origin/master", false, false, "", "") t.Logf("on newbranch") - trun(t, gt.client, "git", "checkout", "-b", "newbranch") + trun(t, gt.client, "git", "checkout", "--no-track", "-b", "newbranch") checkCurrentBranch(t, "newbranch", "origin/master", true, false, "", "") t.Logf("making change") |