From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2011 05:14:47 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~50
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cdc34664d4bb86063062dd63183dfb6b9ebf4772?hp=-c

Merge branch 'maint'

* maint:
Update draft release notes to 1.7.4.2
Work around broken ln on solaris as used in t8006
t/README: Add a note about running commands under valgrind
---

cdc34664d4bb86063062dd63183dfb6b9ebf4772
diff --combined t/README
index 165e7cf34d,d44a614ea3..ccf6a53377
--- a/t/README
+++ b/t/README
@@@ -79,10 -79,6 +79,10 @@@ appropriately before running "make"
  --debug::
  	This may help the person who is developing a new test.
  	It causes the command defined with test_debug to run.
 +	The "trash" directory (used to store all temporary data
 +	during testing) is not deleted even if there are no
 +	failed tests so that you can inspect its contents after
 +	the test finished.
  
  --immediate::
  	This causes the test to immediately exit upon the first
@@@ -102,6 -98,13 +102,13 @@@
  	not see any output, this option implies --verbose.  For
  	convenience, it also implies --tee.
  
+ 	Note that valgrind is run with the option --leak-check=no,
+ 	as the git process is short-lived and some errors are not
+ 	interesting. In order to run a single command under the same
+ 	conditions manually, you should set GIT_VALGRIND to point to
+ 	the 't/valgrind/' directory and use the commands under
+ 	't/valgrind/bin/'.
+ 
  --tee::
  	In addition to printing the test output to the terminal,
  	write it to files named 't/test-results/$TEST_NAME.out'.