Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Bump DEF_VER to 1.2.0 for release.

  • Loading branch information...
commit 0f5e8ebdb5a273d8fd61e00e90d0c9778b7814cf 1 parent e437ef4
Peter Johnson authored October 30, 2011

Showing 1 changed file with 1 addition and 11 deletions. Show diff stats Hide diff stats

  1. 12  YASM-VERSION-GEN.sh
12  YASM-VERSION-GEN.sh
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 
3 3
 YVF=YASM-VERSION-FILE
4  
-DEF_VER=v1.1.0
  4
+DEF_VER=v1.2.0
5 5
 
6 6
 LF='
7 7
 '
@@ -15,16 +15,6 @@ elif test -d .git -o -f .git &&
15 15
 	VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
16 16
 	case "$VN" in
17 17
 	*$LF*) (exit 1) ;;
18  
-	v0.1.0*)
19  
-		# Special handling until we get a more recent tag on the
20  
-		# master branch
21  
-		MERGE_BASE=$(git merge-base $DEF_VER HEAD 2>/dev/null)
22  
-		VN1=$(git rev-list $MERGE_BASE..HEAD | wc -l 2>/dev/null)
23  
-		VN2=$(git rev-list --max-count=1 --abbrev-commit --abbrev=4 HEAD 2>/dev/null)
24  
-		VN=$(echo "v$DEF_VER-$VN1-g$VN2" | sed -e 's/ //g')
25  
-		git update-index -q --refresh
26  
-		test -z "$(git diff-index --name-only HEAD --)" ||
27  
-		VN="$VN-dirty" ;;
28 18
 	v[0-9]*)
29 19
 		git update-index -q --refresh
30 20
 		test -z "$(git diff-index --name-only HEAD --)" ||

0 notes on commit 0f5e8eb

Please sign in to comment.
Something went wrong with that request. Please try again.