mergeq 0.1.0 → 0.1.1

data/bin/mergeq_ci.sh

@@ -7,10 +7,15 @@ function print_usage_and_exit {
   exit 1
 }
 
+function status {
+  echo "// $1"
+}
 
 function checkout_target_branch {
+  status "Checking out $target_branch..."
   git fetch origin $target_branch
-  git checkout -q FETCH_HEAD
+  git checkout -q -f FETCH_HEAD
+  status "Cleaning up working directory..."
   git reset --hard
   git clean -df
 }
@@ -20,12 +25,14 @@ function merge_branch_into_target_branch {
   # of whether or not we can fast forward merge.
   # and it copies over any merge conflict resolutions.
   # It's clearly black magic.
+  status "Merging into $target_branch..."
   git merge --no-ff --no-commit $head
   echo `git rev-parse $head^2` > .git/MERGE_HEAD
 }
 
 function commit_merge {
   message=`git log -1 --pretty=%s $head`
+  status "Committing merge ($message)..."
   git commit -m "$message"
 }
 
@@ -38,6 +45,7 @@ function merge {
 }
 
 function push {
+  status "Pushing to $target_branch..."
   git push origin HEAD:$target_branch
 }
 

data/lib/mergeq/version.rb

@@ -1,3 +1,3 @@
 module Mergeq
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mergeq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies: []
 description: A set of scripts that enable merging after build. Useful if you'd rather
   run your tests on TeamCity.
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Get your CI (like TeamCity) to merge after builds pass with a queue of gated