From bafc478f1618534fcb85bedc0fa224bd2d462441 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Sep 2012 20:57:23 -0700
Subject: [PATCH 1/2] Git 1.7.11.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/RelNotes/1.7.11.7.txt | 46 +++++++++++++++++++++++++++++
Documentation/git.txt | 3 +-
GIT-VERSION-GEN | 2 +-
RelNotes | 2 +-
4 files changed, 50 insertions(+), 3 deletions(-)
create mode 100644 Documentation/RelNotes/1.7.11.7.txt
diff --git a/Documentation/RelNotes/1.7.11.7.txt b/Documentation/RelNotes/1.7.11.7.txt
new file mode 100644
index 0000000000..e7e79d999b
--- /dev/null
+++ b/Documentation/RelNotes/1.7.11.7.txt
@@ -0,0 +1,46 @@
+Git v1.7.11.7 Release Notes
+===========================
+
+Fixes since v1.7.11.6
+---------------------
+
+ * The synopsis said "checkout [-B branch]" to make it clear the
+ branch name is a parameter to the option, but the heading for the
+ option description was "-B::", not "-B branch::", making the
+ documentation misleading.
+
+ * Git ships with a fall-back regexp implementation for platforms with
+ buggy regexp library, but it was easy for people to keep using their
+ platform regexp. A new test has been added to check this.
+
+ * "git apply -p0" did not parse pathnames on "diff --git" line
+ correctly. This caused patches that had pathnames in no other
+ places to be mistakenly rejected (most notably, binary patch that
+ does not rename nor change mode). Textual patches, renames or mode
+ changes have preimage and postimage pathnames in different places
+ in a form that can be parsed unambiguously and did not suffer from
+ this problem.
+
+ * After "gitk" showed the contents of a tag, neither "Reread
+ references" nor "Reload" did not update what is shown as the
+ contents of it, when the user overwrote the tag with "git tag -f".
+
+ * "git for-each-ref" did not currectly support more than one --sort
+ option.
+
+ * "git log .." errored out saying it is both rev range and a path
+ when there is no disambiguating "--" is on the command line.
+ Update the command line parser to interpret ".." as a path in such
+ a case.
+
+ * Pushing to smart HTTP server with recent Git fails without having
+ the username in the URL to force authentication, if the server is
+ configured to allow GET anonymously, while requiring authentication
+ for POST.
+
+ * "git show --format='%ci'" did not give timestamp correctly for
+ commits created without human readable name on "committer" line.
+ (merge e27ddb6 jc/maint-ident-missing-human-name later to maint).
+
+ * "git show --quiet" ought to be a synonym for "git show -s", but
+ wasn't.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 165d13ad22..65c37c4544 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.11.6/git.html[documentation for release 1.7.11.6]
+* link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
* release notes for
+ link:RelNotes/1.7.11.7.txt[1.7.11.7],
link:RelNotes/1.7.11.6.txt[1.7.11.6],
link:RelNotes/1.7.11.5.txt[1.7.11.5],
link:RelNotes/1.7.11.4.txt[1.7.11.4],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 754b94e0d2..28f12902a6 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.11.6
+DEF_VER=v1.7.11.7
LF='
'
diff --git a/RelNotes b/RelNotes
index d04f1ae46c..6205f6cd4f 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.11.6.txt
\ No newline at end of file
+Documentation/RelNotes/1.7.11.7.txt
\ No newline at end of file
From d4d39bc32db51928b190c3128ced6194b81b3a99 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Sep 2012 21:37:51 -0700
Subject: [PATCH 2/2] Draft release notes to 1.7.12.1
We are almost there...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/RelNotes/1.7.12.1.txt | 156 ++++++++++++++++------------
1 file changed, 89 insertions(+), 67 deletions(-)
diff --git a/Documentation/RelNotes/1.7.12.1.txt b/Documentation/RelNotes/1.7.12.1.txt
index 4088a166f5..671e3d2eb5 100644
--- a/Documentation/RelNotes/1.7.12.1.txt
+++ b/Documentation/RelNotes/1.7.12.1.txt
@@ -4,25 +4,94 @@ Git 1.7.12.1 Release Notes
Fixes since v1.7.12
-------------------
- * "ciabot" script (in contrib/) has been updated with extensive
- documentation.
+ * "git apply -p0" did not parse pathnames on "diff --git" line
+ correctly. This caused patches that had pathnames in no other
+ places to be mistakenly rejected (most notably, binary patch that
+ does not rename nor change mode). Textual patches, renames or mode
+ changes have preimage and postimage pathnames in different places
+ in a form that can be parsed unambiguously and did not suffer from
+ this problem.
- * The "--rebase" option to "git pull" can be abbreviated to "-r",
- but we didn't document it.
+ * "git cherry-pick A C B" used to replay changes in A and then B and
+ then C if these three commits had committer timestamps in that
+ order, which is not what the user who said "A C B" naturally
+ expects.
- * It was generally understood that "--long-option"s to many of our
- subcommands can be abbreviated to the unique prefix, but it was not
- easy to find it described for new readers of the documentation set.
+ * "git commit --amend" let the user edit the log message and then
+ died when the human-readable committer name was given
+ insufficiently by getpwent(3).
- * The synopsis said "checkout [-B branch]" to make it clear the
- branch name is a parameter to the option, but the heading for the
- option description was "-B::", not "-B branch::", making the
- documentation misleading.
+ * Some capabilities were asked by fetch-pack even when upload-pack
+ did not advertise that they are available. fetch-pack has been
+ fixed not to do so.
+
+ * "git diff" had a confusion between taking data from a path in the
+ working tree and taking data from an object that happens to have
+ name 0{40} recorded in a tree.
+
+ * "git for-each-ref" did not correctly support more than one --sort
+ option.
+
+ * "git log .." errored out saying it is both rev range and a path
+ when there is no disambiguating "--" is on the command line.
+ Update the command line parser to interpret ".." as a path in such
+ a case.
* The "--topo-order", "--date-order" (and the lack of either means
the default order) options to "rev-list" and "log" family of
commands were poorly described in the documentation.
+ * "git prune" without "-v" used to warn about leftover temporary
+ files (which is an indication of an earlier aborted operation).
+
+ * Pushing to smart HTTP server with recent Git fails without having
+ the username in the URL to force authentication, if the server is
+ configured to allow GET anonymously, while requiring authentication
+ for POST.
+
+ * The reflog entries left by "git rebase" and "git rebase -i" were
+ inconsistent (the interactive one gave an abbreviated object name).
+
+ * When "git push" triggered the automatic gc on the receiving end, a
+ message from "git prune" that said it was removing cruft leaked to
+ the standard output, breaking the communication protocol.
+
+ * "git show --quiet" ought to be a synonym for "git show -s", but
+ wasn't.
+
+ * "git show --format='%ci'" did not give timestamp correctly for
+ commits created without human readable name on "committer" line.
+
+ * "git send-email" did not unquote encoded words that appear on the
+ header correctly, and lost "_" from strings.
+
+ * The interactive prompt "git send-email" gives was error prone. It
+ asked "What e-mail address do you want to use?" with the address it
+ guessed (correctly) the user would want to use in its prompt,
+ tempting the user to say "y". But the response was taken as "No,
+ please use 'y' as the e-mail address instead", which is most
+ certainly not what the user meant.
+
+ * "gitweb" when used with PATH_INFO failed to notice directories with
+ SP (and other characters that need URL-style quoting) in them.
+
+ * When the user gives an argument that can be taken as both a
+ revision name and a pathname without disambiguating with "--", we
+ used to give a help message "Use '--' to separate". The message
+ has been clarified to show where that '--' goes on the command
+ line.
+
+ * When the user exports a non-default IFS without HT, scripts that
+ rely on being able to parse "ls-files -s | while read a b c..."
+ started to fail. Protect them from such a misconfiguration.
+
+ * After "gitk" showed the contents of a tag, neither "Reread
+ references" nor "Reload" did not update what is shown as the
+ contents of it, when the user overwrote the tag with "git tag -f".
+
+ * "ciabot" script (in contrib/) has been updated with extensive
+ documentation.
+
* Older parts of the documentation described as if having a regular
file in .git/refs/ hierarchy were the only way to have branches and
tags, which is not true for quite some time.
@@ -41,61 +110,14 @@ Fixes since v1.7.12
* Fallback 'getpass' implementation made unportable use of stdio API.
- * "git apply -p0" did not parse pathnames on "diff --git" line
- correctly. This caused patches that had pathnames in no other
- places to be mistakenly rejected (most notably, binary patch that
- does not rename nor change mode). Textual patches, renames or mode
- changes have preimage and postimage pathnames in different places
- in a form that can be parsed unambiguously and did not suffer from
- this problem.
+ * The "--rebase" option to "git pull" can be abbreviated to "-r",
+ but we didn't document it.
- * "git commit --amend" let the user edit the log message and then
- died when the human-readable committer name was given
- insufficiently by getpwent(3).
+ * It was generally understood that "--long-option"s to many of our
+ subcommands can be abbreviated to the unique prefix, but it was not
+ easy to find it described for new readers of the documentation set.
- * Some capabilities were asked by fetch-pack even when upload-pack
- did not advertise that they are available. fetch-pack has been
- fixed not to do so.
-
- * "git for-each-ref" did not currectly support more than one --sort
- option.
-
- * "git log .." errored out saying it is both rev range and a path
- when there is no disambiguating "--" is on the command line.
- Update the command line parser to interpret ".." as a path in such
- a case.
-
- * "git prune" without "-v" used to warn about leftover temporary
- files (which is an indication of an earlier aborted operation).
-
- * Pushing to smart HTTP server with recent Git fails without having
- the username in the URL to force authentication, if the server is
- configured to allow GET anonymously, while requiring authentication
- for POST.
-
- * The reflog entries left by "git rebase" and "git rebase -i" were
- inconsistent (the interactive one gave an abbreviated object name).
-
- * When the user exports a non-default IFS without HT, scripts that
- rely on being able to parse "ls-files -s | while read a b c..."
- started to fail. Protect them from such a misconfiguration.
-
- * When "git push" triggered the automatic gc on the receiving end, a
- message from "git prune" that said it was removing cruft leaked to
- the standard output, breaking the communication protocol.
-
- * "git diff" had a confusion between taking data from a path in the
- working tree and taking data from an object that happens to have
- name 0{40} recorded in a tree.
-
- * "git send-email" did not unquote encoded words that appear on the
- header correctly, and lost "_" from strings.
-
- * When the user gives an argument that can be taken as both a
- revision name and a pathname without disambiguating with "--", we
- used to give a help message "Use '--' to separate". The message
- has been clarified to show where that '--' goes on the command
- line.
-
- * "gitweb" when used with PATH_INFO failed to notice directories with
- SP (and other characters that need URL-style quoting) in them.
+ * The synopsis said "checkout [-B branch]" to make it clear the
+ branch name is a parameter to the option, but the heading for the
+ option description was "-B::", not "-B branch::", making the
+ documentation misleading.