git-notary 2.3.0 → 2.3.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.
- checksums.yaml +4 -4
- data/README.org +6 -0
- data/bin/git-notary +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6d6a66aa2893e8e1d744853bd350084c46e2f6d3
|
|
4
|
+
data.tar.gz: f15afafc8463d065079f1cc83b6f8ea6fe629b0c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c8b128a3426bc16c9ed0bb816976cca77e76594a1d407bba23238efabdf15f96f708d7456b466779d5eb963af6596e95294fdb832b40e36ce6c49abd40fe96c1
|
|
7
|
+
data.tar.gz: 7a7500118ff1aa7aaa3e80b717cb8afe758805dca941b0629512566f304962fb39b55c2b1e5b04cc5257486da8304c0057087c53fd8d824775c6994cd933646a
|
data/README.org
CHANGED
|
@@ -102,6 +102,12 @@ Where <version> is one of (major, minor, patch).
|
|
|
102
102
|
git-notary fetch [remote] [namespace]
|
|
103
103
|
#+END_SRC
|
|
104
104
|
|
|
105
|
+
** Fetch and merge versioning notes
|
|
106
|
+
|
|
107
|
+
#+BEGIN_SRC shell
|
|
108
|
+
git-notary pull [remote] [namespace] [merge-strategy]
|
|
109
|
+
#+END_SRC
|
|
110
|
+
|
|
105
111
|
** Push versioning notes
|
|
106
112
|
|
|
107
113
|
#+BEGIN_SRC shell
|
data/bin/git-notary
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/bin/sh
|
|
2
2
|
|
|
3
|
-
GIT_NOTARY_VERSION=2.3.
|
|
3
|
+
GIT_NOTARY_VERSION=2.3.1
|
|
4
4
|
GIT_NOTARY_NAMESPACE=${GIT_NOTARY_NAMESPACE:-'versioning'}
|
|
5
5
|
|
|
6
6
|
# notes [branch] [base] [namespace]
|
|
@@ -136,7 +136,7 @@ pull() {
|
|
|
136
136
|
NAMESPACE=${2:-${GIT_NOTARY_NAMESPACE}}
|
|
137
137
|
STRATEGY=${3:-'theirs'}
|
|
138
138
|
|
|
139
|
-
git fetch
|
|
139
|
+
git fetch ${REMOTE} refs/notes/${NAMESPACE}
|
|
140
140
|
env GIT_NOTES_REF=refs/notes/${NAMESPACE} git notes merge -s ${STRATEGY} FETCH_HEAD
|
|
141
141
|
}
|
|
142
142
|
|