Skip to content

Commit

Permalink
Do not match lightweight tags in git-version-gen
Browse files Browse the repository at this point in the history
Fix leftover from 175b517 which added
matching of lightweight git tags.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
  • Loading branch information
jfriesse authored and fabbione committed Sep 5, 2018
1 parent 67c4e6f commit 6923098
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build-aux/git-version-gen
Expand Up @@ -169,8 +169,8 @@ then
# directory, and "git describe" output looks sensible, use that to
# derive a version string.
elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
&& v=`git describe --abbrev=4 --match="$prefix*" --tags HEAD 2>/dev/null \
|| git describe --abbrev=4 --tags HEAD 2>/dev/null` \
&& v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
|| git describe --abbrev=4 HEAD 2>/dev/null` \
&& v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
&& case $v in
$prefix[0-9]*) ;;
Expand Down

0 comments on commit 6923098

Please sign in to comment.