Skip to content

Commit 2ec6e59

Browse files
Corrected version reported by 'git-ver version'
1 parent 6a2227f commit 2ec6e59

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 Jason Daniels
3+
Copyright (c) 2018 Jason C. Daniels
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

src/git-ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
GIT_VER_VERSION="0.0.1-alpha"
2+
GIT_VER_VERSION="0.0.2-alpha+r2"
33
set +ex
44
get_script_dir () {
55
SOURCE="${BASH_SOURCE[0]}"

src/git-ver-help-get-version

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ To establish a version number the following steps take place:
2424
3. The list is sorted highest to lowest and the highest value is chosen. Tag wisely so as not to break this feature.
2525
2626
If a suitable version is extracted from a tag it becomes the candidate version number. A candidate can be overridden when any of the following occur:
27-
1. An APP_VEYOR_VERSION environment variable is set.
28-
2. OR A VersionPrefix environment variable is set.
29-
3. OR A Version environment variable is set.
30-
4. OR The current branch name starts with release
27+
1. The current branch name starts with release (this overrides all other checks)
28+
2. OR An APP_VEYOR_VERSION environment variable is set.
29+
3. OR A VersionPrefix environment variable is set.
30+
4. OR A Version environment variable is set.
3131
3232
The contents of the environment variable are assumed to match the MAJOR.MINOR.PATCH format. Ensure that they do.
3333

0 commit comments

Comments
 (0)