diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-08 13:17:49 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-08 13:17:49 +0300 |
| commit | 6f8d9d1ac50b743d3d667aecc013980daacf46ba (patch) | |
| tree | 0894f7b6e186ff8fe7d839c0b02f46a940db2a94 | |
| parent | 3198343a5f890913857e5115a3935bc17322b682 (diff) | |
| parent | f70dfb06827b0fa3ef21b62eda900e30e07b75b1 (diff) | |
Merge branch 'fix-locally-breaking-test' into 'master'
Fix locally breaking tests
See merge request gitlab-org/gitaly!756
| -rw-r--r-- | internal/service/blob/lfs_pointers_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/internal/service/blob/lfs_pointers_test.go b/internal/service/blob/lfs_pointers_test.go index f21e7c60c..0d25a5fb0 100644 --- a/internal/service/blob/lfs_pointers_test.go +++ b/internal/service/blob/lfs_pointers_test.go @@ -136,7 +136,9 @@ func TestSuccessfulGetNewLFSPointersRequest(t *testing.T) { defer cleanupFn() revision := []byte("46abbb087fcc0fd02c340f0f2f052bd2c7708da3") - cmd := exec.Command("git", "-C", testRepoPath, "cherry-pick", string(revision)) + commiterArgs := []string{"-c", "user.name=Scrooge McDuck", "-c", "user.email=scrooge@mcduck.com"} + cmdArgs := append(commiterArgs, "-C", testRepoPath, "cherry-pick", string(revision)) + cmd := exec.Command("git", cmdArgs...) altDirsCommit, altDirs := testhelper.CreateCommitInAlternateObjectDirectory(t, testRepoPath, cmd) // Create a commit not pointed at by any ref to emulate being in the |