git-notary 2.2.1 → 2.3.0
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.
- checksums.yaml +4 -4
- data/bin/git-notary +13 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cd13c449b8a349832f681f3a33aaa10b0bdccca4
|
|
4
|
+
data.tar.gz: ae987bf0934e143e5c96f8e0642d50dd5f57e78e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 58a5e5bcfbcdc9ae335b1fc5ce6260665d70dc901a50ba745ff63dde760b66bdcd6cb5db1087cfe0a2e294a66c04fc573d7dfe7f8b9e88e973434140b051313e
|
|
7
|
+
data.tar.gz: fc43ab5e9dc9b1fc3be894220d8250aa6b518b4ded93f9a98e0979f21e28c8221cdb15468d2b613127f4ed47e023c8c052f28c1b6396f1c36f459c7ea3041e8d
|
data/bin/git-notary
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/bin/sh
|
|
2
2
|
|
|
3
|
-
GIT_NOTARY_VERSION=2.
|
|
3
|
+
GIT_NOTARY_VERSION=2.3.0
|
|
4
4
|
GIT_NOTARY_NAMESPACE=${GIT_NOTARY_NAMESPACE:-'versioning'}
|
|
5
5
|
|
|
6
6
|
# notes [branch] [base] [namespace]
|
|
@@ -130,6 +130,16 @@ fetch() {
|
|
|
130
130
|
git fetch ${REMOTE} ${FORCE}refs/notes/${NAMESPACE}:refs/notes/${NAMESPACE}
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
+
# pull [remote] [namespace] [strategy]
|
|
134
|
+
pull() {
|
|
135
|
+
REMOTE=${1:-'origin'}
|
|
136
|
+
NAMESPACE=${2:-${GIT_NOTARY_NAMESPACE}}
|
|
137
|
+
STRATEGY=${3:-'theirs'}
|
|
138
|
+
|
|
139
|
+
git fetch ${REMOTE} refs/notes/${NAMESPACE}
|
|
140
|
+
env GIT_NOTES_REF=refs/notes/${NAMESPACE} git notes merge -s ${STRATEGY} FETCH_HEAD
|
|
141
|
+
}
|
|
142
|
+
|
|
133
143
|
# push [remote] [namespace]
|
|
134
144
|
push() {
|
|
135
145
|
REMOTE=${1:-'origin'}
|
|
@@ -230,6 +240,8 @@ notary() {
|
|
|
230
240
|
push ${@};;
|
|
231
241
|
f|fetch)
|
|
232
242
|
fetch ${@};;
|
|
243
|
+
fm|fetch-merge|pull)
|
|
244
|
+
pull ${@};;
|
|
233
245
|
M|major)
|
|
234
246
|
new MAJOR ${@};;
|
|
235
247
|
m|minor)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-notary
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chris Olstrom
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-06-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description:
|
|
14
14
|
email: chris@olstrom.com
|