1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
|
Git v1.8.0 Release Notes
========================
Backward compatibility notes
----------------------------
In the next major release, we will change the behaviour of the "git
push" command. When "git push [$there]" does not say what to push, we
have used the traditional "matching" semantics (all your branches were
sent to the remote as long as there already are branches of the same
name over there). We will use the "simple" semantics, that pushes the
current branch to the branch with the same name only when the current
branch is set to integrate with that remote branch. There is a user
preference configuration variable "push.default" to change this, and
"git push" will warn about the upcoming change until you set this
variable.
"git branch --set-upstream" is deprecated and may be removed in a
relatively distant future. "git branch [-u|--set-upstream-to]" has
been introduced with a saner order of arguments.
Updates since v1.7.12
---------------------
UI, Workflows & Features
* A credential helper for Win32 to allow access to the keychain of
the logged-in user has been added.
* An initial port to HP NonStop.
* A credential helper to allow access to the Gnome keyring has been
added.
* When "git am" sanitizes the Subject: line, we strip the prefix from
"Re: subject" and also from a less common "re: subject", but left
even less common "RE: subject" intact.
* It was tempting to say "git branch --set-upstream origin/master",
but that tells Git to arrange the local branch "origin/master" to
integrate with the currently checked out branch, which is highly
unlikely what the user meant. The option is deprecated; use the
new "--set-upstream-to" (with a short-and-sweet "-u") option
instead.
* "git cherry-pick" learned the "--allow-empty-message" option to
allow it to replay a commit without any log message.
* After "git cherry-pick -s" gave control back to the user asking
help to resolve conflicts, concluding "git commit" used to need to
be run with "-s" if the user wants to sign it off; now the command
leaves the sign-off line in the log template.
* "git daemon" learned the "--access-hook" option to allow an
external command to decline service based on the client address,
repository path, etc.
* "git difftool --dir-diff" learned to use symbolic links to prepare
temporary copy of the working tree when available.
* "git grep" learned to use a non-standard pattern type by default if
a configuration variable tells it to.
* "git merge-base" learned "--is-ancestor A B" option to tell if A is
an ancestor of B. The result is indicated by its exit status code.
* "git mergetool" allows users to override the actual command used
with the mergetool.$name.cmd configuration variable even for built-in
mergetool backends.
* The "-Xours" backend option to "git merge -s recursive" now takes
effect even on binary files.
* "git rebase -i" learned the "--edit-todo" option to open an editor
to edit the insn sheet.
Foreign Interface
* "git svn" has been updated to work with SVN 1.7.
* "git p4" learned "--conflicts" option to specify what to do when
encountering a conflict during "p4 submit".
Performance, Internal Implementation, etc. (please report possible regressions)
* 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.
* The "check-docs" build target has been updated and greatly
simplified.
* The test suite is run under MALLOC_CHECK_ when running with glibc
that supports the feature.
* The documentation in the TeXinfo format was using indented output
for materials meant to be examples that are better typeset in
monospace.
* Compatibility wrapper around some mkdir(2) implementations that
reject parameter with trailing slash has been introduced.
* Compatibility wrapper for systems that lack usable setitimer() has
been added.
* The option parsing of "git checkout" had error checking, dwim and
defaulting missing options, all mixed in the code, and issuing an
appropriate error message with useful context was getting harder.
The code has been reorganized to allow giving a proper diagnosis
when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a
good name for a branch).
* Many internal uses of "git merge-base" equivalent were only to see
if one commit fast-forwards to the other, which did not need the
full set of merge bases to be computed. They have been updated to
use less expensive checks.
* The heuristics to detect and silently convert latin1 to utf8 when
we were told to use utf-8 in the log message has been transplanted
from "mailinfo" to "commit" and "commit-tree".
* Messages given by "git <subcommand> -h" from many subcommands have
been marked for translation.
Also contains minor documentation updates and code clean-ups.
Fixes since v1.7.12
-------------------
Unless otherwise noted, all the fixes since v1.7.12 in the
maintenance track are contained in this release (see release notes
to them for details).
* The attribute system may be asked for a path that itself or its
leading directories no longer exists in the working tree, and it is
fine if we cannot open .gitattribute file in such a case. Failure
to open per-directory .gitattributes with error status other than
ENOENT and ENOTDIR should be diagnosed, but it wasn't.
* When looking for $HOME/.gitconfig etc., it is OK if we cannot read
them because they do not exist, but we did not diagnose existing
files that we cannot read.
* When "git am" is fed an input that has multiple "Content-type: ..."
header, it did not grok charset= attribute correctly.
* "git blame MAKEFILE" run in a history that has "Makefile" but not
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
confused on a case insensitive filesystem and failed to do so.
* Even during a conflicted merge, "git blame $path" always meant to
blame uncommitted changes to the "working tree" version; make it
more useful by showing cleanly merged parts as coming from the other
branch that is being merged.
* It was unclear in the documentation for "git blame" that it is
unnecessary for users to use the "--follow" option.
(merge e5dce96 jc/blame-follows-renames later to maint).
* Output from "git branch -v" contains "(no branch)" that could be
localized, but the code to align it along with the names of
branches were counting in bytes, not in display columns.
* "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.
* A repository created with "git clone --single" had its fetch
refspecs set up just like a clone without "--single", leading the
subsequent "git fetch" to slurp all the other branches, defeating
the whole point of specifying "only this branch".
(merge 31b808a rt/maint-clone-single later to maint).
* Documentation talked about "first line of commit log" when it meant
the title of the commit. The description was clarified by defining
how the title is decided and rewording the casual mention of "first
line" to "title".
* "git cvsimport" did not thoroughly cleanse tag names that it
inferred from the names of the tags it obtained from CVS, which
caused "git tag" to barf and stop the import in the middle.
* Earlier we made the diffstat summary line that shows the number of
lines added/deleted localizable, but it was found irritating having
to see them in various languages on a list whose discussion language
is English.
* "git fetch --all", when passed "--no-tags", did not honor the
"--no-tags" option while fetching from individual remotes (the same
issue existed with "--tags", but combination "--all --tags" makes
much less sense than "--all --no-tags").
* "git fetch" over http had an old workaround for an unlikely server
misconfiguration; it turns out that this hurts debuggability of the
configuration in general, and has been reverted.
(merge 6ac964a sp/maint-http-info-refs-no-retry later to maint).
* "git fetch" over http advertised that it supports "deflate", which
is much less common, and did not advertise more common "gzip" on
its Accept-Encoding header.
(merge aa90b96 sp/maint-http-enable-gzip later to maint).
* 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 log --all-match --grep=A --grep=B" ought to show commits that
mention both A and B, but when these three options are used with
--author or --committer, it showed commits that mention either A or
B (or both) instead.
* "git p4", when "--use-client-spec" and "--detect-branches" are used
together, misdetected branches.
* "git receive-pack" (the counterpart to "git push") did not give
progress output while processing objects it received to the puser
when run over the smart-http protocol.
(merge 74eb32d jk/receive-pack-unpack-error-to-pusher later to maint).
* When you misspell the command name you give to the "exec" action in
the "git rebase -i" insn sheet, you are told that 'rebase' is not a
git subcommand from "git rebase --continue".
* The subcommand in "git remote" to remove a defined remote was
"rm" and the command did not take a fully-spelled "remove".
* 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.
* "git show --format='%ci'" did not give timestamp correctly for
commits created without human readable name on "committer" line.
* "git show --quiet" ought to be a synonym for "git show -s", but
wasn't.
* "git submodule frotz" was not diagnosed as "frotz" being an unknown
subcommand to "git submodule"; the user instead got a complaint
that "git submodule status" was run with an unknown path "frotz".
(merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint).
* "git status" honored the ignore=dirty settings in .gitmodules but
"git commit" didn't.
(merge 8f6811e os/commit-submodule-ignore later to maint).
|
