summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2018-02-01 17:04:03 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2018-02-01 17:07:40 -0300
commit658749ddd38f9e0fa6ceb75eddd882e662ba86a7 (patch)
tree1bcd6b5800b74205dc6c35a37e3161b96d8f14d8 /lib
parenta24e58271aee485127724a9cc3058b7754e833d8 (diff)
downloadgitlab-ce-658749ddd38f9e0fa6ceb75eddd882e662ba86a7.tar.gz
Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-long
This was affecting the performance of `Gitlab::Git::Repository#squash`.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb2
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)