From 5155c7f37a7422cd14884ee9a7e8e2a79508aea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= Date: Sun, 30 Jun 2013 12:45:25 +0200 Subject: [PATCH 1/3] test: spell 'ls-files --delete' option correctly in test descriptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The option is spelled '--deleted'. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- t/t7011-skip-worktree-reading.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index 8f3b54d826..88d60c1ce2 100755 --- a/t/t7011-skip-worktree-reading.sh +++ b/t/t7011-skip-worktree-reading.sh @@ -91,12 +91,12 @@ test_expect_success 'update-index --remove' ' test_cmp expected 1 ' -test_expect_success 'ls-files --delete' ' +test_expect_success 'ls-files --deleted' ' setup_absent && test -z "$(git ls-files -d)" ' -test_expect_success 'ls-files --delete' ' +test_expect_success 'ls-files --deleted' ' setup_dirty && test -z "$(git ls-files -d)" ' From 5a87e92232c5468ff8d9a7139dd02a7969c8bbf6 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 30 Jun 2013 17:35:28 +0530 Subject: [PATCH 2/3] check-ignore doc: fix broken link to ls-files page Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano --- Documentation/git-check-ignore.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 854e4d0c42..7f5601bda5 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -82,7 +82,7 @@ SEE ALSO -------- linkgit:gitignore[5] linkgit:gitconfig[5] -linkgit:git-ls-files[5] +linkgit:git-ls-files[1] GIT --- From 43d11f4492ebafdabd3fb0c9bcab49d2731e4676 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 30 Jun 2013 15:36:03 -0700 Subject: [PATCH 3/3] Start preparing for 1.8.3.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.3.3.txt | 11 +++++++++++ RelNotes | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.8.3.3.txt diff --git a/Documentation/RelNotes/1.8.3.3.txt b/Documentation/RelNotes/1.8.3.3.txt new file mode 100644 index 0000000000..58a570ef3d --- /dev/null +++ b/Documentation/RelNotes/1.8.3.3.txt @@ -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. diff --git a/RelNotes b/RelNotes index 9277723427..a5201213ac 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.3.2.txt \ No newline at end of file +Documentation/RelNotes/1.8.3.3.txt \ No newline at end of file