diff options
| -rw-r--r-- | changelogs/unreleased/cc-disable-advice-object-name-warning.yml | 5 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/repository.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/cc-disable-advice-object-name-warning.yml b/changelogs/unreleased/cc-disable-advice-object-name-warning.yml new file mode 100644 index 000000000..97c650c87 --- /dev/null +++ b/changelogs/unreleased/cc-disable-advice-object-name-warning.yml @@ -0,0 +1,5 @@ +--- +title: Disable advice.objectNameWarning when rebasing +merge_request: 2001 +author: +type: fixed diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb index dcc75e7b1..54c3af749 100644 --- a/ruby/lib/gitlab/git/repository.rb +++ b/ruby/lib/gitlab/git/repository.rb @@ -371,7 +371,7 @@ module Gitlab with_worktree(worktree, branch, sparse_checkout_files: diff_files, env: env) do run_git!( - %W[pull --rebase #{remote_repo_path} #{remote_branch}], + %W[-c advice.objectNameWarning=false pull --rebase #{remote_repo_path} #{remote_branch}], chdir: worktree.path, env: env, include_stderr: true ) |