pull: make pull.ff=true override merge.ff
[git.git] / t / t9144-git-svn-old-rev_map.sh
blob7600a35cd45862119bf3682e8cd0b066e2a29501
1 #!/bin/sh
3 # Copyright (c) 2009 Eric Wong
5 test_description='git svn old rev_map preservd'
6 . ./lib-git-svn.sh
8 test_expect_success 'setup test repository with old layout' '
9 mkdir i &&
10 (cd i && > a) &&
11 svn_cmd import -m- i "$svnrepo" &&
12 git svn init "$svnrepo" &&
13 git svn fetch &&
14 test -d .git/svn/refs/remotes/git-svn/ &&
15 ! test -e .git/svn/git-svn/ &&
16 mv .git/svn/refs/remotes/git-svn .git/svn/ &&
17 rm -r .git/svn/refs
20 test_expect_success 'old layout continues to work' '
21 svn_cmd import -m- i "$svnrepo/b" &&
22 git svn rebase &&
23 echo a >> b/a &&
24 git add b/a &&
25 git commit -m- -a &&
26 git svn dcommit &&
27 ! test -d .git/svn/refs/ &&
28 test -e .git/svn/git-svn/
31 test_done