kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2011-03-20 22:14:47 -07:00
parent a91df69cbb d98f24cd9d
commit cdc34664d4
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/RelNotes/1.7.4.2.txt
View File

@ -7,6 +7,11 @@ Fixes since v1.7.4.1
* Many documentation updates to match "git cmd -h" output and the * Many documentation updates to match "git cmd -h" output and the
git-cmd manual page. 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 clone /no/such/path" did not fail correctly.


* "git commit" did not correctly error out when the user asked to use a * "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". to update the upstream branch it forked from is now called "upstream".
The old name "tracking" is and will be supported. 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's "highlight" interface mishandled tabs.


* gitweb had a few forward-incompatible syntactic constructs and * gitweb had a few forward-incompatible syntactic constructs and

7
t/README
View File

@ -102,6 +102,13 @@ appropriately before running "make".
not see any output, this option implies --verbose. For not see any output, this option implies --verbose. For
convenience, it also implies --tee. 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:: --tee::
In addition to printing the test output to the terminal, In addition to printing the test output to the terminal,
write it to files named 't/test-results/$TEST_NAME.out'. write it to files named 't/test-results/$TEST_NAME.out'.

3
t/t8006-blame-textconv.sh
View File

@ -25,7 +25,8 @@ test_expect_success 'setup ' '
echo "bin: test 1 version 2" >one.bin && echo "bin: test 1 version 2" >one.bin &&
echo "bin: test number 2 version 2" >>two.bin && echo "bin: test number 2 version 2" >>two.bin &&
if test_have_prereq SYMLINKS; then if test_have_prereq SYMLINKS; then
ln -sf two.bin symlink.bin rm symlink.bin &&
ln -s two.bin symlink.bin
fi && fi &&
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
' '