merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
41
third_party/git/t/t9103-git-svn-tracked-directory-removed.sh
vendored
Executable file
41
third_party/git/t/t9103-git-svn-tracked-directory-removed.sh
vendored
Executable file
|
|
@ -0,0 +1,41 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git svn tracking removed top-level path'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'make history for tracking' '
|
||||
mkdir import &&
|
||||
mkdir import/trunk &&
|
||||
echo hello >> import/trunk/README &&
|
||||
svn_cmd import -m initial import "$svnrepo" &&
|
||||
rm -rf import &&
|
||||
svn_cmd co "$svnrepo"/trunk trunk &&
|
||||
echo bye bye >> trunk/README &&
|
||||
svn_cmd rm -m "gone" "$svnrepo"/trunk &&
|
||||
rm -rf trunk &&
|
||||
mkdir trunk &&
|
||||
echo "new" > trunk/FOLLOWME &&
|
||||
svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
|
||||
'
|
||||
|
||||
test_expect_success 'clone repo with git' '
|
||||
git svn clone -s "$svnrepo" x &&
|
||||
test_path_is_file x/FOLLOWME &&
|
||||
test_path_is_missing x/README
|
||||
'
|
||||
|
||||
test_expect_success 'make sure r2 still has old file' '
|
||||
(
|
||||
cd x &&
|
||||
test -n "$(git svn find-rev r1)" &&
|
||||
git reset --hard "$(git svn find-rev r1)" &&
|
||||
test_path_is_file README &&
|
||||
test_path_is_missing FOLLOWME &&
|
||||
test -z "$(git svn find-rev r2)"
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue