diff options
author | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
---|---|---|
committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
commit | 9410cdff9342fae80a3149c530b819e473996cce (patch) | |
tree | cf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /git/parent.rb | |
parent | a2b745039bce597d419b03fdce39b4c6c69139f6 (diff) | |
parent | bdedb63403ea582c4aaa5f56caed302f51744de2 (diff) | |
download | openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2 openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz openshift-9410cdff9342fae80a3149c530b819e473996cce.zip |
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'git/parent.rb')
-rwxr-xr-x | git/parent.rb | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/git/parent.rb b/git/parent.rb deleted file mode 100755 index 2acb127c4..000000000 --- a/git/parent.rb +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env ruby -# -# -# - -if __FILE__ == $0 - # If we aren't on master we don't need to parent check - branch = 'prod' - exit(0) if ARGV[0] !~ /#{branch}/ - commit_id = ARGV[1] - %x[/usr/bin/git checkout #{branch}] - %x[/usr/bin/git merge #{commit_id}] - - count = 0 - #lines = %x[/usr/bin/git rev-list --left-right stg...master].split("\n") - lines = %x[/usr/bin/git rev-list --left-right remotes/origin/stg...#{branch}].split("\n") - lines.each do |commit| - # next if they are in stage - next if commit =~ /^</ - # remove the first char '>' - commit = commit[1..-1] - # check if any remote branches contain $commit - results = %x[/usr/bin/git branch -q -r --contains #{commit} 2>/dev/null ] - # if this comes back empty, nothing contains it, we can skip it as - # we have probably created the merge commit here locally - next if results.empty? - - # The results generally contain origin/pr/246/merge and origin/pr/246/head - # this is the pull request which would contain the commit in question. - # - # If the results do not contain origin/stg then stage does not contain - # the commit in question. Therefore we need to alert! - unless results =~ /origin\/stg/ - puts "\nFAILED: (These commits are not in stage.)\n" - puts "\t#{commit}" - count += 1 - end - end - - # Exit with count of commits in #{branch} but not stg - exit(count) -end - -__END__ - |