diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 18:28:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 18:28:24 -0700 |
| commit | c70662ec47191eb235bb1d0a1466b923b7a08a94 (patch) | |
| tree | b15efa1a4410fc783f0df5c90b0c33104eea37ae /scripts/setlocalversion | |
| parent | ee005577aa3b89f5291fe73be2054d375d23f5eb (diff) | |
| parent | 8558f59edf935cf5ee5ffc29a9e9458fd9a71be1 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
setlocalversion: Ignote SCMs above the linux source tree
makefile: not need to regenerate kernel.release file when make kernelrelease
fixes for using make 3.82
kconfig: fix segfault when detecting recursive dependency
kconfig: fix savedefconfig with choice marked optional
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 e90a91cc518..057b6b3c5df 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -43,7 +43,7 @@ scm_version() fi # Check for git and a git repo. - if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore # it, because this version is defined in the top level Makefile. @@ -85,7 +85,7 @@ scm_version() fi # Check for mercurial and a mercurial repo. - if hgid=`hg id 2>/dev/null`; then + if test -d .hg && hgid=`hg id 2>/dev/null`; then tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` # Do we have an untagged version? |