diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-01-30 08:35:18 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 08:57:10 (GMT) |
| commit | 289370578ca5833641fbb59813173ac6db1986d1 (patch) | |
| tree | 68478bcbc9175b2edbe4c76f80c4f36a3eac0252 /t | |
| parent | 5d3b7cd5fe5d0410915cc68b641415901e1b113e (diff) | |
| download | git-289370578ca5833641fbb59813173ac6db1986d1.zip git-289370578ca5833641fbb59813173ac6db1986d1.tar.gz git-289370578ca5833641fbb59813173ac6db1986d1.tar.bz2 | |
git-svn: fetch tracks initial change with --follow-parent
We were still skipping path information from get_log if we are
tracking /r9270/drunk/subversion/bindings/..., but got something
like this in the log:
A /r9270/drunk (from /r9270/trunk:14)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9104-git-svn-follow-parent.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 0f4e736..dcec16b 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -105,7 +105,7 @@ test_expect_success 'follow deleted directory' " # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn) # in trunk/subversion/bindings/swig/perl -test_expect_success '' " +test_expect_success 'follow-parent avoids deleting relevant info' " mkdir -p import/trunk/subversion/bindings/swig/perl/t && for i in a b c ; do \ echo \$i > import/trunk/subversion/bindings/swig/perl/\$i.pm && @@ -134,6 +134,18 @@ test_expect_success '' " \"\`git ls-tree --name-only r9270-t\`\" " +test_expect_success "track initial change if it was only made to parent" " + svn cp -m 'wheee!' $svnrepo/r9270/trunk $svnrepo/r9270/drunk && + git-svn init -i r9270-d \ + $svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t && + git-svn fetch -i r9270-d --follow-parent && + test \`git rev-list r9270-d | wc -l\` -eq 3 && + test \"\`git ls-tree --name-only r9270-t\`\" = \ + \"\`git ls-tree --name-only r9270-d\`\" && + test \"\`git rev-parse r9270-t\`\" = \ + \"\`git rev-parse r9270-d~1\`\" + " + test_debug 'gitk --all &' test_done |