diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-12-09 13:22:20 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-12-16 21:02:25 +0300 |
commit | c937aec1f7ba1f102995fefaef2141e7ed90f5fd (patch) | |
tree | 203f2dcc15ae1d2ac61e34e6bf0b8553e1d05f92 /lib/gitlab/checks | |
parent | a2b39feb1a3ae6fe2615418bb759bf39125e5d0e (diff) |
Check the exit code while invoking git in the force push check.
Previously, we were calling out to `popen` without asserting on the returned
exit-code. Now we raise a `RuntimeError` if the exit code is non-zero.
Diffstat (limited to 'lib/gitlab/checks')
-rw-r--r-- | lib/gitlab/checks/force_push.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/checks/force_push.rb b/lib/gitlab/checks/force_push.rb index 589525e40ad..e1c967a1f89 100644 --- a/lib/gitlab/checks/force_push.rb +++ b/lib/gitlab/checks/force_push.rb @@ -8,8 +8,13 @@ module Gitlab if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev) false else - missed_ref, _ = Gitlab::Git::RevList.new(oldrev, newrev, project: project, env: env).execute - missed_ref.present? + missed_ref, exit_status = Gitlab::Git::RevList.new(oldrev, newrev, project: project, env: env).execute + + if exit_status == 0 + missed_ref.present? + else + raise RuntimeError, "Got a non-zero exit code while calling out to `git rev-list` in the force-push check." + end end end end |