setlocalversion: add some more fallbacks for git describe
PATCH 1/1 setlocalversion: add some more fallbacks for git describe
If working out of a custom git tree that lacks annotated tags, the 'git describe' operation spews "fatal: cannot describe" errors all over the place. So add some fallback code in case the best naming was unable to locate something useful.
Signed-off-by Mike Frysinger <[email protected]>
--- tools/setlocalversion | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
tools/setlocalversion +2 -1
@@ -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?
Signature · 1 line
1.7.2.3
Wolfgang Denk
AppliedPATCH 1/1 setlocalversion: add some more fallbacks for git describe
Dear Mike Frysinger,
Quoted 9 lines · In message <[email protected]> you wrote:
If working out of a custom git tree that lacks annotated tags, the 'git describe' operation spews "fatal: cannot describe" errors all over the place. So add some fallback code in case the best naming was unable to locate something useful.
Signed-off-by Mike Frysinger <[email protected]>--- tools/setlocalversion | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Who alone has reason to *lie himself out* of actuality? He who *suffers* from it." - Friedrich Nietzsche