diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-11 03:06:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-11 03:06:49 +0000 |
| commit | c5e147de1288130147ec0f500bea50353d441cb8 (patch) | |
| tree | 18511267ff14ea416a8bcea1f303c78399c2f51c | |
| parent | a3fd8521fb036b1f7153cad58234e8cb08246278 (diff) | |
| parent | 11deb3f1a16f426d77106a8b7efaf24eca292d76 (diff) | |
| download | gitlab-ce-c5e147de1288130147ec0f500bea50353d441cb8.tar.gz | |
Merge branch 'use-config-param' into 'master'
Use config param in `Repository#update_ref!`
See merge request !7395
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index fe991904601..063dc74021d 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -243,7 +243,7 @@ class Repository # offer 'compare and swap' ref updates. Without compare-and-swap we can # (and have!) accidentally reset the ref to an earlier state, clobbering # commits. See also https://github.com/libgit2/libgit2/issues/1534. - command = %w[git update-ref --stdin -z] + command = %W(#{Gitlab.config.git.bin_path} update-ref --stdin -z) _, status = Gitlab::Popen.popen(command, path_to_repo) do |stdin| stdin.write("update #{name}\x00#{newrev}\x00#{oldrev}\x00") end |