diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-01-22 15:51:20 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-01-22 15:51:20 +0100 |
| commit | f937e059493037f3e18896a81693de81cf6a69a1 (patch) | |
| tree | 24755e49f8c35ba6d24acb176afd4f7a5a47e342 | |
| parent | 2b10520b306697d7cbae8f3f84ca30cacc821fa4 (diff) | |
| download | gitlab-ce-f937e059493037f3e18896a81693de81cf6a69a1.tar.gz | |
Stop git zombie creation during force push check
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/gitlab/force_push_check.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index e3fc463621c..25b539dac01 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,7 +20,7 @@ v 7.8.0 - - - - - + - Stop git zombie creation during force push check - - - diff --git a/lib/gitlab/force_push_check.rb b/lib/gitlab/force_push_check.rb index 6a52cdba608..6ba2c3ad00a 100644 --- a/lib/gitlab/force_push_check.rb +++ b/lib/gitlab/force_push_check.rb @@ -4,7 +4,7 @@ module Gitlab return false if project.empty_repo? if oldrev != Gitlab::Git::BLANK_SHA && newrev != Gitlab::Git::BLANK_SHA - missed_refs = IO.popen(%W(git --git-dir=#{project.repository.path_to_repo} rev-list #{oldrev} ^#{newrev})).read + missed_refs, _ = Gitlab::Popen.popen(%W(git --git-dir=#{project.repository.path_to_repo} rev-list #{oldrev} ^#{newrev})) missed_refs.split("\n").size > 0 else false |