* [PATCH] GIT-VERSION-GEN: make use of git describe --dirty
@ 2010-10-14 16:17 Mathias Lafledt
2010-10-14 19:45 ` [PATCH v2] " Mathias Lafeldt
0 siblings, 1 reply; 2+ messages in thread
From: Mathias Lafledt @ 2010-10-14 16:17 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Currently, GIT-VERSION-GEN invokes the plumbing commands "git update-index" and
"git diff-index" to determine if the working tree is dirty. It then appends
"-dirty" to the version string returned by "git describe".
However, as of Git v1.6.6, "git describe" can be told to do all that with the
"--dirty" option, saving us the plumbing.
Signed-off-by: Mathias Lafeldt <misfire@debugon.org>
---
GIT-VERSION-GEN | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d441d88..73d5cf9 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -12,13 +12,10 @@ if test -f version
then
VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git &&
- VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
+ VN=$(git describe --match "v[0-9]*" --abbrev=4 --dirty 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
- v[0-9]*)
- git update-index -q --refresh
- test -z "$(git diff-index --name-only HEAD --)" ||
- VN="$VN-dirty" ;;
+ v[0-9]*) : ;;
esac
then
VN=$(echo "$VN" | sed -e 's/-/./g');
--
1.7.3.GIT
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] GIT-VERSION-GEN: make use of git describe --dirty
2010-10-14 16:17 [PATCH] GIT-VERSION-GEN: make use of git describe --dirty Mathias Lafledt
@ 2010-10-14 19:45 ` Mathias Lafeldt
0 siblings, 0 replies; 2+ messages in thread
From: Mathias Lafeldt @ 2010-10-14 19:45 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Currently, GIT-VERSION-GEN invokes the plumbing commands "git update-index" and
"git diff-index" to determine if the working tree is dirty. It then appends
"-dirty" to the version string returned by "git describe".
However, as of Git v1.6.6, "git describe" can be told to do all that with the
"--dirty" option, saving us the plumbing.
Signed-off-by: Mathias Lafeldt <misfire@debugon.org>
---
Corrected a typo in the "From:" field. Apart from that, the patch hasn't changed.
GIT-VERSION-GEN | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d441d88..73d5cf9 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -12,13 +12,10 @@ if test -f version
then
VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git &&
- VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
+ VN=$(git describe --match "v[0-9]*" --abbrev=4 --dirty 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
- v[0-9]*)
- git update-index -q --refresh
- test -z "$(git diff-index --name-only HEAD --)" ||
- VN="$VN-dirty" ;;
+ v[0-9]*) : ;;
esac
then
VN=$(echo "$VN" | sed -e 's/-/./g');
--
1.7.3.GIT
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-14 19:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-14 16:17 [PATCH] GIT-VERSION-GEN: make use of git describe --dirty Mathias Lafledt
2010-10-14 19:45 ` [PATCH v2] " Mathias Lafeldt
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).