diff options
Diffstat (limited to 'internal/gitaly/service/commit/count_diverging_commits_test.go')
| -rw-r--r-- | internal/gitaly/service/commit/count_diverging_commits_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/gitaly/service/commit/count_diverging_commits_test.go b/internal/gitaly/service/commit/count_diverging_commits_test.go index 89a2b87fc..cf3d8b268 100644 --- a/internal/gitaly/service/commit/count_diverging_commits_test.go +++ b/internal/gitaly/service/commit/count_diverging_commits_test.go @@ -31,26 +31,26 @@ func createRepoWithDivergentBranches(t *testing.T, cfg config.Cfg, leftCommits, committerEmail := "scrooge@mcduck.com" for i := 0; i < 2; i++ { - testhelper.MustRunCommand(t, nil, "git", "-C", worktreePath, + gittest.Exec(t, cfg, "-C", worktreePath, "-c", fmt.Sprintf("user.name=%s", committerName), "-c", fmt.Sprintf("user.email=%s", committerEmail), "commit", "--allow-empty", "-m", fmt.Sprintf("master branch Empty commit %d", i)) } - testhelper.MustRunCommand(t, nil, "git", "-C", worktreePath, "checkout", "-b", leftBranchName) + gittest.Exec(t, cfg, "-C", worktreePath, "checkout", "-b", leftBranchName) for i := 0; i < leftCommits; i++ { - testhelper.MustRunCommand(t, nil, "git", "-C", worktreePath, + gittest.Exec(t, cfg, "-C", worktreePath, "-c", fmt.Sprintf("user.name=%s", committerName), "-c", fmt.Sprintf("user.email=%s", committerEmail), "commit", "--allow-empty", "-m", fmt.Sprintf("branch-1 Empty commit %d", i)) } - testhelper.MustRunCommand(t, nil, "git", "-C", worktreePath, "checkout", "master") - testhelper.MustRunCommand(t, nil, "git", "-C", worktreePath, "checkout", "-b", rightBranchName) + gittest.Exec(t, cfg, "-C", worktreePath, "checkout", "master") + gittest.Exec(t, cfg, "-C", worktreePath, "checkout", "-b", rightBranchName) for i := 0; i < rightCommits; i++ { - testhelper.MustRunCommand(t, nil, "git", "-C", worktreePath, + gittest.Exec(t, cfg, "-C", worktreePath, "-c", fmt.Sprintf("user.name=%s", committerName), "-c", fmt.Sprintf("user.email=%s", committerEmail), "commit", "--allow-empty", "-m", fmt.Sprintf("branch-2 Empty commit %d", i)) |