mirror of
https://github.com/servalproject/serval-dna.git
synced 2025-01-17 10:19:44 +00:00
Improve version_string.sh: detect changes in submodules
This commit is contained in:
parent
3758b038ab
commit
6fadb73f1f
@ -58,6 +58,7 @@ set -e
|
|||||||
|
|
||||||
allow_modified=true
|
allow_modified=true
|
||||||
untracked_files=normal
|
untracked_files=normal
|
||||||
|
ignore_submodules=none
|
||||||
default_tag="START"
|
default_tag="START"
|
||||||
repo_path=.
|
repo_path=.
|
||||||
version_tag_glob='[0-9].[0-9]*'
|
version_tag_glob='[0-9].[0-9]*'
|
||||||
@ -65,7 +66,7 @@ version_tag_glob='[0-9].[0-9]*'
|
|||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
--help) usage; exit 0;;
|
--help) usage; exit 0;;
|
||||||
--ignore-untracked) untracked_files=no; shift;;
|
--ignore-untracked) untracked_files=no; ignore_submodules=untracked; shift;;
|
||||||
--unmodified) allow_modified=false; shift;;
|
--unmodified) allow_modified=false; shift;;
|
||||||
--no-default-tag) default_tag=; shift;;
|
--no-default-tag) default_tag=; shift;;
|
||||||
--default-tag=*) default_tag="${1#*=}"; shift;;
|
--default-tag=*) default_tag="${1#*=}"; shift;;
|
||||||
@ -98,7 +99,7 @@ get_author_label() {
|
|||||||
# In order to implement the --ignore-untracked and --unmodified options, use the
|
# In order to implement the --ignore-untracked and --unmodified options, use the
|
||||||
# "git status" command to detect local modifications.
|
# "git status" command to detect local modifications.
|
||||||
dirty=
|
dirty=
|
||||||
if [ $(git status --porcelain --untracked-files=$untracked_files 2>/dev/null | wc -l) -ne 0 ]; then
|
if [ $(git status --porcelain --untracked-files=$untracked_files --ignore-submodules=$ignore_submodules 2>/dev/null | wc -l) -ne 0 ]; then
|
||||||
get_author_label
|
get_author_label
|
||||||
dirty="+$author_label-$(date '+%Y%m%d%H%M%S')"
|
dirty="+$author_label-$(date '+%Y%m%d%H%M%S')"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user