git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH]: cogito testsuite: use git-symbolic-ref
@ 2005-11-15  1:13 Pavel Roskin
  0 siblings, 0 replies; only message in thread
From: Pavel Roskin @ 2005-11-15  1:13 UTC (permalink / raw)
  To: git, Petr Baudis

cogito testsuite fails if git is compiled with USE_SYMLINK_HEAD=0.
To fix it, use git-symbolic-ref instead of readlink.

Signed-off-by: Pavel Roskin <proski@gnu.org>

diff --git a/t/t9300-seek.sh b/t/t9300-seek.sh
index d3fed11..a6f3a65 100755
--- a/t/t9300-seek.sh
+++ b/t/t9300-seek.sh
@@ -30,7 +30,7 @@ test_expect_success 'seeking to the firs
 test_expect_success 'we should have .git/head-name == master' \
 	"[ $(cat .git/head-name) = master ]"
 test_expect_success 'current branch should be cg-seek-point' \
-	"[ $(basename $(readlink .git/HEAD)) = cg-seek-point ]"
+	"[ $(basename $(git-symbolic-ref HEAD)) = cg-seek-point ]"
 test_expect_success 'current commit should be commit1' \
 	"[ $(cg-object-id -c) = $commit1 ]"
 
@@ -47,14 +47,16 @@ test_expect_success 'identical should be
 test_expect_success 'seeking to the second commit' \
 	"cg-seek $commit2"
 test_expect_success 'we should not unseeked properly' \
-	"([ -e .git/head-name ] && [ $(basename $(readlink .git/HEAD)) = cg-seek-point ])"
+	"([ -e .git/head-name ] &&
+	 [ $(basename $(git-symbolic-ref HEAD)) = cg-seek-point ])"
 test_expect_success 'current commit should be commit2' \
 	"[ $(cg-object-id -c) = $commit2 ]"
 
 test_expect_success 'seeking to the last (well, still second) commit' \
 	"cg-seek master"
 test_expect_success 'we should be unseeked properly' \
-	"([ ! -e .git/head-name ] && [ $(basename $(readlink .git/HEAD)) = master ])"
+	"([ ! -e .git/head-name ] &&
+	 [ $(basename $(git-symbolic-ref HEAD)) = master ])"
 test_expect_success 'current commit should be commit2' \
 	"[ $(cg-object-id -c) = $commit2 ]"
 
@@ -88,7 +90,8 @@ test_expect_success 'identical should be
 test_expect_success 'unseeking' \
 	"cg-seek"
 test_expect_success 'we should be unseeked properly' \
-	"([ ! -e .git/head-name ] && [ $(basename $(readlink .git/HEAD)) = master ])"
+	"([ ! -e .git/head-name ] &&
+	 [ $(basename $(git-symbolic-ref HEAD)) = master ])"
 test_expect_success 'current commit should be commit2' \
 	"[ $(cg-object-id -c) = $commit2 ]"
 


-- 
Regards,
Pavel Roskin

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2005-11-15  1:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-15  1:13 [PATCH]: cogito testsuite: use git-symbolic-ref Pavel Roskin

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).