summaryrefslogtreecommitdiff
path: root/t/t9104-git-svn-follow-parent.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-22 10:20:33 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:09 (GMT)
commit15710b6f34da26d30079dbc83c797a8335040b75 (patch)
treec8521219049bd931ec16f59d7e231b7e2c4624df /t/t9104-git-svn-follow-parent.sh
parent47e39c55c91993b94824b7a317ebeb965aaeb45a (diff)
downloadgit-15710b6f34da26d30079dbc83c797a8335040b75.zip
git-15710b6f34da26d30079dbc83c797a8335040b75.tar.gz
git-15710b6f34da26d30079dbc83c797a8335040b75.tar.bz2
git-svn: fix --follow-parent to work with Git::SVN
While we're at it, beef up the test because I was getting false-passes during development. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9104-git-svn-follow-parent.sh')
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 405b555..91fdfe9 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -30,8 +30,10 @@ test_expect_success 'initialize repo' "
test_expect_success 'init and fetch --follow-parent a moved directory' "
git-svn init -i thunk $svnrepo/thunk &&
git-svn fetch --follow-parent -i thunk &&
- git-rev-parse --verify refs/remotes/trunk &&
- test '$?' -eq '0'
+ test \"\`git-rev-parse --verify refs/remotes/trunk\`\" \
+ = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
+ test \"\`git-cat-file blob refs/remotes/thunk:readme |\
+ sed -n -e '3p'\`\" = goodbye
"
test_debug 'gitk --all &'