diff options
| author | Russ Cox <rsc@golang.org> | 2015-01-08 11:11:27 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-01-14 04:14:26 +0000 |
| commit | b04be3e1cc037e92528d24a6f71d49bbade90636 (patch) | |
| tree | cac927fbeaa8cdb39f9ef3cdacdf13b20ee5e529 /git-codereview/util_test.go | |
| parent | 0a423622813d28b9e7eb5b3e9daf7a1e58904dfc (diff) | |
| download | go-x-review-b04be3e1cc037e92528d24a6f71d49bbade90636.tar.xz | |
git-codereview: do not gofmt committed files during merge
Change-Id: Ie772b8f46587ad0d56350b697e75601f45b4c393
Reviewed-on: https://go-review.googlesource.com/2785
Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'git-codereview/util_test.go')
| -rw-r--r-- | git-codereview/util_test.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-codereview/util_test.go b/git-codereview/util_test.go index a5f1418..76a835d 100644 --- a/git-codereview/util_test.go +++ b/git-codereview/util_test.go @@ -92,10 +92,12 @@ func newGitTest(t *testing.T) *gitTest { for _, name := range []string{"dev.branch", "release.branch"} { trun(t, server, "git", "checkout", "master") - trun(t, server, "git", "branch", name) - write(t, server+"/file", "this is "+name) - trun(t, server, "git", "commit", "-a", "-m", "on "+name) + trun(t, server, "git", "checkout", "-b", name) + write(t, server+"/file."+name, "this is "+name) + trun(t, server, "git", "add", "file."+name) + trun(t, server, "git", "commit", "-m", "on "+name) } + trun(t, server, "git", "checkout", "master") client := tmpdir + "/git-client" mkdir(t, client) |