summaryrefslogtreecommitdiff
path: root/t/t9104-git-svn-follow-parent.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-22 23:22:50 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:09 (GMT)
commita2003abc23a5961534e8a0cc70b881eb78d54328 (patch)
tree06f0a7a779d7b5e98a9ff9c5051c181171b0d859 /t/t9104-git-svn-follow-parent.sh
parentb805b44a923e32251af1abd4e8d7bf5f7d4d8ef6 (diff)
downloadgit-a2003abc23a5961534e8a0cc70b881eb78d54328.zip
git-a2003abc23a5961534e8a0cc70b881eb78d54328.tar.gz
git-a2003abc23a5961534e8a0cc70b881eb78d54328.tar.bz2
git-svn: allow --follow-parent on deleted directories
Any operations on the index in Git::SVN that is not wrapped by tmp_index_do() is wrong. 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.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 3afec97..402b614 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -49,6 +49,18 @@ test_expect_success 'init and fetch from one svn-remote' "
sed -n -e '3p'\`\" = goodbye
"
+test_expect_success 'follow deleted parent' "
+ svn cp -m 'resurrecting trunk as junk' \
+ -r2 $svnrepo/trunk $svnrepo/junk &&
+ git-repo-config --add svn-remote.git-svn.fetch \
+ junk:refs/remotes/svn/junk &&
+ git-svn fetch --follow-parent -i svn/thunk &&
+ git-svn fetch -i svn/junk --follow-parent &&
+ test -z \"\`git diff svn/junk svn/trunk\`\" &&
+ test \"\`git merge-base svn/junk svn/trunk\`\" \
+ = \"\`git rev-parse svn/trunk\`\"
+ "
+
test_debug 'gitk --all &'
test_done