| Message ID | 1347424996-15569-1-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Rejected |
| Headers | show |
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index bd6dca8..d2c857c 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -57,7 +57,8 @@ scm_version() fi # If we are past a tagged commit (like # "v2.6.30-rc5-302-g72357d5"), we pretty print it. - if atag="`git describe 2>/dev/null`"; then + # Also match linux tags pattern to discard private tags + if atag="`git describe --match v[2-9].* 2>/dev/null`"; then echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' # If we don't have a tag at all we print -g{commitish}.
The output 'git describe' is relative to the immediate preceding tag. When the immediate tag preceding the HEAD is a private tag, setlocalversion extracts information with respect to the private tag and wrongly reports them with respect to Linux tag. Fixing this to extract information with respect to Linux tags. CC: Michal Marek <mmarek@suse.cz> Signed-off-by: Tushar Behera <tushar.behera@linaro.org> --- scripts/setlocalversion | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)