diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-02 15:58:06 -0500 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-12-03 16:58:30 -0500 |
commit | ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66 (patch) | |
tree | ea6792caf343e0cfb530550e95bfad845d0d6afd /scripts/setlocalversion | |
parent | 167d6a02c1dbdd84d49e87df7718f18fa31cb971 (diff) |
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/setlocalversion')
-rwxr-xr-x | scripts/setlocalversion | 5 |
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 | |||
19 | fi | 19 | fi |
20 | fi | 20 | fi |
21 | 21 | ||
22 | # Is this git on svn? | ||
23 | if git config --get svn-remote.svn.url >/dev/null; then | ||
24 | printf -- '-svn%s' "`git-svn find-rev $head`" | ||
25 | fi | ||
26 | |||
22 | # Are there uncommitted changes? | 27 | # Are there uncommitted changes? |
23 | git update-index --refresh --unmerged > /dev/null | 28 | git update-index --refresh --unmerged > /dev/null |
24 | if git diff-index --name-only HEAD | grep -v "^scripts/package" \ | 29 | if git diff-index --name-only HEAD | grep -v "^scripts/package" \ |