aboutsummaryrefslogtreecommitdiffstats
path: root/remote.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2020-05-11 00:28:21 +0200
committerGitHub <noreply@github.com>2020-05-11 00:28:21 +0200
commit568154cab87659b31c751678c7f7dc93fedf60af (patch)
tree233f993126f9346b06979202042bd5d95ba70bf2 /remote.go
parente4166c560bfa0bcdadd3197ad00365b4f1c027fb (diff)
parent8ecd388ae101a0dd88b78dc47ebfef9fe51699df (diff)
downloadgo-git-568154cab87659b31c751678c7f7dc93fedf60af.tar.gz
Merge pull request #58 from go-git/exact-sha1
Remote.Fetch: support exact SHA1 refspecs
Diffstat (limited to 'remote.go')
-rw-r--r--remote.go33
1 files changed, 32 insertions, 1 deletions
diff --git a/remote.go b/remote.go
index 242df0d..98c4acf 100644
--- a/remote.go
+++ b/remote.go
@@ -29,6 +29,7 @@ var (
NoErrAlreadyUpToDate = errors.New("already up-to-date")
ErrDeleteRefNotSupported = errors.New("server does not support delete-refs")
ErrForceNeeded = errors.New("some refs were not updated")
+ ErrExactSHA1NotSupported = errors.New("server does not support exact SHA1 refspec")
)
const (
@@ -303,6 +304,10 @@ func (r *Remote) fetch(ctx context.Context, o *FetchOptions) (sto storer.Referen
return nil, err
}
+ if err := r.isSupportedRefSpec(o.RefSpecs, ar); err != nil {
+ return nil, err
+ }
+
remoteRefs, err := ar.AllReferences()
if err != nil {
return nil, err
@@ -546,6 +551,7 @@ func (r *Remote) addReferenceIfRefSpecMatches(rs config.RefSpec,
func (r *Remote) references() ([]*plumbing.Reference, error) {
var localRefs []*plumbing.Reference
+
iter, err := r.s.IterReferences()
if err != nil {
return nil, err
@@ -701,6 +707,11 @@ func doCalculateRefs(
return err
}
+ if s.IsExactSHA1() {
+ ref := plumbing.NewHashReference(s.Dst(""), plumbing.NewHash(s.Src()))
+ return refs.SetReference(ref)
+ }
+
var matched bool
err = iter.ForEach(func(ref *plumbing.Reference) error {
if !s.Match(ref.Name()) {
@@ -850,6 +861,26 @@ func (r *Remote) newUploadPackRequest(o *FetchOptions,
return req, nil
}
+func (r *Remote) isSupportedRefSpec(refs []config.RefSpec, ar *packp.AdvRefs) error {
+ var containsIsExact bool
+ for _, ref := range refs {
+ if ref.IsExactSHA1() {
+ containsIsExact = true
+ }
+ }
+
+ if !containsIsExact {
+ return nil
+ }
+
+ if ar.Capabilities.Supports(capability.AllowReachableSHA1InWant) ||
+ ar.Capabilities.Supports(capability.AllowTipSHA1InWant) {
+ return nil
+ }
+
+ return ErrExactSHA1NotSupported
+}
+
func buildSidebandIfSupported(l *capability.List, reader io.Reader, p sideband.Progress) io.Reader {
var t sideband.Type
@@ -883,7 +914,7 @@ func (r *Remote) updateLocalReferenceStorage(
}
for _, ref := range fetchedRefs {
- if !spec.Match(ref.Name()) {
+ if !spec.Match(ref.Name()) && !spec.IsExactSHA1() {
continue
}