Merge branch 'maint'
[git/git.git] / Documentation / RelNotes / 2.7.0.txt
CommitLineData
24a00ef6
JH
1Git 2.7 Release Notes
2=====================
3
4Updates since v2.6
5------------------
6
7UI, Workflows & Features
8
9 * "git remote" learned "get-url" subcommand to show the URL for a
10 given remote name used for fetching and pushing.
11
12 * There was no way to defeat a configured rebase.autostash variable
13 from the command line, as "git rebase --no-autostash" was missing.
14
15 * "git log --date=local" used to only show the normal (default)
16 format in the local timezone. The command learned to take 'local'
17 as an instruction to use the local timezone with other formats,
18
19 * The refs used during a "git bisect" session is now per-worktree so
20 that independent bisect sessions can be done in different worktrees
21 created with "git worktree add".
22
23 * Users who are too busy to type three extra keystrokes to ask for
24 "git stash show -p" can now set stash.showPatch configuration
25 varible to true to always see the actual patch, not just the list
26 of paths affected with feel for the extent of damage via diffstat.
27
28 * "quiltimport" allows to specify the series file by honoring the
29 $QUILT_SERIES environment and also --series command line option.
30
31 * The use of 'good/bad' in "git bisect" made it confusing to use when
32 hunting for a state change that is not a regression (e.g. bugfix).
33 The command learned 'old/new' and then allows the end user to
906c32b9 34 say e.g. "bisect start --term-old=fast --term-new=slow" to find a
24a00ef6
JH
35 performance regression.
36
37 * "git interpret-trailers" can now run outside of a Git repository.
38
f5b60798
JH
39 * "git p4" learned to reencode the pathname it uses to communicate
40 with the p4 depot with a new option.
41
42 * Give progress meter to "git filter-branch".
43
44 * Allow a later "!/abc/def" to override an earlier "/abc" that
45 appears in the same .gitignore file to make it easier to express
46 "everything in /abc directory is ignored, except for ...".
47
a838ae9d
JH
48 * Teach "git p4" to send large blobs outside the repository by
49 talking to Git LFS.
50
37023ba3
JH
51 * Prepare for Git on-disk repository representation to undergo
52 backward incompatible changes by introducing a new repository
53 format version "1", with an extension mechanism.
54 (merge 067fbd4 jk/repository-extension later to maint).
55
56 * "git worktree" learned a "list" subcommand.
57
2635c2b8
JH
58 * "git clone --dissociate" learned that it can be used even when
59 "--reference" was not used at the same time.
60
c29024e5
JH
61 * "git blame" learnt to take "--first-parent" and "--reverse" at the
62 same time when it makes sense.
63
f34be46e
JH
64 * "git checkout" did not follow the usual "--[no-]progress"
65 convention and implemented only "--quiet" that is essentially
66 a superset of "--no-progress". Extend the command to support the
67 usual "--[no-]progress".
68
9ed86a5d
JH
69 * The semantics of tranfer.hideRefs configuration variable have been
70 extended to work better with the ref "namespace" feature that lets
71 you throw unrelated bunches of repositories in a single physical
72 repository and virtually serve them as separate ones.
73
74 * send-email config variables whose values are pathnames now go
75 through the ~username/ expansion.
76
77 * bash completion learnt to TAB-complete recipient addresses given
78 to send-email.
79
80 * The credential-cache daemon can be told to ignore SIGHUP to work
81 around issue when running Git from inside emacs.
82
24a00ef6
JH
83
84Performance, Internal Implementation, Development Support etc.
85
86 * The infrastructure to rewrite "git submodule" in C is being built
87 incrementally. Let's polish these early parts well enough and make
88 them graduate to 'next' and 'master', so that the more involved
89 follow-up can start cooking on a solid ground.
90
91 * Some features from "git tag -l" and "git branch -l" have been made
92 available to "git for-each-ref" so that eventually the unified
37023ba3
JH
93 implementation can be shared across all three. The version merged
94 to the 'master' branch earlier had a performance regression in "tag
95 --contains", which has since been corrected.
24a00ef6
JH
96
97 * Because "test_when_finished" in our test framework queues the
98 clean-up tasks to be done in a shell variable, it should not be
99 used inside a subshell. Add a mechanism to allow 'bash' to catch
100 such uses, and fix the ones that were found.
101 (merge 0968f12 jk/test-lint-forbid-when-finished-in-subshell later to maint).
102
103 * The debugging infrastructure for pkt-line based communication has
104 been improved to mark the side-band communication specifically.
105 (merge fd89433 jk/async-pkt-line later to maint).
106
a838ae9d
JH
107 * Update "git branch" that list existing branches, using the
108 ref-filter API that is shared with "git tag" and "git
109 for-each-ref".
110
bca92e88
JH
111 * The test for various line-ending conversions has been enhanced.
112
113 * A few test scripts around "git p4" have been improved for
114 portability.
115
116 * Many allocations that is manually counted (correctly) that are
117 followed by strcpy/sprintf have been replaced with a less error
118 prone constructs such as xstrfmt.
119
37023ba3
JH
120 * The internal stripspace() function has been moved to where it
121 logically belongs to, i.e. strbuf API, and the command line parser
122 of "git stripspace" has been updated to use the parse_options API.
123 (merge bed4452 tk/stripspace later to maint).
124
80980a1d
JH
125 * "git am" used to spawn "git mailinfo" via run_command() API once
126 per each patch, but learned to make a direct call to mailinfo()
127 instead.
128
129 * The implementation of "git mailinfo" was refactored so that a
130 mailinfo() function can be directly called from inside a process.
131
c29024e5
JH
132 * With a "debug" helper, debugging of a single "git" invocation in
133 our test scripts has become a lot easier.
134
9ed86a5d
JH
135 * The "configure" script did not test for -lpthread correctly, which
136 upset some linkers.
137
138 * Cross completed task off of subtree project's todo list.
139
140 * Test cleanups for the subtree project.
141
142 * Clean up style in an ancient test t9300.
143
144 * Work around some test flakiness with p4d.
145
146 * Fsck did not correctly detect a NUL-truncated header in a tag.
147
148 * Use a safer behavior when we hit errors verifying remote certificates.
149
150 * Speed up filter-branch for cases where we only care about rewriting
151 commits, not tree data.
152
153 * The parse-options API has been updated to make "-h" command line
154 option work more consistently in all commands.
155
156 * "git svn rebase/mkdirs" got optimized by keeping track of empty
157 directories better.
158
86c95ac5
JH
159 * Fix some racy client/server tests by treating SIGPIPE the same as a
160 normal non-zero exit.
161
162 * The necessary infrastructure to build topics using the free Travis
163 CI has been added. Developers forking from this topic (and enabling
164 Travis) can do their own builds, and we can turn on auto-builds for
165 git/git (including build-status for pull requests that people
166 open).
167
24a00ef6
JH
168
169Also contains various documentation updates and code clean-ups.
170
171
172Fixes since v2.6
173----------------
174
175Unless otherwise noted, all the fixes since v2.6 in the maintenance
176track are contained in this release (see the maintenance releases'
177notes for details).
178
179 * Very small number of options take a parameter that is optional
180 (which is not a great UI element as they can only appear at the end
181 of the command line). Add notice to documentation of each and
182 every one of them.
183 (merge 2b594bf mm/keyid-docs later to maint).
184
185 * "git blame --first-parent v1.0..v2.0" was not rejected but did not
186 limit the blame to commits on the first parent chain.
187 (merge 95a4fb0 jk/blame-first-parent later to maint).
188
189 * "git subtree" (in contrib/) now can take whitespaces in the
190 pathnames, not only in the in-tree pathname but the name of the
191 directory that the repository is in. (merge 5b6ab38
192 as/subtree-with-spaces later to maint).
193
194 * The ssh transport, just like any other transport over the network,
195 did not clear GIT_* environment variables, but it is possible to
196 use SendEnv and AcceptEnv to leak them to the remote invocation of
197 Git, which is not a good idea at all. Explicitly clear them just
198 like we do for the local transport.
199 (merge a48b409 jk/connect-clear-env later to maint).
200
201 * Correct "git p4 --detect-labels" so that it does not fail to create
202 a tag that points at a commit that is also being imported.
203 (merge b43702a ld/p4-import-labels later to maint).
204
205 * The Makefile always runs the library archiver with hardcoded "crs"
206 options, which was inconvenient for exotic platforms on which
207 people want to use programs with totally different set of command
208 line options.
209 (merge ac179b4 jw/make-arflags-customizable later to maint).
210
211 * Customization to change the behaviour with "make -w" and "make -s"
212 in our Makefile was broken when they were used together.
213 (merge ef49e05 jk/make-findstring-makeflags-fix later to maint).
214
f5b60798
JH
215 * Allocation related functions and stdio are unsafe things to call
216 inside a signal handler, and indeed killing the pager can cause
217 glibc to deadlock waiting on allocation mutex as our signal handler
218 tries to free() some data structures in wait_for_pager(). Reduce
219 these unsafe calls.
220 (merge 507d780 ti/glibc-stdio-mutex-from-signal-handler later to maint).
221
b27dacc1
JH
222 * The way how --ref/--notes to specify the notes tree reference are
223 DWIMmed was not clearly documented.
224 (merge e14c92e jk/notes-dwim-doc later to maint).
225
a838ae9d
JH
226 * "git gc" used to barf when a symbolic ref has gone dangling
227 (e.g. the branch that used to be your upstream's default when you
228 cloned from it is now gone, and you did "fetch --prune").
229 (merge 14886b4 js/gc-with-stale-symref later to maint).
230
231 * "git clone --dissociate" runs a big "git repack" process at the
232 end, and it helps to close file descriptors that are open on the
233 packs and their idx files before doing so on filesystems that
234 cannot remove a file that is still open.
235 (merge 786b150 js/clone-dissociate later to maint).
236
237 * Description of the "log.follow" configuration variable in "git log"
238 documentation is now also copied to "git config" documentation.
239 (merge fd8d07e dt/log-follow-config later to maint).
240
241 * "git rebase -i" had a minor regression recently, which stopped
242 considering a line that begins with an indented '#' in its insn
2635c2b8
JH
243 sheet not a comment. Further, the code was still too picky on
244 Windows where CRLF left by the editor is turned into a trailing CR
245 on the line read via the "read" built-in command of bash. Both of
246 these issues are now fixed.
247 (merge 39743cf gr/rebase-i-drop-warn later to maint).
a838ae9d
JH
248
249 * After "git checkout --detach", "git status" reported a fairly
250 useless "HEAD detached at HEAD", instead of saying at which exact
251 commit.
252 (merge 0eb8548 mm/detach-at-HEAD-reflog later to maint).
253
254 * When "git send-email" wanted to talk over Net::SMTP::SSL,
255 Net::Cmd::datasend() did not like to be fed too many bytes at the
256 same time and failed to send messages. Send the payload one line
257 at a time to work around the problem.
258 (merge f60c483 sa/send-email-smtp-batch-data-limit later to maint).
259
260 * When "git am" was rewritten as a built-in, it stopped paying
261 attention to user.signingkey, which was fixed.
262 (merge 434c64d pt/am-builtin later to maint).
263
264 * It was not possible to use a repository-lookalike created by "git
265 worktree add" as a local source of "git clone".
266 (merge d78db84 nd/clone-linked-checkout later to maint).
267
268 * On a case insensitive filesystems, setting GIT_WORK_TREE variable
269 using a random cases that does not agree with what the filesystem
270 thinks confused Git that it wasn't inside the working tree.
271 (merge 63ec5e1 js/icase-wt-detection later to maint).
272
273 * Performance-measurement tests did not work without an installed Git.
274 (merge 31cd128 sb/perf-without-installed-git later to maint).
275
276 * A test script for the HTTP service had a timing dependent bug,
277 which was fixed.
278 (merge 362d8b6 sb/http-flaky-test-fix later to maint).
279
280 * There were some classes of errors that "git fsck" diagnosed to its
281 standard error that did not cause it to exit with non-zero status.
282 (merge 122f76f jc/fsck-dropped-errors later to maint).
283
284 * Work around "git p4" failing when the P4 depot records the contents
285 in UTF-16 without UTF-16 BOM.
286 (merge 1f5f390 ls/p4-translation-failure later to maint).
287
288 * When "git gc --auto" is backgrounded, its diagnosis message is
289 lost. Save it to a file in $GIT_DIR and show it next time the "gc
290 --auto" is run.
291 (merge 329e6e8 nd/gc-auto-background-fix later to maint).
292
293 * The submodule code has been taught to work better with separate
294 work trees created via "git worktree add".
295 (merge 11f9dd7 mk/submodule-gitdir-path later to maint).
296
906c32b9
JH
297 * "git gc" is safe to run anytime only because it has the built-in
298 grace period to protect young objects. In order to run with no
299 grace period, the user must make sure that the repository is
300 quiescent.
301 (merge fae1a90 jc/doc-gc-prune-now later to maint).
302
303 * A recent "filter-branch --msg-filter" broke skipping of the commit
304 object header, which is fixed.
305 (merge a5a4b3f jk/filter-branch-use-of-sed-on-incomplete-line later to maint).
306
307 * The normalize_ceiling_entry() function does not muck with the end
308 of the path it accepts, and the real world callers do rely on that,
309 but a test insisted that the function drops a trailing slash.
310 (merge b2a7123 rd/test-path-utils later to maint).
311
37023ba3
JH
312 * A test for interaction between untracked cache and sparse checkout
313 added in Git 2.5 days were flaky.
314 (merge 9b680fb dt/t7063-fix-flaky-test later to maint).
315
316 * A couple of commands still showed "[options]" in their usage string
317 to note where options should come on their command line, but we
318 spell that "[<options>]" in most places these days.
319 (merge d96a031 rt/placeholder-in-usage later to maint).
320
321 * The synopsis text and the usage string of subcommands that read
322 list of things from the standard input are often shown as if they
323 only take input from a file on a filesystem, which was misleading.
324 (merge 33e8fc8 jc/usage-stdin later to maint).
325
326 * "git am -3" had a small regression where it is aborted in its error
327 handling codepath when underlying merge-recursive failed in certain
328 ways, as it assumed that the internal call to merge-recursive will
329 never die, which is not the case (yet).
330 (merge c63d4b2 jc/am-3-fallback-regression-fix later to maint).
331
80980a1d
JH
332 * The linkage order of libraries was wrong in places around libcurl.
333 (merge 7e91e8d rp/link-curl-before-ssl later to maint).
334
335 * The name-hash subsystem that is used to cope with case insensitive
336 filesystems keeps track of directories and their on-filesystem
337 cases for all the paths in the index by holding a pointer to a
338 randomly chosen cache entry that is inside the directory (for its
339 ce->ce_name component). This pointer was not updated even when the
340 cache entry was removed from the index, leading to use after free.
341 This was fixed by recording the path for each directory instead of
342 borrowing cache entries and restructuring the API somewhat.
343 (merge 41284eb dt/name-hash-dir-entry-fix later to maint).
344
2635c2b8
JH
345 * "git merge-file" tried to signal how many conflicts it found, which
346 obviously would not work well when there are too many of them.
347 (merge e34f802 jk/merge-file-exit-code later to maint).
348
349 * The error message from "git blame --contents --reverse" incorrectly
350 talked about "--contents --children".
351 (merge 9526197 mk/blame-error-message later to maint).
352
353 * "git imap-send" did not compile well with older version of cURL library.
354 (merge 71d9257 js/imap-send-curl-compilation-fix later to maint).
355
356 * Merging a branch that removes a path and another that changes the
357 mode bits on the same path should have conflicted at the path, but
358 it didn't and silently favoured the removal.
359 (merge 72fac66 jk/delete-modechange-conflict later to maint).
360
361 * "git --literal-pathspecs add -u/-A" without any command line
362 argument misbehaved ever since Git 2.0.
363 (merge 29abb33 jc/add-u-A-default-to-top later to maint).
364
c29024e5
JH
365 * "git daemon" uses "run_command()" without "finish_command()", so it
366 needs to release resources itself, which it forgot to do.
367 (merge b1b49ff rs/daemon-plug-child-leak later to maint).
368
369 * "git status --branch --short" accessed beyond the constant string
370 "HEAD", which has been corrected.
371 (merge c72b49d rs/wt-status-detached-branch-fix later to maint).
372
373 * We peek objects from submodule's object store by linking it to the
374 list of alternate object databases, but the code to do so forgot to
375 correctly initialize the list.
376 (merge 9a6e4f0 jk/initialization-fix-to-add-submodule-odb later to maint).
377
378 * The code to prepare the working tree side of temporary directory
379 for the "dir-diff" feature forgot that symbolic links need not be
380 copied (or symlinked) to the temporary area, as the code already
381 special cases and overwrites them. Besides, it was wrong to try
382 computing the object name of the target of symbolic link, which may
383 not even exist or may be a directory.
384 (merge cfe2d4b da/difftool later to maint).
f34be46e
JH
385
386 * A Range: request can be responded with a full response and when
387 asked properly libcurl knows how to strip the result down to the
388 requested range. However, we were hand-crafting a range request
389 and it did not kick in.
9ed86a5d
JH
390
391 * Having a leftover .idx file without corresponding .pack file in
392 the repository hurts performance; "git gc" learned to prune them.
393 (merge 478f34d dk/gc-idx-wo-pack later to maint).
394
395 * Apple's common crypto implementation of SHA1_Update() does not take
396 more than 4GB at a time, and we now have a compile-time workaround
397 for it.
398 (merge 001fd7a ad/sha1-update-chunked later to maint).
399
400 * Produce correct "dirty" marker for shell prompts, even when we
401 are on an orphan or an unborn branch.
402 (merge c26f70c sg/bash-prompt-dirty-orphan later to maint).
c29024e5 403
86c95ac5
JH
404 * A build without NO_IPv6 used to use gethostbyname() when guessing
405 user's hostname, instead of getaddrinfo() that is used in other
406 codepaths in such a build.
407 (merge 00bce77 ep/ident-with-getaddrinfo later to maint).
408
409 * The exit code of git-fsck didnot reflect some types of errors found
410 in packed objects, which has been corrected.
411 (merge 8c24d83 dt/fsck-verify-pack-error later to maint).
412
80980a1d 413 * Code clean-up, minor fixes etc.
24a00ef6 414 (merge 15ed07d jc/rerere later to maint).
bca92e88 415 (merge e7a7401 pt/pull-builtin later to maint).
b27dacc1
JH
416 (merge 29bc480 nd/ls-remote-does-not-have-u-option later to maint).
417 (merge be510e0 jk/asciidoctor-section-heading-markup-fix later to maint).
418 (merge 83e6bda tk/typofix-connect-unknown-proto-error later to maint).
a838ae9d
JH
419 (merge a43eb67 tk/doc-interpret-trailers-grammo later to maint).
420 (merge ba128e2 es/worktree-add-cleanup later to maint).
421 (merge 44cd91e cc/quote-comments later to maint).
906c32b9 422 (merge 147875f sb/submodule-config-parse later to maint).
37023ba3 423 (merge ae9f274 es/worktree-add later to maint).
80980a1d
JH
424 (merge 3b19dba jc/em-dash-in-doc later to maint).
425 (merge f3f38c7 jc/everyday-markup later to maint).
426 (merge 77d5f71 xf/user-manual-markup later to maint).
2635c2b8
JH
427 (merge b2af482 xf/user-manual-ff later to maint).
428 (merge e510ab8 rs/pop-commit later to maint).
429 (merge fdcdb77 js/misc-fixes later to maint).
c29024e5 430 (merge c949b00 rs/show-branch-argv-array later to maint).
86c95ac5 431 (merge 56a8aea nd/doc-check-ref-format-typo later to maint).