undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Start preparing for 1.8.3.3
  check-ignore doc: fix broken link to ls-files page
  test: spell 'ls-files --delete' option correctly in test descriptions
This commit is contained in:
Junio C Hamano 2013-06-30 15:45:43 -07:00
commit 7a3187eb78
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/RelNotes/1.8.3.3.txt Normal file
View File

@ -0,0 +1,11 @@
Git v1.8.3.3 Release Notes
==========================
Fixes since v1.8.3.2
--------------------
* Mac OS X does not like to write(2) more than INT_MAX number of
bytes; work it around by chopping write(2) into smaller pieces.
* Newer MacOS X encourages the programs to compile and link with
their CommonCrypto, not with OpenSSL.

2
Documentation/git-check-ignore.txt
View File

@ -102,7 +102,7 @@ SEE ALSO
-------- --------
linkgit:gitignore[5] linkgit:gitignore[5]
linkgit:gitconfig[5] linkgit:gitconfig[5]
linkgit:git-ls-files[5] linkgit:git-ls-files[1]
GIT GIT
--- ---

4
t/t7011-skip-worktree-reading.sh
View File

@ -91,12 +91,12 @@ test_expect_success 'update-index --remove' '
test_cmp expected 1 test_cmp expected 1
' '
test_expect_success 'ls-files --delete' ' test_expect_success 'ls-files --deleted' '
setup_absent && setup_absent &&
test -z "$(git ls-files -d)" test -z "$(git ls-files -d)"
' '
test_expect_success 'ls-files --delete' ' test_expect_success 'ls-files --deleted' '
setup_dirty && setup_dirty &&
test -z "$(git ls-files -d)" test -z "$(git ls-files -d)"
' '