From: Peter Korsgaard Date: Tue, 1 Apr 2008 09:53:14 +0000 (-0000) Subject: setlocalversion: add git-svn support X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2f56edbd37cd6036dae8d768054fdeeb3c4bdfe;p=buildroot.git setlocalversion: add git-svn support --- diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 1c1bdaf734..e9de7fa0ae 100755 --- 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?