direct: remove config.Branch clobbering

use our own copy of branch instead of writing it in the config.
This should fix handling of default branches where the default
branch differs between repositories.

workflow-direct/main.go

@@ -83,8 +83,13 @@ func processConfiguredRepositoryAction(action *common.RepositoryWebhookEvent, co
 	common.PanicOnError(err)
 	defer git.Close()
 
-	if len(config.Branch) == 0 {
+	configBranch := config.Branch
-		config.Branch = action.Repository.Default_Branch
+	if len(configBranch) == 0 {
+		configBranch = action.Repository.Default_Branch
+		if common.IsRemovedBranch(configBranch) {
+			common.LogDebug("   - default branch has deleted suffix. Skipping")
+			return
+		}
 	}
 
 	prjGitRepo, err := gitea.CreateRepositoryIfNotExist(git, gitOrg, gitPrj)
@@ -106,12 +111,12 @@ func processConfiguredRepositoryAction(action *common.RepositoryWebhookEvent, co
 		defer git.GitExecQuietOrPanic(gitPrj, "submodule", "deinit", "--all")
 
 		branch := strings.TrimSpace(git.GitExecWithOutputOrPanic(path.Join(gitPrj, action.Repository.Name), "branch", "--show-current"))
-		if branch != config.Branch {
+		if branch != configBranch {
-			if err := git.GitExec(path.Join(gitPrj, action.Repository.Name), "fetch", "--depth", "1", "origin", config.Branch+":"+config.Branch); err != nil {
+			if err := git.GitExec(path.Join(gitPrj, action.Repository.Name), "fetch", "--depth", "1", "origin", configBranch+":"+configBranch); err != nil {
-				common.LogError("error fetching branch", config.Branch, ". ignoring as non-existent.", err) // no branch? so ignore repo here
+				common.LogError("error fetching branch", configBranch, ". ignoring as non-existent.", err) // no branch? so ignore repo here
 				return
 			}
-			common.PanicOnError(git.GitExec(path.Join(gitPrj, action.Repository.Name), "checkout", config.Branch))
+			common.PanicOnError(git.GitExec(path.Join(gitPrj, action.Repository.Name), "checkout", configBranch))
 		}
 		common.PanicOnError(git.GitExec(gitPrj, "commit", "-m", "Auto-inclusion "+action.Repository.Name))
 		if !noop {
@@ -166,9 +171,14 @@ func processConfiguredPushAction(action *common.PushWebhookEvent, config *common
 	defer git.Close()
 
 	common.LogDebug("push to:", action.Repository.Owner.Username, action.Repository.Name, "for:", gitOrg, gitPrj, gitBranch)
-	if len(config.Branch) == 0 {
+	branch := config.Branch
-		config.Branch = action.Repository.Default_Branch
+	if len(branch) == 0 {
-		common.LogDebug("  + default branch", action.Repository.Default_Branch)
+		if common.IsRemovedBranch(branch) {
+			common.LogDebug("  + default branch has removed suffix:", branch, "Skipping.")
+			return
+		}
+		branch = action.Repository.Default_Branch
+		common.LogDebug("  + using default branch", branch)
 	}
 
 	prjGitRepo, err := gitea.CreateRepositoryIfNotExist(git, gitOrg, gitPrj)
@@ -197,11 +207,11 @@ func processConfiguredPushAction(action *common.PushWebhookEvent, config *common
 	git.GitExecOrPanic(gitPrj, "submodule", "update", "--init", "--depth", "1", "--checkout", action.Repository.Name)
 	defer git.GitExecQuietOrPanic(gitPrj, "submodule", "deinit", "--all")
 
-	if err := git.GitExec(filepath.Join(gitPrj, action.Repository.Name), "fetch", "--depth", "1", "--force", remoteName, config.Branch+":"+config.Branch); err != nil {
+	if err := git.GitExec(filepath.Join(gitPrj, action.Repository.Name), "fetch", "--depth", "1", "--force", remoteName, branch+":"+branch); err != nil {
-		common.LogError("Error fetching branch:", config.Branch, "Ignoring as non-existent.", err)
+		common.LogError("Error fetching branch:", branch, "Ignoring as non-existent.", err)
 		return
 	}
-	id, err := git.GitRemoteHead(filepath.Join(gitPrj, action.Repository.Name), remoteName, config.Branch)
+	id, err := git.GitRemoteHead(filepath.Join(gitPrj, action.Repository.Name), remoteName, branch)
 	common.PanicOnError(err)
 	if action.Head_Commit.Id == id {
 		git.GitExecOrPanic(filepath.Join(gitPrj, action.Repository.Name), "checkout", id)
@@ -212,7 +222,7 @@ func processConfiguredPushAction(action *common.PushWebhookEvent, config *common
 		return
 	}
 
-	common.LogDebug("push of refs not on the configured branch", config.Branch, ". ignoring.")
+	common.LogDebug("push of refs not on the configured branch", branch, ". ignoring.")
 }
 
 func verifyProjectState(git common.Git, org string, config *common.AutogitConfig, configs []*common.AutogitConfig) (err error) {
@@ -268,14 +278,25 @@ next_package:
 		}
 		//}
 
-		common.LogDebug("     verifying package: %s -> %s(%s)", commitId, filename, config.Branch)
+		branch := config.Branch
-		commits, err := gitea.GetRecentCommits(org, filename, config.Branch, 10)
+		common.LogDebug("     verifying package: %s -> %s(%s)", commitId, filename, branch)
-		if len(commits) == 0 {
 		if repo, err := gitea.GetRepository(org, filename); repo == nil && err == nil {
+			common.LogDebug("       repository removed...")
 			git.GitExecOrPanic(gitPrj, "rm", filename)
 			isGitUpdated = true
+			continue
+		}
+		if len(branch) == 0 {
+			branch = repo.DefaultBranch
+			if common.IsRemovedBranch(branch) {
+				common.LogDebug("      Default branch for", filename, "is excluded")
+				git.GitExecOrPanic(gitPrj, "rm", filename)
+				isGitUpdated = true
+				continue
 			}
 		}
+
+		commits, err := gitea.GetRecentCommits(org, filename, branch, 10)
 		if err != nil {
 			common.LogDebug("   -> failed to fetch recent commits for package:", filename, " Err:", err)
 			continue
@@ -308,7 +329,7 @@ next_package:
 				nCommits := len(common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(pkgPath, "rev-list", "^NOW", "HEAD"), "\n"))
 				if nCommits > 0 {
 					if !noop {
-						git.GitExecOrPanic(pkgPath, "push", "-f", "origin", "HEAD:"+config.Branch)
+						git.GitExecOrPanic(pkgPath, "push", "-f", "origin", "HEAD:"+branch)
 					}
 					isGitUpdated = true
 				}
@@ -362,23 +383,30 @@ next_repo:
 
 		common.LogDebug(" -- checking repository:", r.Name)
 
-		if _, err := gitea.GetRecentCommits(org, r.Name, config.Branch, 1); err != nil {
+		branch := config.Branch
+		if len(branch) == 0 {
+			branch = r.DefaultBranch
+			if common.IsRemovedBranch(branch) {
+				continue
+			}
+		}
+		if commits, err := gitea.GetRecentCommits(org, r.Name, branch, 1); err != nil || len(commits) == 0 {
 			// assumption that package does not exist, so not part of project
 			// https://github.com/go-gitea/gitea/issues/31976
+
+			// or, we do not have commits here
 			continue
 		}
 
 		// add repository to git project
 		common.PanicOnError(git.GitExec(gitPrj, "submodule", "--quiet", "add", "--depth", "1", r.CloneURL, r.Name))
 
-		if len(config.Branch) > 0 {
+		curBranch := strings.TrimSpace(git.GitExecWithOutputOrPanic(path.Join(gitPrj, r.Name), "branch", "--show-current"))
-			branch := strings.TrimSpace(git.GitExecWithOutputOrPanic(path.Join(gitPrj, r.Name), "branch", "--show-current"))
+		if branch != curBranch {
-			if branch != config.Branch {
+			if err := git.GitExec(path.Join(gitPrj, r.Name), "fetch", "--depth", "1", "origin", branch+":"+branch); err != nil {
-				if err := git.GitExec(path.Join(gitPrj, r.Name), "fetch", "--depth", "1", "origin", config.Branch+":"+config.Branch); err != nil {
+				return fmt.Errorf("Fetching branch %s for %s/%s failed. Ignoring.", branch, repo.Owner.UserName, r.Name)
-					return fmt.Errorf("Fetching branch %s for %s/%s failed. Ignoring.", config.Branch, repo.Owner.UserName, r.Name)
-				}
-				common.PanicOnError(git.GitExec(path.Join(gitPrj, r.Name), "checkout", config.Branch))
 			}
+			common.PanicOnError(git.GitExec(path.Join(gitPrj, r.Name), "checkout", branch))
 		}
 
 		isGitUpdated = true