git-rev-label 2.27.38 → 2.34.57

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.
Files changed (2) hide show
  1. package/git-rev-label +10 -6
  2. package/package.json +2 -2
package/git-rev-label CHANGED
@@ -21,8 +21,8 @@ shopt -s inherit_errexit
21
21
  shopt -s lastpipe
22
22
  shopt -s expand_aliases
23
23
 
24
- VERSION=master-c27-g1eb4c9d-b38
25
- VERSION_NPM=2.27.38
24
+ VERSION=master-c34-g303d7fe-b57
25
+ VERSION_NPM=2.34.57
26
26
 
27
27
  ## todo maybe use utils.bash from autorsync
28
28
  function echomsg { echo $'\e[1;37m'"$@"$'\e[0m'; }
@@ -122,7 +122,7 @@ function --rev-label {
122
122
  set_with_warn(){
123
123
  varname=$1
124
124
  shift
125
- var_is_set $varname && echowarn "!!! $varname already set to '${!varname}'. Overriding"
125
+ #var_is_set $varname && echodbg "option '$varname' is already set to '${!varname}'. Overriding"
126
126
  declare -g $varname="$@"
127
127
  }
128
128
  set_action(){
@@ -134,6 +134,11 @@ readonly FULL_LIST="commit short SHORT long LONG count COUNT dirty _dirty DI
134
134
  ## Unset variables from environment
135
135
  unset format install_dir
136
136
 
137
+ ## Set flags from flags-file .git-label--flags
138
+ if test -f "$PWD"/.git-label--flags ##todo search file recursively, do not cross filesystem, do not cross homedir
139
+ then set -- "$(xargs <"$PWD"/.git-label--flags)" "$@"
140
+ fi
141
+
137
142
  while (( $# > 0 )) ;do
138
143
  case $1 in
139
144
  --help|-help|help|-h|\?|-\?)
@@ -187,11 +192,10 @@ while (( $# > 0 )) ;do
187
192
  unset DEBUG
188
193
  ;;
189
194
  --since=*) ## passed to git rev-list when calculating $count
190
- var_is_set since && echowarn "!!! since already set to '$since'. Overriding"
191
- since="${1##--since=}"
195
+ set_with_warn since "${1##--since=}"
192
196
  ;;
193
197
  --from=*) ## passed to git rev-list when calculating $count
194
- set_with_warn from "${1##--from=}"
198
+ set_with_warn from "${1##--from=}"
195
199
  ;;
196
200
  -g|--generate-script|--generate-script=*)
197
201
  set_action --generate-script
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "git-rev-label",
3
3
  "description": "Obtain information about Git repository revision in format like 'master-c73-gbbb6bec'",
4
- "version":"2.27.38",
4
+ "version":"2.34.57",
5
5
  "homepage": "https://gitlab.com/kyb/git-rev-label",
6
6
  "keywords": [
7
7
  "git",
@@ -10,7 +10,7 @@
10
10
  "versioning"
11
11
  ],
12
12
  "author": {
13
- "name": "Ivan Kuvaldin",
13
+ "name": "ian kuvaldini",
14
14
  "url": "https://gitlab.com/kyb"
15
15
  },
16
16
  "repository": {