Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(dev): precommit git hooks are not ignored
Signed-off-by: Aleksei Igrychev <aleksei.igrychev@palark.com>
  • Loading branch information
alexey-igrychev committed Jul 4, 2023
1 parent 822b290 commit 76fb7ab
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/true_git/merge.go
Expand Up @@ -37,7 +37,7 @@ func CreateDetachedMergeCommit(ctx context.Context, gitDir, workTreeCacheDir, co
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)
mergeCmd := NewGitCmd(ctx, &GitCmdOptions{RepoDir: workTreeDir}, "-c", "user.email=werf@werf.io", "-c", "user.name=werf", "merge", "--no-verify", "--no-edit", "--no-ff", commitToMerge)
if err := mergeCmd.Run(ctx); err != nil {
return fmt.Errorf("git merge failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/true_git/service_branch.go
Expand Up @@ -119,7 +119,7 @@ func prepareAndCheckoutServiceBranch(ctx context.Context, serviceWorktreeDir, so
mergeCmd := NewGitCmd(
ctx, &GitCmdOptions{RepoDir: serviceWorktreeDir},
"-c", "user.email=werf@werf.io", "-c", "user.name=werf",
"merge", "--no-edit", "--no-ff", "--allow-unrelated-histories", "-s", "ours", sourceCommit,
"merge", "--no-verify", "--no-edit", "--no-ff", "--allow-unrelated-histories", "-s", "ours", sourceCommit,
)
if err = mergeCmd.Run(ctx); err != nil {
return fmt.Errorf("git merge of source commit %q into service branch %q failed: %w\nNOTE: To continue you can remove the service branch %q with \"git branch -D %s\", but we would also ask you to report this issue to https://github.com/werf/werf/issues", sourceCommit, branchName, err, branchName, branchName)
Expand Down

0 comments on commit 76fb7ab

Please sign in to comment.