diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-05-23 18:34:24 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-06-16 03:04:19 -0700 |
| commit | c7162c1db6fef6527eafb8829d60cf26b02b0108 (patch) | |
| tree | ea8842561d8482d462782bae47437280c6bcae88 /contrib | |
| parent | 41292ddd37202ff6dce34986c87a6000c5d3fbfa (diff) | |
| download | git-c7162c1db6fef6527eafb8829d60cf26b02b0108.tar.gz git-c7162c1db6fef6527eafb8829d60cf26b02b0108.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/git-svn/t/t0000-contrib-git-svn.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/git-svn/t/t0000-contrib-git-svn.sh b/contrib/git-svn/t/t0000-contrib-git-svn.sh index 8b3a0d902..a07fbad68 100644 --- a/contrib/git-svn/t/t0000-contrib-git-svn.sh +++ b/contrib/git-svn/t/t0000-contrib-git-svn.sh @@ -32,7 +32,7 @@ test_expect_success \ 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 cp 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' 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 rm -rf bar mv zzz bar @@ -73,7 +73,7 @@ test_expect_code 1 "$name" \ name='detect node change from file to directory #2' rm -f $GIT_DIR/index -git checkout -b mybranch3 remotes/git-svn +git checkout -f -b mybranch3 remotes/git-svn rm bar/zzz git-update-index --remove bar/zzz mkdir bar/zzz @@ -88,7 +88,7 @@ test_expect_code 1 "$name" \ name='detect node change from directory to file #2' rm -f $GIT_DIR/index -git checkout -b mybranch4 remotes/git-svn +git checkout -f -b mybranch4 remotes/git-svn rm -rf dir git update-index --remove -- dir/file touch dir @@ -103,7 +103,7 @@ test_expect_code 1 "$name" \ name='remove executable bit from a file' rm -f $GIT_DIR/index -git checkout -b mybranch5 remotes/git-svn +git checkout -f -b mybranch5 remotes/git-svn chmod -x exec.sh git update-index exec.sh git commit -m "$name" |