diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:44:52 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:44:52 +0300 |
| commit | c63af942e5baf7849a94fa99da8494bcba28e3f8 (patch) | |
| tree | 5da743be888022a197e2555bbcd12076a9ca3633 /lib | |
| parent | 8891fbd0a95bd1d2725d6d6187ff4eb21572c3cc (diff) | |
| parent | 658749ddd38f9e0fa6ceb75eddd882e662ba86a7 (diff) | |
Merge branch '42223-squashing-mrs-takes-too-long' into 'master'
Fix an issue where sparse checkout wasn't configured correctly
See merge request gitlab-org/gitlab-ce!16864
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 92af5a8e1de..f28624ff37a 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1519,7 +1519,7 @@ module Gitlab if sparse_checkout_files # Create worktree without checking out run_git!(base_args + ['--no-checkout', worktree_path], env: env) - worktree_git_path = run_git!(%w(rev-parse --git-dir), chdir: worktree_path) + worktree_git_path = run_git!(%w(rev-parse --git-dir), chdir: worktree_path).chomp configure_sparse_checkout(worktree_git_path, sparse_checkout_files) |