Skip to content

Commit 66c3490

Browse files
committed
Merge branch 'maint'
2 parents 1084f3b + d4d39bc commit 66c3490

File tree

3 files changed

+117
-48
lines changed

3 files changed

+117
-48
lines changed

Documentation/RelNotes/1.7.11.7.txt

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
Git v1.7.11.7 Release Notes
2+
===========================
3+
4+
Fixes since v1.7.11.6
5+
---------------------
6+
7+
* The synopsis said "checkout [-B branch]" to make it clear the
8+
branch name is a parameter to the option, but the heading for the
9+
option description was "-B::", not "-B branch::", making the
10+
documentation misleading.
11+
12+
* Git ships with a fall-back regexp implementation for platforms with
13+
buggy regexp library, but it was easy for people to keep using their
14+
platform regexp. A new test has been added to check this.
15+
16+
* "git apply -p0" did not parse pathnames on "diff --git" line
17+
correctly. This caused patches that had pathnames in no other
18+
places to be mistakenly rejected (most notably, binary patch that
19+
does not rename nor change mode). Textual patches, renames or mode
20+
changes have preimage and postimage pathnames in different places
21+
in a form that can be parsed unambiguously and did not suffer from
22+
this problem.
23+
24+
* After "gitk" showed the contents of a tag, neither "Reread
25+
references" nor "Reload" did not update what is shown as the
26+
contents of it, when the user overwrote the tag with "git tag -f".
27+
28+
* "git for-each-ref" did not currectly support more than one --sort
29+
option.
30+
31+
* "git log .." errored out saying it is both rev range and a path
32+
when there is no disambiguating "--" is on the command line.
33+
Update the command line parser to interpret ".." as a path in such
34+
a case.
35+
36+
* Pushing to smart HTTP server with recent Git fails without having
37+
the username in the URL to force authentication, if the server is
38+
configured to allow GET anonymously, while requiring authentication
39+
for POST.
40+
41+
* "git show --format='%ci'" did not give timestamp correctly for
42+
commits created without human readable name on "committer" line.
43+
(merge e27ddb6 jc/maint-ident-missing-human-name later to maint).
44+
45+
* "git show --quiet" ought to be a synonym for "git show -s", but
46+
wasn't.

Documentation/RelNotes/1.7.12.1.txt

Lines changed: 69 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,6 @@ Git 1.7.12.1 Release Notes
44
Fixes since v1.7.12
55
-------------------
66

7-
* "ciabot" script (in contrib/) has been updated with extensive
8-
documentation.
9-
10-
* The "--rebase" option to "git pull" can be abbreviated to "-r",
11-
but we didn't document it.
12-
13-
* It was generally understood that "--long-option"s to many of our
14-
subcommands can be abbreviated to the unique prefix, but it was not
15-
easy to find it described for new readers of the documentation set.
16-
17-
* The synopsis said "checkout [-B branch]" to make it clear the
18-
branch name is a parameter to the option, but the heading for the
19-
option description was "-B::", not "-B branch::", making the
20-
documentation misleading.
21-
22-
* The "--topo-order", "--date-order" (and the lack of either means
23-
the default order) options to "rev-list" and "log" family of
24-
commands were poorly described in the documentation.
25-
26-
* Older parts of the documentation described as if having a regular
27-
file in .git/refs/ hierarchy were the only way to have branches and
28-
tags, which is not true for quite some time.
29-
30-
* A utility shell function test_seq has been added as a replacement
31-
for the 'seq' utility found on some platforms.
32-
33-
* Compatibility wrapper to learn the maximum number of file
34-
descriptors we can open around sysconf(_SC_OPEN_MAX) and
35-
getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
36-
37-
* We used curl_easy_strerror() without checking version of cURL,
38-
breaking the build for versions before curl 7.12.0.
39-
40-
* Code to work around MacOS X UTF-8 gotcha has been cleaned up.
41-
42-
* Fallback 'getpass' implementation made unportable use of stdio API.
43-
447
* "git apply -p0" did not parse pathnames on "diff --git" line
458
correctly. This caused patches that had pathnames in no other
469
places to be mistakenly rejected (most notably, binary patch that
@@ -49,6 +12,11 @@ Fixes since v1.7.12
4912
in a form that can be parsed unambiguously and did not suffer from
5013
this problem.
5114

15+
* "git cherry-pick A C B" used to replay changes in A and then B and
16+
then C if these three commits had committer timestamps in that
17+
order, which is not what the user who said "A C B" naturally
18+
expects.
19+
5220
* "git commit --amend" let the user edit the log message and then
5321
died when the human-readable committer name was given
5422
insufficiently by getpwent(3).
@@ -57,14 +25,22 @@ Fixes since v1.7.12
5725
did not advertise that they are available. fetch-pack has been
5826
fixed not to do so.
5927

60-
* "git for-each-ref" did not currectly support more than one --sort
28+
* "git diff" had a confusion between taking data from a path in the
29+
working tree and taking data from an object that happens to have
30+
name 0{40} recorded in a tree.
31+
32+
* "git for-each-ref" did not correctly support more than one --sort
6133
option.
6234

6335
* "git log .." errored out saying it is both rev range and a path
6436
when there is no disambiguating "--" is on the command line.
6537
Update the command line parser to interpret ".." as a path in such
6638
a case.
6739

40+
* The "--topo-order", "--date-order" (and the lack of either means
41+
the default order) options to "rev-list" and "log" family of
42+
commands were poorly described in the documentation.
43+
6844
* "git prune" without "-v" used to warn about leftover temporary
6945
files (which is an indication of an earlier aborted operation).
7046

@@ -76,26 +52,72 @@ Fixes since v1.7.12
7652
* The reflog entries left by "git rebase" and "git rebase -i" were
7753
inconsistent (the interactive one gave an abbreviated object name).
7854

79-
* When the user exports a non-default IFS without HT, scripts that
80-
rely on being able to parse "ls-files -s | while read a b c..."
81-
started to fail. Protect them from such a misconfiguration.
82-
8355
* When "git push" triggered the automatic gc on the receiving end, a
8456
message from "git prune" that said it was removing cruft leaked to
8557
the standard output, breaking the communication protocol.
8658

87-
* "git diff" had a confusion between taking data from a path in the
88-
working tree and taking data from an object that happens to have
89-
name 0{40} recorded in a tree.
59+
* "git show --quiet" ought to be a synonym for "git show -s", but
60+
wasn't.
61+
62+
* "git show --format='%ci'" did not give timestamp correctly for
63+
commits created without human readable name on "committer" line.
9064

9165
* "git send-email" did not unquote encoded words that appear on the
9266
header correctly, and lost "_" from strings.
9367

68+
* The interactive prompt "git send-email" gives was error prone. It
69+
asked "What e-mail address do you want to use?" with the address it
70+
guessed (correctly) the user would want to use in its prompt,
71+
tempting the user to say "y". But the response was taken as "No,
72+
please use 'y' as the e-mail address instead", which is most
73+
certainly not what the user meant.
74+
75+
* "gitweb" when used with PATH_INFO failed to notice directories with
76+
SP (and other characters that need URL-style quoting) in them.
77+
9478
* When the user gives an argument that can be taken as both a
9579
revision name and a pathname without disambiguating with "--", we
9680
used to give a help message "Use '--' to separate". The message
9781
has been clarified to show where that '--' goes on the command
9882
line.
9983

100-
* "gitweb" when used with PATH_INFO failed to notice directories with
101-
SP (and other characters that need URL-style quoting) in them.
84+
* When the user exports a non-default IFS without HT, scripts that
85+
rely on being able to parse "ls-files -s | while read a b c..."
86+
started to fail. Protect them from such a misconfiguration.
87+
88+
* After "gitk" showed the contents of a tag, neither "Reread
89+
references" nor "Reload" did not update what is shown as the
90+
contents of it, when the user overwrote the tag with "git tag -f".
91+
92+
* "ciabot" script (in contrib/) has been updated with extensive
93+
documentation.
94+
95+
* Older parts of the documentation described as if having a regular
96+
file in .git/refs/ hierarchy were the only way to have branches and
97+
tags, which is not true for quite some time.
98+
99+
* A utility shell function test_seq has been added as a replacement
100+
for the 'seq' utility found on some platforms.
101+
102+
* Compatibility wrapper to learn the maximum number of file
103+
descriptors we can open around sysconf(_SC_OPEN_MAX) and
104+
getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
105+
106+
* We used curl_easy_strerror() without checking version of cURL,
107+
breaking the build for versions before curl 7.12.0.
108+
109+
* Code to work around MacOS X UTF-8 gotcha has been cleaned up.
110+
111+
* Fallback 'getpass' implementation made unportable use of stdio API.
112+
113+
* The "--rebase" option to "git pull" can be abbreviated to "-r",
114+
but we didn't document it.
115+
116+
* It was generally understood that "--long-option"s to many of our
117+
subcommands can be abbreviated to the unique prefix, but it was not
118+
easy to find it described for new readers of the documentation set.
119+
120+
* The synopsis said "checkout [-B branch]" to make it clear the
121+
branch name is a parameter to the option, but the heading for the
122+
option description was "-B::", not "-B branch::", making the
123+
documentation misleading.

Documentation/git.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ Documentation for older releases are available here:
4848
* release notes for
4949
link:RelNotes/1.7.12.txt[1.7.12].
5050

51-
* link:v1.7.11.6/git.html[documentation for release 1.7.11.6]
51+
* link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
5252

5353
* release notes for
54+
link:RelNotes/1.7.11.7.txt[1.7.11.7],
5455
link:RelNotes/1.7.11.6.txt[1.7.11.6],
5556
link:RelNotes/1.7.11.5.txt[1.7.11.5],
5657
link:RelNotes/1.7.11.4.txt[1.7.11.4],

0 commit comments

Comments
 (0)