[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080701221808.GA26272@Chamillionaire.breakpoint.cc>
Date: Wed, 2 Jul 2008 00:18:08 +0200
From: Sebastian Siewior <lkml@...breakpoint.cc>
To: Sam Ravnborg <sam@...nborg.org>
Cc: Jan Engelhardt <jengelh@...ozas.de>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux fatal: cannot describe <sha1>
* Sam Ravnborg | 2008-07-01 22:09:51 [+0200]:
>> Just a note that when you run git-describe, you should probably quiten it.
>>
>> fatal: cannot describe 'bd7364a0fd5a4a2878fe4a224be1b142a4e6698e'
>>
>> This happens when tags are not present, which can happen if Linus's tree
>> is sent upwards again, IOW:
>>
>> machine1$ git-clone torvalds/linux-2.6.git
>> machine1$ git push elsewhere master
>>
>> machine2$ git-clone elsewhere:/linux
>> machine2$ git-describe HEAD
>> fatal: cannot describe that
>
>Hi Jan.
>
>Any specific reason why you sent it to me?
>Maybe because I do not use git describe at all?
Maybe he was thinking about this (and didn't know that you were moving):
---
scripts: don't desribe if there is nothing to describe
Signed-off-by: Sebastian Siewior <sebastian@...akpoint.cc>
---
scripts/setlocalversion | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 1c1bdaf..83b7512 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -12,7 +12,9 @@ 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))}'
+ if tag=`git describe 2>/dev/null`; then
+ echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+ fi
fi
# Are there uncommitted changes?
--
1.5.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists