summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-12-02 23:58:06 +0300
committerSam Ravnborg <sam@ravnborg.org>2008-12-04 00:58:30 +0300
commitff80aa97c9b4aae9449a608fe1bc3e7b5121cd66 (patch)
treeea6792caf343e0cfb530550e95bfad845d0d6afd /scripts
parent167d6a02c1dbdd84d49e87df7718f18fa31cb971 (diff)
downloadlinux-ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66.tar.xz
setlocalversion: add git-svn support
Print svn revision in addition to git info on git-svn repos. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/setlocalversion5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 81d984b91594..f6946cf99ce1 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -19,6 +19,11 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
fi
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?
git update-index --refresh --unmerged > /dev/null
if git diff-index --name-only HEAD | grep -v "^scripts/package" \