diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2021-11-01 22:52:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 22:52:04 +0100 |
commit | ed3b10c0489949843abf071e3ce2697c0c65f26d (patch) | |
tree | 6b4d38e60df1522d37d3de4a776ba091bb33c00e /remote.go | |
parent | 934e99b85109874d8a24f344786c30276715bde0 (diff) | |
parent | 21d8d7e95144eca38e93120b575c0ebd436e0e24 (diff) | |
download | go-git-ed3b10c0489949843abf071e3ce2697c0c65f26d.tar.gz |
Merge pull request #325 from tjamet/push/sha
Remote: Push, add support to push commits per hashes
Diffstat (limited to 'remote.go')
-rw-r--r-- | remote.go | 41 |
1 files changed, 41 insertions, 0 deletions
@@ -602,6 +602,10 @@ func (r *Remote) addOrUpdateReferences( if !rs.IsWildcard() { ref, ok := refsDict[rs.Src()] if !ok { + commit, err := object.GetCommit(r.s, plumbing.NewHash(rs.Src())) + if err == nil { + return r.addCommit(rs, remoteRefs, commit.Hash, req) + } return nil } @@ -656,6 +660,43 @@ func (r *Remote) deleteReferences(rs config.RefSpec, }) } +func (r *Remote) addCommit(rs config.RefSpec, + remoteRefs storer.ReferenceStorer, localCommit plumbing.Hash, + req *packp.ReferenceUpdateRequest) error { + + if rs.IsWildcard() { + return errors.New("can't use wildcard together with hash refspecs") + } + + cmd := &packp.Command{ + Name: rs.Dst(""), + Old: plumbing.ZeroHash, + New: localCommit, + } + remoteRef, err := remoteRefs.Reference(cmd.Name) + if err == nil { + if remoteRef.Type() != plumbing.HashReference { + //TODO: check actual git behavior here + return nil + } + + cmd.Old = remoteRef.Hash() + } else if err != plumbing.ErrReferenceNotFound { + return err + } + if cmd.Old == cmd.New { + return nil + } + if !rs.IsForceUpdate() { + if err := checkFastForwardUpdate(r.s, remoteRefs, cmd); err != nil { + return err + } + } + + req.Commands = append(req.Commands, cmd) + return nil +} + func (r *Remote) addReferenceIfRefSpecMatches(rs config.RefSpec, remoteRefs storer.ReferenceStorer, localRef *plumbing.Reference, req *packp.ReferenceUpdateRequest) error { |