diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-22 22:35:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-22 22:35:44 +0200 |
| commit | d1475d8aab7a6ab7ea7534a98bd20e59f150c2e3 (patch) | |
| tree | 9cba64584a5b520e8074c722f662d27387f2fd84 /tools | |
| parent | 0cc89de8ef60214083739904b011f6c255922723 (diff) | |
| parent | 800eb09641ae67c707b65acff112684a954b7f44 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/setlocalversion | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/setlocalversion b/tools/setlocalversion index b3f5f2824b..e11f54f55a 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -13,7 +13,8 @@ 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 || git describe --tags || git describe --all --long) \ + 2>/dev/null | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' fi # Are there uncommitted changes? |