Merge branch 'ab/test' into next
commitf88bdb1c315a588128fcf0b68cfd286e3e096110
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:07:56 +0000 (18 14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:07:56 +0000 (18 14:07 -0700)
treea39e8030dd512fafd16c692c2eb7e9f990afd4fd
parentbb04a13920d02980bfcb9ebe15de72b2d341b47b
parent9b777a165e050f9a881a74a5902a8ddd2de30da5
Merge branch 'ab/test' into next

* ab/test: (43 commits)
  cvs tests: do not touch test CVS repositories shipped with source
  t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
  t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
  t/t7105-reset-patch.sh: Add a PERL prerequisite
  t/t9001-send-email.sh: convert setup code to tests
  t/t9001-send-email.sh: change from skip_all=* to prereq skip
  t/t9001-send-email.sh: Remove needless PROG=* assignment
  t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
  lib-patch-mode tests: change from skip_all=* to prereq skip
  t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
  tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
  t/Makefile: Create test-results dir for smoke target
  git-notes: Run partial expensive test everywhere
  t/t3300-funny-names: change from skip_all=* to prereq skip
  t/t3902-quoted: change from skip_all=* to prereq skip
  t/t4016-diff-quote: change from skip_all=* to prereq skip
  t/t5503-tagfollow: change from skip_all=* to prereq skip
  t/t7005-editor: change from skip_all=* to prereq skip
  t/t5705-clone-2gb: change from skip_all=* to prereq skip
  t/t1304-default-acl: change from skip_all=* to prereq skip
  ...

Conflicts:
t/t6035-merge-dir-to-symlink.sh
.gitignore
Makefile
t/README
t/t6031-merge-recursive.sh
t/t6035-merge-dir-to-symlink.sh
t/t7300-clean.sh
t/t7508-status.sh
t/test-lib.sh