fix(dev): precommit git hooks are not ignored

Signed-off-by: Aleksei Igrychev <aleksei.igrychev@palark.com>
werf · Jul 4, 2023 · 76fb7ab · 76fb7ab
1 parent 822b290
commit 76fb7ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/true_git/merge.go b/pkg/true_git/merge.go
@@ -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)
 			}

diff --git a/pkg/true_git/service_branch.go b/pkg/true_git/service_branch.go
@@ -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)