diff options
Diffstat (limited to 'network/protocol/v0v1/server/receivepack')
3 files changed, 7 insertions, 7 deletions
diff --git a/network/protocol/v0v1/server/receivepack/parse_test.go b/network/protocol/v0v1/server/receivepack/parse_test.go index 3a891d3e..d54d8f8d 100644 --- a/network/protocol/v0v1/server/receivepack/parse_test.go +++ b/network/protocol/v0v1/server/receivepack/parse_test.go @@ -19,7 +19,7 @@ func TestReadRequestParsesCommandsAndPushOptions(t *testing.T) { testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { t.Parallel() - oldZero := objectid.Zero(algo).String() + oldZero := algo.Zero().String() oneID := mustHexID(t, algo, "1") var wire bufferWriteFlusher @@ -105,7 +105,7 @@ func TestReadRequestDeleteOnlyDoesNotExpectPack(t *testing.T) { enc := pktline.NewEncoder(&wire) err := enc.WriteData([]byte( - oneID.String() + " " + objectid.Zero(algo).String() + " refs/heads/old\x00delete-refs object-format=" + algo.String() + "\n", + oneID.String() + " " + algo.Zero().String() + " refs/heads/old\x00delete-refs object-format=" + algo.String() + "\n", )) if err != nil { t.Fatalf("WriteData: %v", err) @@ -153,7 +153,7 @@ func TestReadRequestRejectsUnsupportedCapability(t *testing.T) { enc := pktline.NewEncoder(&wire) err := enc.WriteData([]byte( - objectid.Zero(algo).String() + " " + oneID.String() + " refs/heads/main\x00atomic object-format=" + algo.String() + "\n", + algo.Zero().String() + " " + oneID.String() + " refs/heads/main\x00atomic object-format=" + algo.String() + "\n", )) if err != nil { t.Fatalf("WriteData: %v", err) @@ -209,7 +209,7 @@ func TestReadRequestParsesPushCertificate(t *testing.T) { "nonce nonce\n", "push-option ci.skip\n", "\n", - objectid.Zero(algo).String() + " " + oneID.String() + " refs/heads/main\n", + algo.Zero().String() + " " + oneID.String() + " refs/heads/main\n", "-----BEGIN PGP SIGNATURE-----\n", "abcdef\n", "push-cert-end\n", diff --git a/network/protocol/v0v1/server/receivepack/report_status_test.go b/network/protocol/v0v1/server/receivepack/report_status_test.go index 697311de..3cde5103 100644 --- a/network/protocol/v0v1/server/receivepack/report_status_test.go +++ b/network/protocol/v0v1/server/receivepack/report_status_test.go @@ -59,7 +59,7 @@ func TestWriteReportStatusUsesSideBand64KWhenNegotiated(t *testing.T) { requestEnc := pktline.NewEncoder(&requestWire) err := requestEnc.WriteData([]byte( - objectid.Zero(algo).String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n", + algo.Zero().String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n", )) if err != nil { t.Fatalf("WriteData(request): %v", err) @@ -243,7 +243,7 @@ func TestProgressWriterUsesSideBand64KWhenNegotiated(t *testing.T) { requestEnc := pktline.NewEncoder(&requestWire) err := requestEnc.WriteData([]byte( - objectid.Zero(algo).String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n", + algo.Zero().String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n", )) if err != nil { t.Fatalf("WriteData(request): %v", err) diff --git a/network/protocol/v0v1/server/receivepack/session.go b/network/protocol/v0v1/server/receivepack/session.go index 65fa6b36..5299b42d 100644 --- a/network/protocol/v0v1/server/receivepack/session.go +++ b/network/protocol/v0v1/server/receivepack/session.go @@ -208,7 +208,7 @@ func parseObjectID(algo objectid.Algorithm, s string) (objectid.ObjectID, error) } func commandIsDelete(cmd Command) bool { - return cmd.NewID == objectid.Zero(cmd.NewID.Algorithm()) + return cmd.NewID == cmd.NewID.Algorithm().Zero() } func deleteOnly(commands []Command) bool { |