diff options
Diffstat (limited to 'internal/gitaly/service/operations/merge_test.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go index 74df8510e..5902eac12 100644 --- a/internal/gitaly/service/operations/merge_test.go +++ b/internal/gitaly/service/operations/merge_test.go @@ -689,7 +689,7 @@ func TestSuccessfulUserMergeToRefRequest(t *testing.T) { // Writes in existingTargetRef beforeRefreshCommitSha := "a5391128b0ef5d21df5dd23d98557f4ef12fae20" - out, err := exec.Command(config.Config.Git.BinPath, "-C", repoPath, "update-ref", string(existingTargetRef), beforeRefreshCommitSha).CombinedOutput() + out, err := exec.Command("git", "-C", repoPath, "update-ref", string(existingTargetRef), beforeRefreshCommitSha).CombinedOutput() require.NoError(t, err, "give an existing state to the target ref: %s", out) testCases := []struct { @@ -808,7 +808,7 @@ func TestConflictsOnUserMergeToRefRequest(t *testing.T) { require.NoError(t, err) var buf bytes.Buffer - cmd := exec.Command(config.Config.Git.BinPath, "-C", testRepoPath, "show", resp.CommitId) + cmd := exec.Command("git", "-C", testRepoPath, "show", resp.CommitId) cmd.Stdout = &buf require.NoError(t, cmd.Run()) |