diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-09-27 16:46:51 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-09-27 16:46:51 +0300 |
| commit | 8add0fef0df131297960abe62d66cfcc0247ee48 (patch) | |
| tree | ceda0d04e5ec23393529fee84eef811284985982 | |
| parent | 52e705c0c1d08360522c29743a3060ba186916c2 (diff) | |
| parent | fba2099bf14d3650bf2076e240fcd19ff245ef6b (diff) | |
Merge branch 'jc-revert-split-index' into 'master'
Set split index to false
Closes #1925
See merge request gitlab-org/gitaly!1521
| -rw-r--r-- | changelogs/unreleased/jc-revert-split-index.yml | 5 | ||||
| -rw-r--r-- | internal/service/operations/squash_test.go | 2 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/repository.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/jc-revert-split-index.yml b/changelogs/unreleased/jc-revert-split-index.yml new file mode 100644 index 000000000..0d61119c0 --- /dev/null +++ b/changelogs/unreleased/jc-revert-split-index.yml @@ -0,0 +1,5 @@ +--- +title: Set split index to false +merge_request: 1521 +author: +type: fixed diff --git a/internal/service/operations/squash_test.go b/internal/service/operations/squash_test.go index dfaaf4a43..25e4936e0 100644 --- a/internal/service/operations/squash_test.go +++ b/internal/service/operations/squash_test.go @@ -155,7 +155,7 @@ func TestSplitIndex(t *testing.T) { response, err := client.UserSquash(ctx, request) require.NoError(t, err) require.Empty(t, response.GetGitError()) - require.True(t, ensureSplitIndexExists(t, testRepoPath)) + require.False(t, ensureSplitIndexExists(t, testRepoPath)) } func TestFailedUserSquashRequestDueToGitError(t *testing.T) { diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb index 1d9aee50d..e95769be9 100644 --- a/ruby/lib/gitlab/git/repository.rb +++ b/ruby/lib/gitlab/git/repository.rb @@ -862,7 +862,7 @@ module Gitlab def with_worktree(worktree, branch, sparse_checkout_files: nil, env:) base_args = %w[worktree add --detach] - run_git!(%w[config core.splitIndex true]) + run_git!(%w[config core.splitIndex false]) # Note that we _don't_ want to test for `.present?` here: If the caller # passes an non nil empty value it means it still wants sparse checkout |