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

Merge branch 'jc/test-portability' into maint

Browse Source 
* jc/test-portability:
  t9020: use configured Python to run the test helper
  t3600: Avoid "cp -a", which is a GNUism
This commit is contained in:
Junio C Hamano 2013-01-08 11:17:03 -08:00
commit 9e3d58a333
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3600-rm.sh
View File

@ -474,7 +474,7 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director
git submodule update && git submodule update &&
(cd submod && (cd submod &&
rm .git && rm .git &&
cp -a ../.git/modules/sub .git && cp -R ../.git/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree GIT_WORK_TREE=. git config --unset core.worktree
) && ) &&
test_must_fail git merge conflict2 && test_must_fail git merge conflict2 &&
@ -508,7 +508,7 @@ test_expect_success 'rm of a populated submodule with a .git directory fails eve
git submodule update && git submodule update &&
(cd submod && (cd submod &&
rm .git && rm .git &&
cp -a ../.git/modules/sub .git && cp -R ../.git/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree GIT_WORK_TREE=. git config --unset core.worktree
) && ) &&
test_must_fail git rm submod && test_must_fail git rm submod &&
@ -606,7 +606,7 @@ test_expect_success 'rm of a populated nested submodule with a nested .git direc
git submodule update --recursive && git submodule update --recursive &&
(cd submod/subsubmod && (cd submod/subsubmod &&
rm .git && rm .git &&
cp -a ../../.git/modules/sub/modules/sub .git && cp -R ../../.git/modules/sub/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree GIT_WORK_TREE=. git config --unset core.worktree
) && ) &&
test_must_fail git rm submod && test_must_fail git rm submod &&

10
t/t9020-remote-svn.sh
View File

@ -12,9 +12,13 @@ then
test_done test_done
fi fi
# We override svnrdump by placing a symlink to the svnrdump-emulator in . # Override svnrdump with our simulator
export PATH="$HOME:$PATH" PATH="$HOME:$PATH"
ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump" export PATH PYTHON_PATH GIT_BUILD_DIR
write_script "$HOME/svnrdump" <<\EOF
exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@"
EOF
init_git () { init_git () {
rm -fr .git && rm -fr .git &&