-
Notifications
You must be signed in to change notification settings - Fork 199
/
merge.go
63 lines (50 loc) · 1.92 KB
/
merge.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
package true_git
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
)
type CreateDetachedMergeCommitOptions struct {
HasSubmodules bool
}
func CreateDetachedMergeCommit(ctx context.Context, gitDir, workTreeCacheDir, commitToMerge, mergeIntoCommit string, opts CreateDetachedMergeCommitOptions) (string, error) {
var resCommit string
if err := withWorkTreeCacheLock(ctx, workTreeCacheDir, func() error {
var err error
gitDir, err = filepath.Abs(gitDir)
if err != nil {
return fmt.Errorf("bad git dir %s: %w", gitDir, err)
}
workTreeCacheDir, err = filepath.Abs(workTreeCacheDir)
if err != nil {
return fmt.Errorf("bad work tree cache dir %s: %w", workTreeCacheDir, err)
}
if workTreeDir, err := prepareWorkTree(ctx, gitDir, workTreeCacheDir, mergeIntoCommit, opts.HasSubmodules); err != nil {
return fmt.Errorf("unable to prepare worktree for commit %v: %w", mergeIntoCommit, err)
} else {
currentCommitPath := filepath.Join(workTreeCacheDir, "current_commit")
if err := os.RemoveAll(currentCommitPath); err != nil {
return fmt.Errorf("unable to remove %s: %w", currentCommitPath, err)
}
mergeCmd := NewGitCmd(ctx, &GitCmdOptions{RepoDir: workTreeDir}, "-c", "user.email=werf@werf.io", "-c", "user.name=werf", "merge", "--no-edit", "--no-ff", commitToMerge)
if err := mergeCmd.Run(ctx); err != nil {
return fmt.Errorf("git merge failed: %w", err)
}
getHeadCmd := NewGitCmd(ctx, &GitCmdOptions{RepoDir: workTreeDir}, "rev-parse", "HEAD")
if err := getHeadCmd.Run(ctx); err != nil {
return fmt.Errorf("getting HEAD rev during git merge failed: %w", err)
}
resCommit = strings.TrimSpace(getHeadCmd.OutBuf.String())
if err := ioutil.WriteFile(currentCommitPath, []byte(resCommit+"\n"), 0o644); err != nil {
return fmt.Errorf("unable to write %s: %w", currentCommitPath, err)
}
}
return nil
}); err != nil {
return "", err
}
return resCommit, nil
}