cmd/gg: delete any previous refs in refs/gg-old/ during pull

Prevents unbounded growth and reduces potential for directory collisions.

Also use new DeleteBranches method.

Author: zombiezen

cmd/gg/pull.go

@@ -284,21 +284,35 @@ func (ops *deferredFetchOps) reconcile(ctx context.Context, g *git.Git, headBran
 	}
 
 	if len(ops.deletedRefs) > 0 {
+		const oldNamespace = "refs/gg-old/"
+		deleteOldOlds := make(map[git.Ref]git.RefMutation)
+		for ref := range ops.localRefs {
+			if strings.HasPrefix(string(ref), oldNamespace) {
+				deleteOldOlds[ref] = git.DeleteRef()
+			}
+		}
+		if err := g.MutateRefs(ctx, deleteOldOlds); err != nil {
+			return err
+		}
+
 		mutations := make(map[git.Ref]git.RefMutation)
-		branchDeleteArgs := []string{"branch", "-D", "--"}
+		var branchesToDelete []string
 		for ref, expectHash := range ops.deletedRefs {
 			val := expectHash.String()
 			if branchName := ref.Branch(); branchName != "" {
-				mutations[git.Ref("refs/gg-old/"+branchName)] = git.SetRef(val)
-				branchDeleteArgs = append(branchDeleteArgs, branchName)
+				mutations[git.Ref(oldNamespace+branchName)] = git.SetRef(val)
+				branchesToDelete = append(branchesToDelete, branchName)
 			} else {
 				mutations[ref] = git.DeleteRefIfMatches(val)
 			}
 		}
 		if err := g.MutateRefs(ctx, mutations); err != nil {
 			return err
 		}
-		if err := g.Run(ctx, branchDeleteArgs...); err != nil {
+		err := g.DeleteBranches(ctx, branchesToDelete, git.DeleteBranchOptions{
+			Force: true,
+		})
+		if err != nil {
 			return err
 		}
 	}

go.mod

@@ -18,7 +18,7 @@ go 1.16
 
 require (
 	gg-scm.io/pkg/ghdevice v0.1.0
-	gg-scm.io/pkg/git v0.10.0-beta1
+	gg-scm.io/pkg/git v0.10.0
 	github.com/google/go-cmp v0.5.7
 	golang.org/x/sys v0.0.0-20210902050250-f475640dd07b
 	golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78

go.sum

@@ -33,8 +33,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 gg-scm.io/pkg/ghdevice v0.1.0 h1:WF7J5QPL/D9jMCmycpvb87zJceQwsNTHjU9Mn/2wyAU=
 gg-scm.io/pkg/ghdevice v0.1.0/go.mod h1:Cm60XpVqtWmOy5W109MLJ9KBlw25oHEliw/9ivICTQA=
-gg-scm.io/pkg/git v0.10.0-beta1 h1:mqyDnZmnfC0QcZ+I8z6OaJ7i9JDFpjvnYmQyQO2YW4w=
-gg-scm.io/pkg/git v0.10.0-beta1/go.mod h1:+3pS+T6qs44cQCl2CKvrXRT8DLErn0JJv2MDZ5E75Hg=
+gg-scm.io/pkg/git v0.10.0 h1:65LKWZnhy336BjeZJPm5jFIkBo8imQoKoiZygQqeKd4=
+gg-scm.io/pkg/git v0.10.0/go.mod h1:+3pS+T6qs44cQCl2CKvrXRT8DLErn0JJv2MDZ5E75Hg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=