diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-08-12 23:01:59 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-08-13 04:41:09 (GMT) |
| commit | b186a261b1f7ec1fbda8c5f6d84595f3a7716d92 (patch) | |
| tree | 127158a516cf4a8e38bf8e7209eaa5c279f093bb /t/t9135-git-svn-moved-branch-empty-file.sh | |
| parent | 6ffd781226f04629eff63a684b47ad7555143312 (diff) | |
| download | git-b186a261b1f7ec1fbda8c5f6d84595f3a7716d92.zip git-b186a261b1f7ec1fbda8c5f6d84595f3a7716d92.tar.gz git-b186a261b1f7ec1fbda8c5f6d84595f3a7716d92.tar.bz2 | |
svn: initial "master" points to trunk if possible
Since "trunk" is a convention for the main development branch in
the SVN world, try to make that the master branch upon initial
checkout if it exists. This is probably less surprising based
on user requests.
t9135 was the only test which relied on the previous behavior
and thus needed to be modified.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9135-git-svn-moved-branch-empty-file.sh')
| -rwxr-xr-x | t/t9135-git-svn-moved-branch-empty-file.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh index 03705fa..5280e5f 100755 --- a/t/t9135-git-svn-moved-branch-empty-file.sh +++ b/t/t9135-git-svn-moved-branch-empty-file.sh @@ -10,7 +10,12 @@ test_expect_success 'load svn dumpfile' ' test_expect_success 'clone using git svn' 'git svn clone -s "$svnrepo" x' test_expect_success 'test that b1 exists and is empty' ' - (cd x && test -f b1 && ! test -s b1) + ( + cd x && + git reset --hard branch-c && + test -f b1 && + ! test -s b1 + ) ' test_done |