ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 19:14:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed version_string.sh to work (or at least not fail) with git

Browse Source 
1.7.3.
This commit is contained in:
gardners 2013-04-26 15:27:53 +09:30
parent 3e7de24bdf
commit 8045e57b81
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
version_string.sh
View File

@ -42,7 +42,7 @@ fi
if ! git describe "${dirty:+--dirty=$dirty}" 2>/dev/null; then
original_commit=$(git rev-list --reverse --max-parents=0 --abbrev-commit HEAD 2>/dev/null | head -n 1)
if [ -n "$original_commit" ]; then
if [ -z "$original_commit" ]; then
original_commit=$(git rev-list --reverse --abbrev-commit HEAD | head -n 1)
fi
if [ -z "$original_commit" ]; then
@ -50,7 +50,7 @@ if ! git describe "${dirty:+--dirty=$dirty}" 2>/dev/null; then
exit 1
fi
existing_start_tag="$(git rev-list --no-walk START 2>/dev/null | true)"
if [ -n "$(git tag --list START)" -a "$existing_start_tag" != "$original_commit" ]; then
if [ -n "$(git tag --list START 2>/dev/null)" -a "$existing_start_tag" != "$original_commit" ]; then
echo "$0: tag 'START' is already in use" >&2
exit 1
fi