diff options
| author | Russ Cox <rsc@golang.org> | 2020-03-11 09:43:46 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-03-11 14:50:59 +0000 |
| commit | 180dd7fcad2ad38f8a3b778687cac4c1a5ca7627 (patch) | |
| tree | 89926eab4cb1ed9576703e8b1a1789138745c933 /git-codereview/submit.go | |
| parent | f51a73253c4da005cfdf18a036e11185c04c8ce3 (diff) | |
| download | go-x-review-180dd7fcad2ad38f8a3b778687cac4c1a5ca7627.tar.xz | |
git-codereview: remove use of Mergeable
Mergeable has been removed from the Gerrit API -
it was too expensive to maintain, had racy semantics,
and was too little used.
As of right now, git submit fails because it doesn't see
"mergeable":true in the JSON.
Remove the use of it in git-codereview.
Change-Id: I12c821b9dbc44183a689d510dd20104eab5a0043
Reviewed-on: https://go-review.googlesource.com/c/review/+/222937
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Andrew Bonventre <andybons@golang.org>
Diffstat (limited to 'git-codereview/submit.go')
| -rw-r--r-- | git-codereview/submit.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/git-codereview/submit.go b/git-codereview/submit.go index 19d38e3..bff713d 100644 --- a/git-codereview/submit.go +++ b/git-codereview/submit.go @@ -106,12 +106,6 @@ func submit(b *Branch, c *Commit) *GerritChange { } } - // Don't bother if the server can't merge the changes. - if !g.Mergeable { - // Server cannot merge; explicit sync is needed. - dief("cannot submit: conflicting changes submitted, run 'git sync'") - } - if *noRun { printf("stopped before submit") return g |