git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[safe/jmp/linux-2.6]
/
scripts
/
setlocalversion
diff --git
a/scripts/setlocalversion
b/scripts/setlocalversion
index
9a23825
..
82e4993
100644
(file)
--- a/
scripts/setlocalversion
+++ b/
scripts/setlocalversion
@@
-11,12
+11,12
@@
cd "${1:-.}" || usage
# Check for git and a git repo.
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
# Do we have an untagged version?
# Check for git and a git repo.
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
# Do we have an untagged version?
- if
[ "`git name-rev --tags HEAD`" = "HEAD undefined" ]
; then
+ if
git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null
; then
printf '%s%s' -g `echo "$head" | cut -c1-8`
fi
# Are there uncommitted changes?
printf '%s%s' -g `echo "$head" | cut -c1-8`
fi
# Are there uncommitted changes?
- if git diff-
files
| read dummy; then
+ if git diff-
index HEAD
| read dummy; then
printf '%s' -dirty
fi
fi
printf '%s' -dirty
fi
fi