* [PATCH] t0001: ignore ".dirty" suffix on Git version
@ 2013-04-14 18:15 john
0 siblings, 0 replies; only message in thread
From: john @ 2013-04-14 18:15 UTC (permalink / raw)
When testing modifications in Git that affect CGit, it is annoying to
have t0001 failing simply because the Git version has a ".dirty" suffix
when the version of Git there does indeed match that specified in the
CGit makefile. Stop this by stripping the ".dirty" suffix from the
GIT_VERSION variable.
Note that this brings the "Git version" behaviour in line with the
"submodule version" case which does not check if the working tree in
git/ is modified.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0001-validate-git-versions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh
index 754046e..416ac30 100755
--- a/tests/t0001-validate-git-versions.sh
+++ b/tests/t0001-validate-git-versions.sh
@@ -13,7 +13,7 @@ test_expect_success 'extract Git version from Makefile' '
test_expect_success 'test Git version matches Makefile' '
( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
- sed -e "s/GIT_VERSION[ ]*=[ ]*//" >git_version &&
+ sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version &&
test_cmp git_version makefile_version
'
--
1.8.2.694.ga76e9c3.dirty
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-14 18:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-14 18:15 [PATCH] t0001: ignore ".dirty" suffix on Git version john
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 NNTP newsgroup(s).