]>
Commit | Line | Data |
---|---|---|
9ab698f4 JH |
1 | Git 2.4 Release Notes |
2 | ===================== | |
3 | ||
e80e85a5 JH |
4 | Backward compatibility warning(s) |
5 | --------------------------------- | |
6 | ||
9b22801c | 7 | This release has a few changes in the user-visible output from |
6ae0d972 | 8 | Porcelain commands. These are not meant to be parsed by scripts, but |
6eb14013 | 9 | users still may want to be aware of the changes: |
e80e85a5 | 10 | |
6eb14013 MH |
11 | * The output from "git log --decorate" (and, more generally, the "%d" |
12 | format specifier used in the "--format=<string>" parameter to the | |
13 | "git log" family of commands) has changed. It used to list "HEAD" | |
14 | just like other branches; e.g., | |
e80e85a5 | 15 | |
9b22801c JH |
16 | $ git log --decorate -1 master |
17 | commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master) | |
18 | ... | |
e80e85a5 | 19 | |
6eb14013 MH |
20 | This release changes the output slightly when HEAD refers to a |
21 | branch whose name is also shown in the output. The above is now | |
9b22801c | 22 | shown as: |
e80e85a5 | 23 | |
9b22801c JH |
24 | $ git log --decorate -1 master |
25 | commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master) | |
26 | ... | |
e80e85a5 | 27 | |
9b22801c | 28 | * The phrasing "git branch" uses to describe a detached HEAD has been |
6eb14013 | 29 | updated to agree with the phrasing used by "git status": |
9b22801c | 30 | |
6eb14013 | 31 | - When HEAD is at the same commit as when it was originally |
9b22801c JH |
32 | detached, they now both show "detached at <commit object name>". |
33 | ||
6eb14013 MH |
34 | - When HEAD has moved since it was originally detached, they now |
35 | both show "detached from <commit object name>". | |
9b22801c | 36 | |
6eb14013 | 37 | Previously, "git branch" always used "from". |
e80e85a5 JH |
38 | |
39 | ||
9ab698f4 JH |
40 | Updates since v2.3 |
41 | ------------------ | |
42 | ||
43 | Ports | |
44 | ||
45 | * Our default I/O size (8 MiB) for large files was too large for some | |
46 | platforms with smaller SSIZE_MAX, leading to read(2)/write(2) | |
47 | failures. | |
48 | ||
6eb14013 MH |
49 | * We did not check the curl library version before using the |
50 | CURLOPT_PROXYAUTH feature, which did not exist in older versions of | |
51 | the library. | |
9ab698f4 | 52 | |
e80e85a5 JH |
53 | * We now detect number of CPUs on older BSD-derived systems. |
54 | ||
55 | * Portability fixes and workarounds for shell scripts have been added | |
56 | to help BSD-derived systems. | |
57 | ||
9ab698f4 JH |
58 | |
59 | UI, Workflows & Features | |
60 | ||
61 | * The command usage info strings given by "git cmd -h" and in | |
62 | documentation have been tweaked for consistency. | |
63 | ||
64 | * The "sync" subcommand of "git p4" now allows users to exclude | |
65 | subdirectories like its "clone" subcommand does. | |
66 | ||
67 | * "git log --invert-grep --grep=WIP" will show only commits that do | |
68 | not have the string "WIP" in their messages. | |
69 | ||
6eb14013 MH |
70 | * "git push" has been taught an "--atomic" option that makes a push |
71 | that updates more than one ref an "all-or-none" affair. | |
9ab698f4 | 72 | |
6eb14013 MH |
73 | * Extending the "push to deploy" feature that was added in 2.3, the |
74 | behaviour of "git push" when updating the branch that is checked | |
75 | out can now be tweaked by a "push-to-checkout" hook. | |
9ab698f4 | 76 | |
6eb14013 MH |
77 | * HTTP-based transports now send Accept-Language when making |
78 | requests. The languages to accept are inferred from environment | |
79 | variables on the client side (LANGUAGE, etc). | |
9ab698f4 JH |
80 | |
81 | * "git send-email" used to accept a mistaken "y" (or "yes") as an | |
6eb14013 MH |
82 | answer to "What encoding do you want to use [UTF-8]?" without |
83 | questioning. Now it asks for confirmation when the answer looks too | |
84 | short to be a valid encoding name. | |
9ab698f4 JH |
85 | |
86 | * When "git apply --whitespace=fix" fixed whitespace errors in the | |
87 | common context lines, the command reports that it did so. | |
88 | ||
6eb14013 MH |
89 | * "git status" now allows the "-v" option to be given twice, in which |
90 | case it also shows the differences in the working tree that are not | |
91 | staged to be committed. | |
9ab698f4 | 92 | |
6eb14013 MH |
93 | * "git cherry-pick" used to clean up the log message even when it is |
94 | merely replaying an existing commit. It now replays the message | |
95 | verbatim unless you are editing the message of the resulting | |
96 | commit. | |
9ab698f4 JH |
97 | |
98 | * "git archive" can now be told to set the 'text' attribute in the | |
99 | resulting zip archive. | |
100 | ||
6eb14013 MH |
101 | * Output from "git log --decorate" now distinguishes between a |
102 | detached HEAD vs. a HEAD that points at a branch. | |
e80e85a5 | 103 | |
6eb14013 MH |
104 | This is a potentially backward-incompatible change; see above for |
105 | more information. | |
e80e85a5 | 106 | |
6eb14013 MH |
107 | * When HEAD was detached when at commit xyz and hasn't been moved |
108 | since it was detached, "git status" would report "detached at xyz" | |
109 | whereas "git branch" would report "detached from xyz". Now the | |
110 | output of "git branch" agrees with that of "git status". | |
e80e85a5 | 111 | |
6eb14013 MH |
112 | This is a potentially backward-incompatible change; see above for |
113 | more information. | |
114 | ||
115 | * "git -C '' subcmd" now works in the current directory (analogously | |
116 | to "cd ''") rather than dying with an error message. | |
e80e85a5 JH |
117 | (merge 6a536e2 kn/git-cd-to-empty later to maint). |
118 | ||
37f4bed1 | 119 | * The versionsort.prereleaseSuffix configuration variable can be used |
6eb14013 | 120 | to specify that, for example, v1.0-pre1 comes before v1.0. |
e80e85a5 | 121 | |
9b22801c JH |
122 | * A new "push.followTags" configuration turns the "--follow-tags" |
123 | option on by default for the "git push" command. | |
124 | ||
6eb14013 MH |
125 | * "git log --graph --no-walk A B..." is a nonsensical combination of |
126 | options: "--no-walk" requests discrete points in the history, while | |
127 | "--graph" asks to draw connections between these discrete points. | |
128 | Forbid the use of these options together. | |
bca18110 JH |
129 | |
130 | * "git rev-list --bisect --first-parent" does not work (yet) and can | |
6eb14013 MH |
131 | even cause SEGV; forbid it. "git log --bisect --first-parent" would |
132 | not be useful until "git bisect --first-parent" materializes, so | |
133 | also forbid it for now. | |
bca18110 | 134 | |
9ab698f4 JH |
135 | |
136 | Performance, Internal Implementation, Development Support etc. | |
137 | ||
6eb14013 | 138 | * Slightly change the implementation of the N_() macro to help us |
9ab698f4 JH |
139 | detect mistakes. |
140 | ||
6eb14013 MH |
141 | * Restructure the implementation of "reflog expire" to fit better |
142 | with the recently updated reference API. | |
9ab698f4 | 143 | |
6eb14013 | 144 | * The transport-helper did not pass transport options such as |
9ab698f4 JH |
145 | verbosity, progress, cloning, etc. to import and export based |
146 | helpers, like it did for fetch and push based helpers, robbing them | |
6eb14013 MH |
147 | of the chance to honor the wish of the end-users better. |
148 | ||
149 | * The tests that wanted to see that a file becomes unreadable after | |
150 | running "chmod a-r file", and the tests that wanted to make sure | |
151 | that they are not run as root, used "can we write into the / | |
152 | directory?" as a cheap substitute. But on some platforms that is | |
153 | not a good heuristic. The tests and their prerequisites have been | |
154 | updated to check what they really require. | |
9ab698f4 JH |
155 | (merge f400e51 jk/sanity later to maint). |
156 | ||
157 | * Various issues around "reflog expire", e.g. using --updateref when | |
158 | expiring a reflog for a symbolic reference, have been corrected | |
159 | and/or made saner. | |
160 | ||
6eb14013 MH |
161 | * The documentation for the strbuf API had been split between the API |
162 | documentation and the header file. Consolidate the documentation in | |
163 | strbuf.h. | |
9ab698f4 JH |
164 | |
165 | * The error handling functions and conventions are now documented in | |
6eb14013 | 166 | the API manual (in api-error-handling.txt). |
9ab698f4 | 167 | |
6eb14013 | 168 | * Optimize gitattribute look-up, mostly useful in "git grep" on a |
9ab698f4 JH |
169 | project that does not use many attributes, by avoiding it when we |
170 | (should) know that the attributes are not defined in the first | |
171 | place. | |
172 | ||
173 | * Typofix in comments. | |
174 | (merge ef2956a ak/git-pm-typofix later to maint). | |
175 | ||
176 | * Code clean-up. | |
177 | (merge 0b868f0 sb/hex-object-name-is-at-most-41-bytes-long later to maint). | |
178 | (merge 5d30851 dp/remove-duplicated-header-inclusion later to maint). | |
179 | ||
6eb14013 MH |
180 | * Simplify the ref transaction API for verifying that "the ref should |
181 | be pointing at this object". | |
9ab698f4 | 182 | |
6eb14013 MH |
183 | * Simplify the code in "git daemon" that parses out and holds |
184 | hostnames used in request interpolation. | |
e80e85a5 | 185 | |
6eb14013 MH |
186 | * Restructure the "git push" codepath to make it easier to add new |
187 | configuration bits. | |
9b22801c | 188 | |
6eb14013 MH |
189 | * The run-command interface made it easy to make a pipe for us to |
190 | read from a process, wait for the process to finish, and then | |
191 | attempt to read its output. But this pattern can lead to deadlock. | |
192 | So introduce a helper to do this correctly (i.e., first read, and | |
193 | then wait the process to finish) and also add code to prevent such | |
194 | abuse in the run-command helper. | |
bca18110 | 195 | |
2dfb2e07 | 196 | * People often forget to chain the commands in their test together |
6eb14013 MH |
197 | with &&, letting a failure from an earlier command in the test go |
198 | unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to | |
2dfb2e07 JH |
199 | catch such a mistake more easily. |
200 | ||
9ab698f4 JH |
201 | |
202 | Also contains various documentation updates and code clean-ups. | |
203 | ||
204 | ||
205 | Fixes since v2.3 | |
206 | ---------------- | |
207 | ||
208 | Unless otherwise noted, all the fixes since v2.3 in the maintenance | |
209 | track are contained in this release (see the maintenance releases' | |
210 | notes for details). | |
211 | ||
212 | * "git blame HEAD -- missing" failed to correctly say "HEAD" when it | |
213 | tried to say "No such path 'missing' in HEAD". | |
214 | (merge a46442f jk/blame-commit-label later to maint). | |
215 | ||
216 | * "git rerere" (invoked internally from many mergy operations) did | |
6eb14013 MH |
217 | not correctly signal errors when it attempted to update the working |
218 | tree files but failed for whatever reason. | |
9ab698f4 JH |
219 | (merge 89ea903 jn/rerere-fail-on-auto-update-failure later to maint). |
220 | ||
221 | * Setting diff.submodule to 'log' made "git format-patch" produce | |
222 | broken patches. | |
223 | (merge 339de50 dk/format-patch-ignore-diff-submodule later to maint). | |
224 | ||
6eb14013 MH |
225 | * After attempting and failing a password-less authentication (e.g., |
226 | Kerberos), libcURL refuses to fall back to password-based Basic | |
227 | authentication without a bit of help/encouragement. | |
9ab698f4 JH |
228 | (merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint). |
229 | ||
6eb14013 | 230 | * The "git push" documentation for the "--repo=<there>" option was |
9ab698f4 JH |
231 | easily misunderstood. |
232 | (merge 57b92a7 mg/push-repo-option-doc later to maint). | |
233 | ||
6eb14013 MH |
234 | * Code to read a branch name from various files in the .git/ |
235 | directory would have overrun array limits if asked to read an empty | |
236 | file. | |
9ab698f4 JH |
237 | (merge 66ec904 jk/status-read-branch-name-fix later to maint). |
238 | ||
6eb14013 | 239 | * Remove a superfluous conditional that is always true. |
9ab698f4 JH |
240 | (merge 94ee8e2 jk/remote-curl-an-array-in-struct-cannot-be-null later to maint). |
241 | ||
6eb14013 MH |
242 | * The "git diff --raw" documentation incorrectly implied that C(opy) |
243 | and R(ename) are the only statuses that can be followed by a score | |
244 | number. | |
9ab698f4 JH |
245 | (merge ac1c2d9 jc/diff-format-doc later to maint). |
246 | ||
247 | * A broken pack .idx file in the receiving repository prevented the | |
248 | dumb http transport from fetching a good copy of it from the other | |
249 | side. | |
250 | (merge 8b9c2dd jk/dumb-http-idx-fetch-fix later to maint). | |
251 | ||
252 | * The error message from "git commit", when a non-existing author | |
253 | name was given as value to the "--author=" parameter, has been | |
254 | reworded to avoid misunderstanding. | |
255 | (merge 1044b1f mg/commit-author-no-match-malformed-message later to maint). | |
256 | ||
257 | * "git log --help" used to show rev-list options that are irrelevant | |
258 | to the "log" command. | |
259 | (merge 3cab02d jc/doc-log-rev-list-options later to maint). | |
260 | ||
6eb14013 MH |
261 | * "git apply --whitespace=fix" used to under-allocate memory when the |
262 | fix resulted in a longer text than the original patch. | |
9ab698f4 JH |
263 | (merge 407a792 jc/apply-ws-fix-expands later to maint). |
264 | ||
265 | * The interactive "show a list and let the user choose from it" | |
6eb14013 MH |
266 | interface used by "git add -i" unnecessarily prompted the user even |
267 | when the candidate list was empty, against which the only "choice" | |
268 | the user could have made was to choose nothing. | |
9ab698f4 JH |
269 | (merge a9c4641 ak/add-i-empty-candidates later to maint). |
270 | ||
6eb14013 | 271 | * The todo list created by "git rebase -i" did not fully honor |
9ab698f4 JH |
272 | core.abbrev settings. |
273 | (merge edb72d5 ks/rebase-i-abbrev later to maint). | |
274 | ||
6eb14013 MH |
275 | * "git fetch" over a remote-helper that cannot respond to the "list" |
276 | command could not fetch from a symbolic reference (e.g., HEAD). | |
9ab698f4 JH |
277 | (merge 33cae54 mh/deref-symref-over-helper-transport later to maint). |
278 | ||
279 | * "git push --signed" gave an incorrectly worded error message when | |
280 | the other side did not support the capability. | |
7c597ef3 JH |
281 | |
282 | * The "git push --signed" protocol extension did not limit what the | |
6eb14013 MH |
283 | "nonce" (a server-chosen string) could contain nor how long it |
284 | could be, which was unnecessarily lax. Limit both the length and | |
285 | the alphabet to a reasonably small space that can still have enough | |
7c597ef3 JH |
286 | entropy. |
287 | (merge afcb6ee jc/push-cert later to maint). | |
288 | ||
6eb14013 MH |
289 | * The completion script (in contrib/) clobbered the shell variable $x |
290 | in the global shell namespace. | |
7c597ef3 | 291 | (merge 852ff1c ma/bash-completion-leaking-x later to maint). |
9ab698f4 | 292 | |
6eb14013 MH |
293 | * We incorrectly formatted a "uintmax_t" integer that doesn't fit in |
294 | "int". | |
9ab698f4 JH |
295 | (merge d306f3d jk/decimal-width-for-uintmax later to maint). |
296 | ||
6eb14013 MH |
297 | * The configuration parser used to be confused when reading |
298 | configuration from a blob object that ends with a lone CR. | |
9ab698f4 JH |
299 | (merge 1d0655c jk/config-no-ungetc-eof later to maint). |
300 | ||
301 | * The pack bitmap support did not build with older versions of GCC. | |
302 | (merge bd4e882 jk/pack-bitmap later to maint). | |
303 | ||
304 | * The documentation wasn't clear that "remote.<nick>.pushURL" and | |
305 | "remote.<nick>.URL" are there to name the same repository accessed | |
306 | via different transports, not two separate repositories. | |
307 | (merge 697f652 jc/remote-set-url-doc later to maint). | |
308 | ||
309 | * Older GnuPG implementations may not correctly import the keyring | |
310 | material we prepare for the tests to use. | |
311 | (merge 1f985d6 ch/new-gpg-drops-rfc-1991 later to maint). | |
312 | ||
313 | * The credential helper for Windows (in contrib/) used to mishandle | |
6eb14013 | 314 | user names that contain an at-sign. |
9ab698f4 JH |
315 | (merge 13d261e av/wincred-with-at-in-username-fix later to maint). |
316 | ||
e46fe3df | 317 | * "diff-highlight" (in contrib/) used to show byte-by-byte |
6eb14013 MH |
318 | differences, which could cause multi-byte characters to be chopped |
319 | in the middle. It learned to pay attention to character boundaries | |
320 | (assuming UTF-8). | |
e46fe3df JH |
321 | (merge 8d00662 jk/colors later to maint). |
322 | ||
6eb14013 MH |
323 | * Document longstanding configuration variable naming rules in |
324 | CodingGuidelines. | |
9ab698f4 JH |
325 | (merge 35840a3 jc/conf-var-doc later to maint). |
326 | ||
327 | * An earlier workaround to squelch unhelpful deprecation warnings | |
6eb14013 | 328 | from the compiler on OS X unnecessarily set a minimum required |
9ab698f4 JH |
329 | version of the OS, which the user might want to raise (or lower) |
330 | for other reasons. | |
331 | (merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint). | |
332 | ||
333 | * Certain older vintages of cURL give irregular output from | |
334 | "curl-config --vernum", which confused our build system. | |
335 | (merge 3af6792 tc/curl-vernum-output-broken-in-7.11 later to maint). | |
336 | ||
337 | * In v2.2.0, we broke "git prune" that runs in a repository that | |
338 | borrows from an alternate object store. | |
339 | (merge b0a4264 jk/prune-mtime later to maint). | |
340 | ||
341 | * "git submodule add" failed to squash "path/to/././submodule" to | |
342 | "path/to/submodule". | |
343 | (merge 8196e72 ps/submodule-sanitize-path-upon-add later to maint). | |
344 | ||
6eb14013 MH |
345 | * "git merge-file" did not work correctly when invoked in a |
346 | subdirectory. | |
9ab698f4 JH |
347 | (merge 204a8ff ab/merge-file-prefix later to maint). |
348 | ||
6eb14013 MH |
349 | * "git blame" could die trying to free an uninitialized piece of |
350 | memory. | |
9ab698f4 JH |
351 | (merge e600592 es/blame-commit-info-fix later to maint). |
352 | ||
353 | * "git fast-import" used to crash when it could not close and | |
6eb14013 | 354 | finalize the resulting packfile cleanly. |
9ab698f4 JH |
355 | (merge 5e915f3 jk/fast-import-die-nicely-fix later to maint). |
356 | ||
6eb14013 MH |
357 | * "update-index --refresh" used to leak memory when an entry could |
358 | not be refreshed for whatever reason. | |
9ab698f4 JH |
359 | (merge bc1c2ca sb/plug-leak-in-make-cache-entry later to maint). |
360 | ||
361 | * The "interpolated-path" option of "git daemon" inserted any string | |
6eb14013 MH |
362 | the client declared on the "host=" capability request without |
363 | checking. Sanitize and limit %H and %CH to a saner and a valid DNS | |
364 | name. | |
9ab698f4 JH |
365 | (merge b485373 jk/daemon-interpolate later to maint). |
366 | ||
6eb14013 MH |
367 | * "git daemon" unnecessarily looked up the hostname even when "%CH" |
368 | and "%IP" interpolations were not requested. | |
9ab698f4 JH |
369 | (merge dc8edc8 rs/daemon-interpolate later to maint). |
370 | ||
6eb14013 MH |
371 | * We relied on "--no-" prefix handling in Perl's Getopt::Long |
372 | package, even though that support didn't exist in Perl 5.8 (which | |
373 | we still support). Manually add support to help people with older | |
374 | Getopt::Long packages. | |
9ab698f4 JH |
375 | (merge f471494 km/send-email-getopt-long-workarounds later to maint). |
376 | ||
377 | * "git apply" was not very careful about reading from, removing, | |
378 | updating and creating paths outside the working tree (under | |
379 | --index/--cached) or the current directory (when used as a | |
380 | replacement for GNU patch). | |
381 | (merge e0d201b jc/apply-beyond-symlink later to maint). | |
382 | ||
6eb14013 MH |
383 | * Correct a breakage in git-svn, introduced around the v2.2 era, that |
384 | can cause FileHandles to be closed prematurely. | |
9ab698f4 JH |
385 | (merge e426311 ew/svn-maint-fixes later to maint). |
386 | ||
6eb14013 MH |
387 | * We did not parse usernames followed by literal IPv6 addresses |
388 | correctly in SSH transport URLs; e.g., | |
389 | ssh://user@[2001:db8::1]:22/repo.git. | |
e46fe3df | 390 | (merge 6b6c5f7 tb/connect-ipv6-parse-fix later to maint). |
9ab698f4 JH |
391 | |
392 | * The configuration variable 'mailinfo.scissors' was hard to | |
393 | discover in the documentation. | |
394 | (merge afb5de7 mm/am-c-doc later to maint). | |
395 | ||
396 | * The interaction between "git submodule update" and the | |
397 | submodule.*.update configuration was not clearly documented. | |
398 | (merge 5c31acf ms/submodule-update-config-doc later to maint). | |
399 | ||
6eb14013 MH |
400 | * "git diff --shortstat" used together with "--dirstat=changes" or |
401 | "--dirstat=files" incorrectly output dirstat information twice. | |
9ab698f4 JH |
402 | (merge ab27389 mk/diff-shortstat-dirstat-fix later to maint). |
403 | ||
6eb14013 MH |
404 | * The manpage for "git remote add" mentioned "--tags" and "--no-tags" |
405 | but did not explain what happens if neither option is provided. | |
9ab698f4 JH |
406 | (merge aaba0ab mg/doc-remote-tags-or-not later to maint). |
407 | ||
6eb14013 MH |
408 | * The description of "--exclude-standard option" in the output of |
409 | "git grep -h" was phrased poorly. | |
9ab698f4 JH |
410 | (merge 77fdb8a nd/grep-exclude-standard-help-fix later to maint). |
411 | ||
6eb14013 MH |
412 | * "git rebase -i" recently started to include the number of commits |
413 | in the todo list, but that output included extraneous whitespace on | |
414 | a platform that prepends leading whitespaces to its "wc -l" output. | |
9ab698f4 JH |
415 | (merge 2185d3b es/rebase-i-count-todo later to maint). |
416 | ||
6eb14013 MH |
417 | * The borrowed code in the kwset API did not follow our usual |
418 | convention to use "unsigned char" to store values that range from | |
419 | 0-255. | |
9ab698f4 JH |
420 | (merge 189c860 bw/kwset-use-unsigned later to maint). |
421 | ||
422 | * A corrupt input to "git diff -M" used to cause it to segfault. | |
423 | (merge 4d6be03 jk/diffcore-rename-duplicate later to maint). | |
424 | ||
e80e85a5 JH |
425 | * Certain builds of GPG triggered false breakages in a test. |
426 | (merge 3f88c1b mg/verify-commit later to maint). | |
427 | ||
428 | * "git imap-send" learned to optionally talk with an IMAP server via | |
6eb14013 MH |
429 | libcURL. Because there is no other option when Git is built with |
430 | the NO_OPENSSL option, use libcURL by default in that case. | |
e80e85a5 JH |
431 | (merge dcd01ea km/imap-send-libcurl-options later to maint). |
432 | ||
433 | * "git log --decorate" did not reset colors correctly around the | |
434 | branch names. | |
435 | (merge 5ee8758 jc/decorate-leaky-separator-color later to maint). | |
436 | ||
9b22801c JH |
437 | * The code that reads from the ctags file in the completion script |
438 | (in contrib/) did not spell ${param/pattern/string} substitution | |
439 | correctly, which happened to work with bash but not with zsh. | |
440 | (merge db8d750 js/completion-ctags-pattern-substitution-fix later to maint). | |
441 | ||
442 | * The transfer.hiderefs support did not quite work for smart-http | |
443 | transport. | |
444 | (merge 8ddf3ca jk/smart-http-hide-refs later to maint). | |
445 | ||
6eb14013 MH |
446 | * In the "git tag -h" output, move the documentation for the |
447 | "--column" and "--sort" options to the "Tag listing options" | |
448 | section. | |
9b22801c JH |
449 | (merge dd059c6 jk/tag-h-column-is-a-listing-option later to maint). |
450 | ||
bca18110 | 451 | * "git prune" used to largely ignore broken refs when deciding which |
6eb14013 MH |
452 | objects are still being used, which could cause reference |
453 | corruption to lead to object loss. | |
bca18110 JH |
454 | (merge ea56c4e jk/prune-with-corrupt-refs later to maint). |
455 | ||
6eb14013 | 456 | * The split-index mode introduced in v2.3.0-rc0~41 was broken in the |
bca18110 JH |
457 | codepath to protect us against a broken reimplementation of Git |
458 | that writes an invalid index with duplicated index entries, etc. | |
459 | (merge 03f15a7 tg/fix-check-order-with-split-index later to maint). | |
460 | ||
6eb14013 MH |
461 | * "git fetch", when fetching a commit using the |
462 | allow-tip-sha1-in-want extension, could have failed to fetch all of | |
463 | the requested refs. | |
bca18110 JH |
464 | (merge 32d0462 jk/fetch-pack later to maint). |
465 | ||
466 | * An failure early in the "git clone" that started creating the | |
6eb14013 MH |
467 | working tree and repository could have resulted in the failure to |
468 | clean up some directories and files. | |
bca18110 JH |
469 | (merge 16eff6c jk/cleanup-failed-clone later to maint). |
470 | ||
471 | * Recommend format-patch and send-email for those who want to submit | |
472 | patches to this project. | |
473 | (merge b25c469 jc/submitting-patches-mention-send-email later to maint). | |
474 | ||
6eb14013 | 475 | * Do not spawn the pager when "git grep" is run with "--quiet". |
bca18110 JH |
476 | (merge c2048f0 ws/grep-quiet-no-pager later to maint). |
477 | ||
478 | * The prompt script (in contrib/) did not show the untracked sign | |
479 | when working in a subdirectory without any untracked files. | |
480 | (merge 9bdc517 ct/prompt-untracked-fix later to maint). | |
481 | ||
6eb14013 MH |
482 | * An earlier update to the URL parser broke an address that contains |
483 | a colon but an empty string for the port number, like | |
484 | ssh://example.com:/path/to/repo. | |
7c597ef3 JH |
485 | (merge 6b6c5f7 tb/connect-ipv6-parse-fix later to maint). |
486 | ||
9b22801c | 487 | * Code cleanups and documentation updates. |
9ab698f4 JH |
488 | (merge 2ce63e9 rs/simple-cleanups later to maint). |
489 | (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint). | |
490 | (merge 817d03e jc/diff-test-updates later to maint). | |
491 | (merge eb32c66 ak/t5516-typofix later to maint). | |
492 | (merge bcd57cb mr/doc-clean-f-f later to maint). | |
493 | (merge 0d6accc mg/doc-status-color-slot later to maint). | |
494 | (merge 53e53c7 sg/completion-remote later to maint). | |
495 | (merge 8fa7975 ak/git-done-help-cleanup later to maint). | |
496 | (merge 9a6f128 rs/deflate-init-cleanup later to maint). | |
e80e85a5 | 497 | (merge 6f75d45 rs/use-isxdigit later to maint). |
9b22801c | 498 | (merge 376e4b3 jk/test-annoyances later to maint). |
bca18110 JH |
499 | (merge 7032054 nd/doc-git-index-version later to maint). |
500 | (merge e869c5e tg/test-index-v4 later to maint). | |
501 | (merge 599d223 jk/simplify-csum-file-sha1fd-check later to maint). | |
2dfb2e07 JH |
502 | (merge 260d585 sg/completion-gitcomp-nl-for-refs later to maint). |
503 | (merge 777c55a jc/report-path-error-to-dir later to maint). | |
9e4ab3a4 | 504 | (merge fddfaf8 ph/push-doc-cas later to maint). |
e46fe3df JH |
505 | (merge d50d31e ss/pull-rebase-preserve later to maint). |
506 | (merge c8c3f1d pt/enter-repo-comment-fix later to maint). | |
507 | (merge d7bfb9e jz/gitweb-conf-doc-fix later to maint). | |
508 | (merge f907282 jk/cherry-pick-docfix later to maint). | |
509 | (merge d3c0811 iu/fix-parse-options-h-comment later to maint). | |
510 | (merge 6c3b2af jg/cguide-we-cannot-count later to maint). | |
511 | (merge 2b8bd44 jk/pack-corruption-post-mortem later to maint). | |
512 | (merge 9585cb8 jn/doc-fast-import-no-16-octopus-limit later to maint). | |
7c597ef3 JH |
513 | (merge 5dcd1b1 ps/grep-help-all-callback-arg later to maint). |
514 | (merge f1f4c84 va/fix-git-p4-tests later to maint). |