mergeq 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/mergeq_ci.sh +9 -1
- data/lib/mergeq/version.rb +1 -1
- metadata +3 -3
data/bin/mergeq_ci.sh
CHANGED
|
@@ -7,10 +7,15 @@ function print_usage_and_exit {
|
|
|
7
7
|
exit 1
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
+
function status {
|
|
11
|
+
echo "// $1"
|
|
12
|
+
}
|
|
10
13
|
|
|
11
14
|
function checkout_target_branch {
|
|
15
|
+
status "Checking out $target_branch..."
|
|
12
16
|
git fetch origin $target_branch
|
|
13
|
-
git checkout -q FETCH_HEAD
|
|
17
|
+
git checkout -q -f FETCH_HEAD
|
|
18
|
+
status "Cleaning up working directory..."
|
|
14
19
|
git reset --hard
|
|
15
20
|
git clean -df
|
|
16
21
|
}
|
|
@@ -20,12 +25,14 @@ function merge_branch_into_target_branch {
|
|
|
20
25
|
# of whether or not we can fast forward merge.
|
|
21
26
|
# and it copies over any merge conflict resolutions.
|
|
22
27
|
# It's clearly black magic.
|
|
28
|
+
status "Merging into $target_branch..."
|
|
23
29
|
git merge --no-ff --no-commit $head
|
|
24
30
|
echo `git rev-parse $head^2` > .git/MERGE_HEAD
|
|
25
31
|
}
|
|
26
32
|
|
|
27
33
|
function commit_merge {
|
|
28
34
|
message=`git log -1 --pretty=%s $head`
|
|
35
|
+
status "Committing merge ($message)..."
|
|
29
36
|
git commit -m "$message"
|
|
30
37
|
}
|
|
31
38
|
|
|
@@ -38,6 +45,7 @@ function merge {
|
|
|
38
45
|
}
|
|
39
46
|
|
|
40
47
|
function push {
|
|
48
|
+
status "Pushing to $target_branch..."
|
|
41
49
|
git push origin HEAD:$target_branch
|
|
42
50
|
}
|
|
43
51
|
|
data/lib/mergeq/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mergeq
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-07-
|
|
12
|
+
date: 2012-07-16 00:00:00.000000000 Z
|
|
13
13
|
dependencies: []
|
|
14
14
|
description: A set of scripts that enable merging after build. Useful if you'd rather
|
|
15
15
|
run your tests on TeamCity.
|
|
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
55
55
|
version: '0'
|
|
56
56
|
requirements: []
|
|
57
57
|
rubyforge_project:
|
|
58
|
-
rubygems_version: 1.8.
|
|
58
|
+
rubygems_version: 1.8.21
|
|
59
59
|
signing_key:
|
|
60
60
|
specification_version: 3
|
|
61
61
|
summary: Get your CI (like TeamCity) to merge after builds pass with a queue of gated
|