Don't delete branch twice

Author: cardil

internal/cmd/root.go

@@ -23,6 +23,9 @@ func (a App) Command() *cobra.Command {
 	}
 	cmd.SetOut(os.Stdout)
 	cmd.SetErr(os.Stderr)
+	cmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+		cmd.SilenceUsage = true
+	}
 	opts := &cli.Options{}
 	subs := []subcommand{
 		sync{opts},

internal/cmd/sync.go

@@ -15,10 +15,10 @@ type sync struct {
 
 func (s sync) command() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:       "sync",
+		Use:       "sync [project-dir]",
 		Short:     "Synchronize to the upstream releases",
 		ValidArgs: []string{"REPOSITORY"},
-		Args:      cobra.OnlyValidArgs,
+		Args:      cobra.MaximumNArgs(1),
 		RunE:      s.run,
 	}
 	return cmd
@@ -35,16 +35,16 @@ func (s sync) project(args []string) func() config.Project {
 		if err != nil {
 			wd = "/"
 		}
+		if len(args) > 0 {
+			wd = args[0]
+		}
 		if !path.IsAbs(configPath) {
 			configPath = path.Join(wd, configPath)
 		}
 		project := config.Project{
 			ConfigPath: configPath,
 			Path:       wd,
 		}
-		if len(args) > 0 {
-			project.Path = args[0]
-		}
 		return project
 	}
 }

pkg/sync/create_pr.go

@@ -101,7 +101,7 @@ func (c createPR) open() error {
 	cl := github.NewClient(args...)
 	cl.ProjectDir = c.Path
 	buff, err := cl.Execute(c.Context)
-	defer c.Println("Github client:", buff)
+	defer c.Println("Github client:", string(buff))
 	return errors.Wrap(err, ErrSyncFailed)
 }
 

pkg/sync/resync_releases.go

@@ -81,9 +81,6 @@ func (r resyncRelease) run() error {
 		r.generateImages(r.rel),
 		r.commitChanges(r.ImagesGenerated, changesDetected),
 		func() (err error) {
-			defer func() {
-				err = errors.Join(err, r.deleteBranch(syncBranch))
-			}()
 			if !changes {
 				return nil
 			}