diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-12-15 00:05:33 -0600 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2010-12-15 00:05:33 -0600 |
| commit | 52c9d8e27592347a03962f47999bd32caf578d0f (patch) | |
| tree | 5d05046223ec569141b7f6410daa55f26cc4c6cd /t/t2007-checkout-symlink.sh | |
| parent | bash: simple reimplementation of _get_comp_words_by_ref (diff) | |
| parent | completion: fix zsh check under bash with 'set -u' (diff) | |
| download | tgif-52c9d8e27592347a03962f47999bd32caf578d0f.tar.xz | |
Merge branch 'master' (early part) into pd/bash-4-completion
* 'master' (early part): (529 commits)
completion: fix zsh check under bash with 'set -u'
Fix copy-pasted comments related to tree diff handling.
Git 1.7.3.2
{cvs,svn}import: use the new 'git read-tree --empty'
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors
Better advice on using topic branches for kernel development
Documentation: update implicit "--no-index" behavior in "git diff"
Documentation: expand 'git diff' SEE ALSO section
Documentation: diff can compare blobs
Documentation: gitrevisions is in section 7
fast-import: Allow filemodify to set the root
shell portability: no "export VAR=VAL"
CodingGuidelines: reword parameter expansion section
Documentation: update-index: -z applies also to --index-info
gitweb: Improve behavior for actionless path_info gitweb URLs
gitweb: Fix bug in evaluate_path_info
...
Conflicts:
GIT-VERSION-GEN
RelNotes
contrib/completion/git-completion.bash
Diffstat (limited to 't/t2007-checkout-symlink.sh')
| -rwxr-xr-x | t/t2007-checkout-symlink.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh index 05cc8fdd01..a74ee227b8 100755 --- a/t/t2007-checkout-symlink.sh +++ b/t/t2007-checkout-symlink.sh @@ -6,13 +6,7 @@ test_description='git checkout to switch between branches with symlink<->dir' . ./test-lib.sh -if ! test_have_prereq SYMLINKS -then - skip_all="symbolic links not supported - skipping tests" - test_done -fi - -test_expect_success setup ' +test_expect_success SYMLINKS setup ' mkdir frotz && echo hello >frotz/filfre && @@ -38,18 +32,18 @@ test_expect_success setup ' ' -test_expect_success 'switch from symlink to dir' ' +test_expect_success SYMLINKS 'switch from symlink to dir' ' git checkout master ' -test_expect_success 'Remove temporary directories & switch to master' ' +test_expect_success SYMLINKS 'Remove temporary directories & switch to master' ' rm -fr frotz xyzzy nitfol && git checkout -f master ' -test_expect_success 'switch from dir to symlink' ' +test_expect_success SYMLINKS 'switch from dir to symlink' ' git checkout side |