Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Tue, 21 Feb 2012 17:12:50 +0100 |
| 4 | Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git |
| 5 | repo |
| 6 | |
| 7 | * for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty |
| 8 | |
| 9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 10 | |
| 11 | Upstream-Status: Inappropriate [OE-Specific] |
| 12 | --- |
| 13 | build-aux/git-version-gen | 25 ++++++++++++++----------- |
| 14 | 1 files changed, 14 insertions(+), 11 deletions(-) |
| 15 | |
| 16 | diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen |
| 17 | index 0fa6faa..1d1f9d2 100755 |
| 18 | --- a/build-aux/git-version-gen |
| 19 | +++ b/build-aux/git-version-gen |
| 20 | @@ -126,18 +126,21 @@ fi |
| 21 | |
| 22 | v=`echo "$v" |sed 's/^v//'` |
| 23 | |
| 24 | -# Don't declare a version "dirty" merely because a time stamp has changed. |
| 25 | -git status > /dev/null 2>&1 |
| 26 | +if test -d .git |
| 27 | +then |
| 28 | + # Don't declare a version "dirty" merely because a time stamp has changed. |
| 29 | + git status > /dev/null 2>&1 |
| 30 | |
| 31 | -dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= |
| 32 | -case "$dirty" in |
| 33 | - '') ;; |
| 34 | - *) # Append the suffix only if there isn't one already. |
| 35 | - case $v in |
| 36 | - *-dirty) ;; |
| 37 | - *) v="$v-dirty" ;; |
| 38 | - esac ;; |
| 39 | -esac |
| 40 | + dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= |
| 41 | + case "$dirty" in |
| 42 | + '') ;; |
| 43 | + *) # Append the suffix only if there isn't one already. |
| 44 | + case $v in |
| 45 | + *-dirty) ;; |
| 46 | + *) v="$v-dirty" ;; |
| 47 | + esac ;; |
| 48 | + esac |
| 49 | +fi |
| 50 | |
| 51 | # Omit the trailing newline, so that m4_esyscmd can use the result directly. |
| 52 | echo "$v" | tr -d '\012' |
| 53 | -- |
| 54 | 1.7.8.4 |
| 55 | |