From 86ae05127449b88a55f120634d809a765af12a82 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 8 May 2014 10:05:22 -0700 Subject: [PATCH 1/2] Start preparing for 1.9.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.9.3.txt | 21 +++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.9.3.txt diff --git a/Documentation/RelNotes/1.9.3.txt b/Documentation/RelNotes/1.9.3.txt new file mode 100644 index 000000000..17b05ca7b --- /dev/null +++ b/Documentation/RelNotes/1.9.3.txt @@ -0,0 +1,21 @@ +Git v1.9.3 Release Notes +======================== + +Fixes since v1.9.2 +------------------ + + * "git p4" dealing with changes in binary files were broken by a + change in 1.9 release. + + * The shell prompt script (in contrib/), when using the PROMPT_COMMAND + interface, used an unsafe construct when showing the branch name in + $PS1. + + * "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not + work well with. + + * Some more Unicode codepoints defined in Unicode 6.3 as having + zero width have been taught to our display column counting logic. + + * Some tests used shell constructs that did not work well on + FreeBSD. diff --git a/RelNotes b/RelNotes index 58c32c352..7b78eb971 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.9.2.txt \ No newline at end of file +Documentation/RelNotes/1.9.3.txt \ No newline at end of file From e28dcdce137b6ce53343aec3a4eccc0cd6f294b5 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 7 May 2014 16:44:01 -0700 Subject: [PATCH 2/2] shell doc: remove stray "+" in example The git-shell(1) manpage says EXAMPLE To disable interactive logins, displaying a greeting instead: + $ chsh -s /usr/bin/git-shell $ mkdir $HOME/git-shell-commands [...] The stray "+" has been there ever since the example was added in v1.8.3-rc0~210^2 (shell: new no-interactive-login command to print a custom message, 2013-03-09). The "+" sign between paragraphs is needed in asciidoc to attach extra paragraphs to a list item but here it is not needed and ends up rendered as a literal "+". Remove it. A quick search with "grep -e '

+' /usr/share/doc/git/html/*.html" doesn't find any other instances of this problem. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-shell.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt index c35051ba5..e4bdd2235 100644 --- a/Documentation/git-shell.txt +++ b/Documentation/git-shell.txt @@ -66,7 +66,7 @@ EXAMPLE ------- To disable interactive logins, displaying a greeting instead: -+ + ---------------- $ chsh -s /usr/bin/git-shell $ mkdir $HOME/git-shell-commands