setlocalversion: add git-svn support

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 1c1bdaf7348a61fc3606165cb1cc5c6725831e05..e9de7fa0aebd2a9d5bf8c3f272530dc6afe7948a 100755 (executable)
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -12,7 +12,12 @@ cd "${1:-.}" || usage
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
        # Do we have an untagged version?
        if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-               git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+               git describe 2>/dev/null | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+       fi
+
+       # Is this git on svn?
+       if git config --get svn-remote.svn.url >/dev/null; then
+               printf -- '-svn%s' "`git-svn find-rev $head`"
        fi
 
        # Are there uncommitted changes?