deblan-mirror/splitsh-lite
1
0
Fork 0
mirror of https://github.com/splitsh/lite.git synced 2024-05-15 20:56:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename originBranch to origin

Browse source
This commit is contained in:
Fabien Potencier 2024-03-08 14:10:06 +01:00
parent 931f587a87
commit fd72641be1
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
splitter/state.go
View file

@ -13,7 +13,7 @@ import (
type state struct { type state struct {
config *Config config *Config
originBranch string origin string
repoMu *sync.Mutex repoMu *sync.Mutex
repo *git.Repository repo *git.Repository
cache *cache cache *cache
@ -52,16 +52,16 @@ func newState(config *Config, result *Result) (*state, error) {
state.logger = log.New(os.Stderr, "", log.LstdFlags) state.logger = log.New(os.Stderr, "", log.LstdFlags)
} }
if state.originBranch, err = normalizeOriginBranch(state.repo, config.Origin); err != nil { if state.origin, err = normalizeOrigin(state.repo, config.Origin); err != nil {
return nil, err return nil, err
} }
if state.cache, err = newCache(state.originBranch, config); err != nil { if state.cache, err = newCache(state.origin, config); err != nil {
return nil, err return nil, err
} }
if config.Debug { if config.Debug {
state.logger.Printf("Splitting %s", state.originBranch) state.logger.Printf("Splitting %s", state.origin)
for _, v := range config.Prefixes { for _, v := range config.Prefixes {
to := v.To to := v.To
if to == "" { if to == "" {
@ -589,7 +589,7 @@ func (s *state) pushRevs(revWalk *git.RevWalk) error {
if start != nil { if start != nil {
s.result.moveHead(s.cache.get(start)) s.result.moveHead(s.cache.get(start))
// FIXME: CHECK that this is an ancestor of the branch? // FIXME: CHECK that this is an ancestor of the branch?
return revWalk.PushRange(fmt.Sprintf("%s..%s", start, s.originBranch)) return revWalk.PushRange(fmt.Sprintf("%s..%s", start, s.origin))
} }
// find the latest split sha1 if any on origin // find the latest split sha1 if any on origin
@ -600,10 +600,10 @@ func (s *state) pushRevs(revWalk *git.RevWalk) error {
return err return err
} }
s.result.moveHead(s.cache.get(start)) s.result.moveHead(s.cache.get(start))
return revWalk.PushRange(fmt.Sprintf("%s^..%s", start, s.originBranch)) return revWalk.PushRange(fmt.Sprintf("%s^..%s", start, s.origin))
} }
branch, err := s.repo.RevparseSingle(s.originBranch) branch, err := s.repo.RevparseSingle(s.origin)
if err != nil { if err != nil {
return err return err
} }

2
splitter/utils.go
View file

@ -56,7 +56,7 @@ func SplitMessage(message string) (string, string) {
return subject, body return subject, body
} }
func normalizeOriginBranch(repo *git.Repository, origin string) (string, error) { func normalizeOrigin(repo *git.Repository, origin string) (string, error) {
if origin == "" { if origin == "" {
origin = "HEAD" origin = "HEAD"
} }