Skip to content
Permalink
Browse files

Simplify the receive-pack code somewhat

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
  • Loading branch information...
puiterwijk authored and mergify committed Mar 16, 2019
1 parent 264508d commit 6abb06c119a86dd8e3f57543fc97cd1006dfea89
Showing with 117 additions and 136 deletions.
  1. +1 −1 functional_tests/pull_push_test.go
  2. +1 −1 go.mod
  3. +115 −134 server/service/http-git-receive-pack.go
@@ -320,7 +320,7 @@ func performCloneEditPushRecloneWithMajorityOfflineTest(t *testing.T, method clo

// Push again. This should fail, since a majority is offline.
pushout = runFailingRawCommand(t, "git", wdir2, nil, "push")
if !strings.Contains(pushout, "remote: ERR Object sync failed") {
if !strings.Contains(pushout, "remote: ERR Error syncing object out to enough nodes") {
t.Fatal("Pushing failed for different reason")
}

2 go.mod
@@ -1,7 +1,6 @@
module repospanner.org/repospanner

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/coreos/etcd v3.3.12+incompatible
github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea
@@ -24,4 +23,5 @@ require (
golang.org/x/net v0.0.0-20181201002055-351d144fa1fc
golang.org/x/sys v0.0.0-20190209173611-3b5209105503 // indirect
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
google.golang.org/grpc v1.19.0 // indirect
)
Oops, something went wrong.

0 comments on commit 6abb06c

Please sign in to comment.
You can’t perform that action at this time.