undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: t0000: add -f flag to checkout

Browse Source 
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>
This commit is contained in:
Eric Wong 2006-05-23 18:34:24 -07:00
parent 41292ddd37
commit c7162c1db6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/git-svn/t/t0000-contrib-git-svn.sh
View File

@ -32,7 +32,7 @@ test_expect_success \
name='try a deep --rmdir with a commit' name='try a deep --rmdir with a commit'
git checkout -b mybranch remotes/git-svn git checkout -f -b mybranch remotes/git-svn
mv dir/a/b/c/d/e/file dir/file mv dir/a/b/c/d/e/file dir/file
cp dir/file file cp dir/file file
git update-index --add --remove dir/a/b/c/d/e/file dir/file file git update-index --add --remove dir/a/b/c/d/e/file dir/file file
@ -58,7 +58,7 @@ test_expect_code 1 "$name" \
name='detect node change from directory to file #1' name='detect node change from directory to file #1'
rm -rf dir $GIT_DIR/index rm -rf dir $GIT_DIR/index
git checkout -b mybranch2 remotes/git-svn git checkout -f -b mybranch2 remotes/git-svn
mv bar/zzz zzz mv bar/zzz zzz
rm -rf bar rm -rf bar
mv zzz bar mv zzz bar
@ -73,7 +73,7 @@ test_expect_code 1 "$name" \
name='detect node change from file to directory #2' name='detect node change from file to directory #2'
rm -f $GIT_DIR/index rm -f $GIT_DIR/index
git checkout -b mybranch3 remotes/git-svn git checkout -f -b mybranch3 remotes/git-svn
rm bar/zzz rm bar/zzz
git-update-index --remove bar/zzz git-update-index --remove bar/zzz
mkdir bar/zzz mkdir bar/zzz
@ -88,7 +88,7 @@ test_expect_code 1 "$name" \
name='detect node change from directory to file #2' name='detect node change from directory to file #2'
rm -f $GIT_DIR/index rm -f $GIT_DIR/index
git checkout -b mybranch4 remotes/git-svn git checkout -f -b mybranch4 remotes/git-svn
rm -rf dir rm -rf dir
git update-index --remove -- dir/file git update-index --remove -- dir/file
touch dir touch dir
@ -103,7 +103,7 @@ test_expect_code 1 "$name" \
name='remove executable bit from a file' name='remove executable bit from a file'
rm -f $GIT_DIR/index rm -f $GIT_DIR/index
git checkout -b mybranch5 remotes/git-svn git checkout -f -b mybranch5 remotes/git-svn
chmod -x exec.sh chmod -x exec.sh
git update-index exec.sh git update-index exec.sh
git commit -m "$name" git commit -m "$name"