diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 14:35:34 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 14:35:34 +0300 |
| commit | eb421c88ee2a57a437b9b14ba7447a04720354ac (patch) | |
| tree | 164d3ea68c3ff45c376c8ee6ca54f5d77d6c6423 /lib | |
| parent | e503efa320b05939f290f09e79c3b6fe98fb7803 (diff) | |
| parent | 01f5035bfe2c2fa6cc71564e8a02fbcb325e3370 (diff) | |
Merge branch 'fix-squash-with-renamed-files' into 'master'
Fix squash with renamed files
Closes gitlab-ee#4975
See merge request gitlab-org/gitlab-ce!17216
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 c4deb4f7a47..e3cbf017e55 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -2200,7 +2200,7 @@ module Gitlab ) diff_range = "#{start_sha}...#{end_sha}" diff_files = run_git!( - %W(diff --name-only --diff-filter=a --binary #{diff_range}) + %W(diff --name-only --diff-filter=ar --binary #{diff_range}) ).chomp with_worktree(squash_path, branch, sparse_checkout_files: diff_files, env: env) do |