diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-14 16:01:55 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-14 16:01:55 -0500 |
| commit | 8990c1bc4be46473ad19bf2fa612ca57286f3df4 (patch) | |
| tree | 3cea60576903a1d26c67e6ec62891b524d390e95 /scripts/setlocalversion | |
| parent | 2979076fbf17a0947d6eba367b0cac19c907c160 (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index dc54b1982958..ef8729f48586 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion | |||
| @@ -43,7 +43,7 @@ scm_version() | |||
| 43 | fi | 43 | fi |
| 44 | 44 | ||
| 45 | # Check for git and a git repo. | 45 | # Check for git and a git repo. |
| 46 | if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then | 46 | if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then |
| 47 | 47 | ||
| 48 | # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore | 48 | # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore |
| 49 | # it, because this version is defined in the top level Makefile. | 49 | # it, because this version is defined in the top level Makefile. |
| @@ -85,7 +85,7 @@ scm_version() | |||
| 85 | fi | 85 | fi |
| 86 | 86 | ||
| 87 | # Check for mercurial and a mercurial repo. | 87 | # Check for mercurial and a mercurial repo. |
| 88 | if hgid=`hg id 2>/dev/null`; then | 88 | if test -d .hg && hgid=`hg id 2>/dev/null`; then |
| 89 | tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` | 89 | tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` |
| 90 | 90 | ||
| 91 | # Do we have an untagged version? | 91 | # Do we have an untagged version? |