From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 4 Sep 2010 15:15:36 +0000 (-0700)
Subject: Merge branch 'ab/test-2'
X-Git-Tag: v1.7.3-rc0~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a2c6726417db22bea7a878aeb88e18bcc95e5c0c;p=git.git

Merge branch 'ab/test-2'

* ab/test-2: (51 commits)
  tests: factor HOME=$(pwd) in test-lib.sh
  test-lib: use subshell instead of cd $new && .. && cd $old
  tests: simplify "missing PREREQ" message
  t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
  test-lib: Allow overriding of TEST_DIRECTORY
  test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
  test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
  test: Introduce $GIT_BUILD_DIR
  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
  ...

Conflicts:
	t/t6035-merge-dir-to-symlink.sh
---

a2c6726417db22bea7a878aeb88e18bcc95e5c0c
diff --cc t/t6035-merge-dir-to-symlink.sh
index dc09513be,28e8f2ae6..92e02d5d7
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@@ -48,7 -42,7 +42,7 @@@ test_expect_success SYMLINKS 'setup fo
  	git tag baseline
  '
  
- test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
 -test_expect_success SYMLINKS 'do not lose a/b-2/c/d in merge (resolve)' '
++test_expect_success SYMLINKS 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s resolve master &&
@@@ -56,7 -50,7 +50,7 @@@
  	test -f a/b-2/c/d
  '
  
- test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
 -test_expect_failure 'do not lose a/b-2/c/d in merge (recursive)' '
++test_expect_success SYMLINKS 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s recursive master &&
@@@ -64,55 -58,7 +58,55 @@@
  	test -f a/b-2/c/d
  '
  
- test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
++test_expect_success SYMLINKS 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
 +	git reset --hard &&
 +	git checkout master^0 &&
 +	git merge -s resolve baseline^0 &&
 +	test -h a/b &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
++test_expect_success SYMLINKS 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
 +	git reset --hard &&
 +	git checkout master^0 &&
 +	git merge -s recursive baseline^0 &&
 +	test -h a/b &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_failure 'do not lose untracked in merge (resolve)' '
++test_expect_failure SYMLINKS 'do not lose untracked in merge (resolve)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	>a/b/c/e &&
 +	test_must_fail git merge -s resolve master &&
 +	test -f a/b/c/e &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_success 'do not lose untracked in merge (recursive)' '
++test_expect_success SYMLINKS 'do not lose untracked in merge (recursive)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	>a/b/c/e &&
 +	test_must_fail git merge -s recursive master &&
 +	test -f a/b/c/e &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_success 'do not lose modifications in merge (resolve)' '
++test_expect_success SYMLINKS 'do not lose modifications in merge (resolve)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	echo more content >>a/b/c/d &&
 +	test_must_fail git merge -s resolve master
 +'
 +
- test_expect_success 'do not lose modifications in merge (recursive)' '
++test_expect_success SYMLINKS 'do not lose modifications in merge (recursive)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	echo more content >>a/b/c/d &&
 +	test_must_fail git merge -s recursive master
 +'
 +
- test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
+ test_expect_success SYMLINKS 'setup a merge where dir a/b-2 changed to symlink' '
  	git reset --hard &&
  	git checkout start^0 &&
  	rm -rf a/b-2 &&
@@@ -122,7 -68,7 +116,7 @@@
  	git tag test2
  '
  
- test_expect_success 'merge should not have D/F conflicts (resolve)' '
 -test_expect_success SYMLINKS 'merge should not have conflicts (resolve)' '
++test_expect_success SYMLINKS 'merge should not have D/F conflicts (resolve)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s resolve test2 &&
@@@ -130,7 -76,7 +124,7 @@@
  	test -f a/b/c/d
  '
  
- test_expect_success 'merge should not have D/F conflicts (recursive)' '
 -test_expect_failure 'merge should not have conflicts (recursive)' '
++test_expect_success SYMLINKS 'merge should not have D/F conflicts (recursive)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s recursive test2 &&
@@@ -138,12 -84,4 +132,12 @@@
  	test -f a/b/c/d
  '
  
- test_expect_success 'merge should not have F/D conflicts (recursive)' '
++test_expect_success SYMLINKS 'merge should not have F/D conflicts (recursive)' '
 +	git reset --hard &&
 +	git checkout -b foo test2 &&
 +	git merge -s recursive baseline^0 &&
 +	test -h a/b-2 &&
 +	test -f a/b/c/d
 +'
 +
  test_done