jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git checkout on readonly repos

This commit is contained in:
Jeff Carr 2025-01-19 03:45:10 -06:00
parent b9d4f88abd
commit 193d041306
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doCheckout.go
View File

@ -140,18 +140,27 @@ func doAllCheckoutDevel() error {
}
func rillCheckoutMaster(repo *gitpb.Repo) error {
if repo.GetUserVersion() != repo.GetDevelVersion() {
// don't switch braches if the user branch has uncommitted patches
return nil
}
if repo.GetDevelVersion() != repo.GetMasterVersion() {
// don't switch braches if the devel branch does not match master (needs merge)
if repo.IsDirty() {
// never do dirty repos
return nil
}
if repo.GetCurrentBranchName() == repo.GetMasterBranchName() {
// repo is already on master
return nil
}
if repo.GetUserVersion() != repo.GetDevelVersion() {
// don't switch branches if the user branch has uncommitted patches
return nil
}
if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
// skip other checks for readonly repos
repo.CheckoutMaster()
return nil
}
if repo.GetDevelVersion() != repo.GetMasterVersion() {
// don't switch braches if the devel branch does not match master (needs merge)
return nil
}
repo.CheckoutMaster()
return nil
}

4
doClean.go
View File

@ -184,8 +184,8 @@ func userToDevelRequiresGitPush(repo *gitpb.Repo, branchName string) error {
return fmt.Errorf("user branch not clean to delete %d %d", missing, b2)
}
if missing == 0 {
log.Info("THIS MEANS THE LOCAL BRANCH IS OK TO DELETE missing =", missing)
return nil
// log.Info("THIS MEANS THE LOCAL BRANCH IS OK TO DELETE missing =", missing)
log.Info("THIS IS REALLY BAD RIGHT NOW. must to git push / git merge missing =", missing, b2)
}
return fmt.Errorf("user branch not clean to delete. maybe it is? devel might be ahead of user branch. %d %d", missing, b2)
}