From 9aec68d3ea935fcb778a3580d950cf20d5bd35f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Tue, 15 Mar 2011 10:32:11 +0100 Subject: t/README: Add a note about running commands under valgrind MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test suite runs valgrind with certain options activated. Add a note saying how to run commands under the same conditions as the test suite does. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano diff --git a/t/README b/t/README index 78c9e65..d44a614 100644 --- a/t/README +++ b/t/README @@ -98,6 +98,13 @@ appropriately before running "make". 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'. -- cgit v0.10.2-6-g49f6 From c3786c8472093ec01b73a71a56f405932044a67e Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Sun, 20 Mar 2011 21:12:26 -0400 Subject: Work around broken ln on solaris as used in t8006 The test setup in t8006-blame-textconv.sh uses "ln -sf" to overwrite an existing symlink. Unfortunately, both /usr/bin/ln and /usr/xpg4/bin/ln on solaris 9 don't properly handle -f and -s used at the same time. This caused the test setup and subsequent checks to fail. Instead, remove the symlink and then create a new one in the setup code. The upstream Solaris bug (fixed in 10, but not 9) is documented here: http://bugs.opensolaris.org/view_bug.do?bug_id=4372462 Signed-off-by: Ben Walton Signed-off-by: Junio C Hamano diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index ea64cd8..32ec82a 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -25,7 +25,8 @@ test_expect_success 'setup ' ' echo "bin: test 1 version 2" >one.bin && echo "bin: test number 2 version 2" >>two.bin && if test_have_prereq SYMLINKS; then - ln -sf two.bin symlink.bin + rm symlink.bin && + ln -s two.bin symlink.bin fi && GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" ' -- cgit v0.10.2-6-g49f6 From d98f24cd9d8d8ee20b65d22ec6b78da04b48de85 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 20 Mar 2011 22:14:21 -0700 Subject: Update draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes/1.7.4.2.txt b/Documentation/RelNotes/1.7.4.2.txt index afb3871..991dae4 100644 --- a/Documentation/RelNotes/1.7.4.2.txt +++ b/Documentation/RelNotes/1.7.4.2.txt @@ -7,6 +7,11 @@ Fixes since v1.7.4.1 * Many documentation updates to match "git cmd -h" output and the git-cmd manual page. + * We used to keep one file descriptor open for each and every packfile + that we have a mmap window on it (read: "in use"), even when for very + tiny packfiles. We now close the file descriptor early when the entire + packfile fits inside one mmap window. + * "git clone /no/such/path" did not fail correctly. * "git commit" did not correctly error out when the user asked to use a @@ -34,6 +39,10 @@ Fixes since v1.7.4.1 to update the upstream branch it forked from is now called "upstream". The old name "tracking" is and will be supported. + * "git submodule update" used to honor the --merge/--rebase option (or + corresponding configuration variables) even for a newly cloned + subproject, which made no sense (so/submodule-no-update-first-time). + * gitweb's "highlight" interface mishandled tabs. * gitweb had a few forward-incompatible syntactic constructs and -- cgit v0.10.2-6-g49f6