diff options
| author | Torne Wuff <torne@wolfpuppy.org.uk> | 2011-12-31 16:32:21 +0000 |
|---|---|---|
| committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2011-12-31 16:32:21 +0000 |
| commit | 3a9aa8e51be9f5ec29d6f95795c16a876db966c5 (patch) | |
| tree | 5d304c7b6eab66804d43622c06044443e4778d5a | |
| parent | 79f88e7f3986e0e044d121976f75314b9c59e282 (diff) | |
| download | rockbox-3a9aa8e51be9f5ec29d6f95795c16a876db966c5.tar.gz rockbox-3a9aa8e51be9f5ec29d6f95795c16a876db966c5.zip | |
Fix up tools/version.sh for git transition.
Since we will be transitioning to git, stop considering svn the primary source.
If HEAD is a git-svn revision, return the svn revision number as before
(this means that if you check out old versions they keep their previously
canonical version numbers) but if it's not, then just print the short SHA1.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31480 a1c6a512-1295-4272-9138-f99709370657
| -rwxr-xr-x | tools/version.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/version.sh b/tools/version.sh index a1535aafc4..6d6b6ed13a 100755 --- a/tools/version.sh +++ b/tools/version.sh | |||
| @@ -44,7 +44,7 @@ gitversion() { | |||
| 44 | mod="" | 44 | mod="" |
| 45 | # Is this a git-svn commit? | 45 | # Is this a git-svn commit? |
| 46 | if ! git log -1 --pretty=format:"%b" | grep -q "git-svn-id: svn" ; then | 46 | if ! git log -1 --pretty=format:"%b" | grep -q "git-svn-id: svn" ; then |
| 47 | version="$version+$head" | 47 | version="$head" |
| 48 | fi | 48 | fi |
| 49 | # Are there uncommitted changes? | 49 | # Are there uncommitted changes? |
| 50 | export GIT_WORK_TREE="$1" | 50 | export GIT_WORK_TREE="$1" |