git-svn: t0000: add -f flag to checkout
Some changes to the latest git.git made this test croak. So we'll always just force everything when using a new branch. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
May 23, 2006 at 18:34 UTC
c7162c1db6fef6527eafb8829d60cf26b02b0108
1 file changed
+5
-5
contrib/git-svn/t/t0000-contrib-git-svn.sh
+5
-5
@@ -32,7 +32,7 @@ test_expect_success \
32
33
34
name='try a deep --rmdir with a commit'
35
-git checkout -b mybranch remotes/git-svn
35
+git checkout -f -b mybranch remotes/git-svn
36
mv dir/a/b/c/d/e/file dir/file
37
cp dir/file file
38
git update-index --add --remove dir/a/b/c/d/e/file dir/file file
@@ -58,7 +58,7 @@ test_expect_code 1 "$name" \
58
59
name='detect node change from directory to file #1'
60
rm -rf dir $GIT_DIR/index
61
-git checkout -b mybranch2 remotes/git-svn
61
+git checkout -f -b mybranch2 remotes/git-svn
62
mv bar/zzz zzz
63
rm -rf bar
64
mv zzz bar
@@ -73,7 +73,7 @@ test_expect_code 1 "$name" \
73
74
name='detect node change from file to directory #2'
75
rm -f $GIT_DIR/index
76
-git checkout -b mybranch3 remotes/git-svn
76
+git checkout -f -b mybranch3 remotes/git-svn
77
rm bar/zzz
78
git-update-index --remove bar/zzz
79
mkdir bar/zzz
@@ -88,7 +88,7 @@ test_expect_code 1 "$name" \
88
89
name='detect node change from directory to file #2'
90
rm -f $GIT_DIR/index
91
-git checkout -b mybranch4 remotes/git-svn
91
+git checkout -f -b mybranch4 remotes/git-svn
92
rm -rf dir
93
git update-index --remove -- dir/file
94
touch dir
@@ -103,7 +103,7 @@ test_expect_code 1 "$name" \
103
104
name='remove executable bit from a file'
105
rm -f $GIT_DIR/index
106
-git checkout -b mybranch5 remotes/git-svn
106
+git checkout -f -b mybranch5 remotes/git-svn
107
chmod -x exec.sh
108
git update-index exec.sh
109
git commit -m "$name"