commit ab8df5b3d04d1e246e6d1cbabe9f971765201209
author Jack Neus <jackneus@google.com> Fri Aug 16 13:43:12 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Aug 22 15:16:25 2019 +0000
tree a6f8484778c44feb6868516c44202f764bd037f9
parent 7a03dc5699aff6dd77c969ad8dfd9cbfa2fe1466

infra/go: misc TODOs

Updated git.PushRef to take a force parameter. Also wrote a small unit test for something.

BUG=None
TEST=run_tests.sh

Change-Id: I8dbd8d79b47380ecc15be5d5de1a1b345db8ba78
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/go/+/1758856
Reviewed-by: Benjamin Gordon <bmgordon@chromium.org>
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
Commit-Queue: Jack Neus <jackneus@google.com>
Tested-by: Jack Neus <jackneus@google.com>

internal/git/git_test.go

diff --git a/internal/git/git_test.go b/internal/git/git_test.go
index 17f7a98..c87c53b 100644
--- a/internal/git/git_test.go
+++ b/internal/git/git_test.go
@@ -288,10 +288,14 @@
 	pushStr := fmt.Sprintf("%s:%s", localRef, remoteRef.Ref)
 	CommandRunnerImpl = cmd.FakeCommandRunner{
 		ExpectedDir: fakeGitRepo,
-		ExpectedCmd: []string{"git", "push", remoteRef.Remote, pushStr, "--dry-run"},
+		ExpectedCmd: []string{"git", "push", remoteRef.Remote, pushStr, "--dry-run", "--force"},
 	}
 
-	err := PushRef(fakeGitRepo, localRef, true, remoteRef)
+	opts := GitOpts{
+		DryRun: true,
+		Force:  true,
+	}
+	err := PushRef(fakeGitRepo, localRef, remoteRef, opts)
 	assert.NilError(t, err)
 }
 
@@ -459,9 +463,13 @@
 		Remote: "remote",
 		Ref:    "foo",
 	}
-	assert.NilError(t, PushRef(local, "HEAD", false, remoteRef))
+	opts := GitOpts{
+		DryRun: false,
+		Force:  true,
+	}
+	assert.NilError(t, PushRef(local, "HEAD", remoteRef, opts))
 	remoteRef.Ref = "bar"
-	assert.NilError(t, PushRef(local, "HEAD", false, remoteRef))
+	assert.NilError(t, PushRef(local, "HEAD", remoteRef, opts))
 
 	branches, err := RemoteBranches(local, "remote")
 	assert.NilError(t, err)