Merge branch 'jk/merge-file-exit-code'
[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
24a00ef6
JH
58
59Performance, Internal Implementation, Development Support etc.
60
61 * The infrastructure to rewrite "git submodule" in C is being built
62 incrementally. Let's polish these early parts well enough and make
63 them graduate to 'next' and 'master', so that the more involved
64 follow-up can start cooking on a solid ground.
65
66 * Some features from "git tag -l" and "git branch -l" have been made
67 available to "git for-each-ref" so that eventually the unified
37023ba3
JH
68 implementation can be shared across all three. The version merged
69 to the 'master' branch earlier had a performance regression in "tag
70 --contains", which has since been corrected.
24a00ef6
JH
71
72 * Because "test_when_finished" in our test framework queues the
73 clean-up tasks to be done in a shell variable, it should not be
74 used inside a subshell. Add a mechanism to allow 'bash' to catch
75 such uses, and fix the ones that were found.
76 (merge 0968f12 jk/test-lint-forbid-when-finished-in-subshell later to maint).
77
78 * The debugging infrastructure for pkt-line based communication has
79 been improved to mark the side-band communication specifically.
80 (merge fd89433 jk/async-pkt-line later to maint).
81
a838ae9d
JH
82 * Update "git branch" that list existing branches, using the
83 ref-filter API that is shared with "git tag" and "git
84 for-each-ref".
85
bca92e88
JH
86 * The test for various line-ending conversions has been enhanced.
87
88 * A few test scripts around "git p4" have been improved for
89 portability.
90
91 * Many allocations that is manually counted (correctly) that are
92 followed by strcpy/sprintf have been replaced with a less error
93 prone constructs such as xstrfmt.
94
37023ba3
JH
95 * The internal stripspace() function has been moved to where it
96 logically belongs to, i.e. strbuf API, and the command line parser
97 of "git stripspace" has been updated to use the parse_options API.
98 (merge bed4452 tk/stripspace later to maint).
99
80980a1d
JH
100 * "git am" used to spawn "git mailinfo" via run_command() API once
101 per each patch, but learned to make a direct call to mailinfo()
102 instead.
103
104 * The implementation of "git mailinfo" was refactored so that a
105 mailinfo() function can be directly called from inside a process.
106
24a00ef6
JH
107
108Also contains various documentation updates and code clean-ups.
109
110
111Fixes since v2.6
112----------------
113
114Unless otherwise noted, all the fixes since v2.6 in the maintenance
115track are contained in this release (see the maintenance releases'
116notes for details).
117
118 * Very small number of options take a parameter that is optional
119 (which is not a great UI element as they can only appear at the end
120 of the command line). Add notice to documentation of each and
121 every one of them.
122 (merge 2b594bf mm/keyid-docs later to maint).
123
124 * "git blame --first-parent v1.0..v2.0" was not rejected but did not
125 limit the blame to commits on the first parent chain.
126 (merge 95a4fb0 jk/blame-first-parent later to maint).
127
128 * "git subtree" (in contrib/) now can take whitespaces in the
129 pathnames, not only in the in-tree pathname but the name of the
130 directory that the repository is in. (merge 5b6ab38
131 as/subtree-with-spaces later to maint).
132
133 * The ssh transport, just like any other transport over the network,
134 did not clear GIT_* environment variables, but it is possible to
135 use SendEnv and AcceptEnv to leak them to the remote invocation of
136 Git, which is not a good idea at all. Explicitly clear them just
137 like we do for the local transport.
138 (merge a48b409 jk/connect-clear-env later to maint).
139
140 * Correct "git p4 --detect-labels" so that it does not fail to create
141 a tag that points at a commit that is also being imported.
142 (merge b43702a ld/p4-import-labels later to maint).
143
144 * The Makefile always runs the library archiver with hardcoded "crs"
145 options, which was inconvenient for exotic platforms on which
146 people want to use programs with totally different set of command
147 line options.
148 (merge ac179b4 jw/make-arflags-customizable later to maint).
149
150 * Customization to change the behaviour with "make -w" and "make -s"
151 in our Makefile was broken when they were used together.
152 (merge ef49e05 jk/make-findstring-makeflags-fix later to maint).
153
f5b60798
JH
154 * Allocation related functions and stdio are unsafe things to call
155 inside a signal handler, and indeed killing the pager can cause
156 glibc to deadlock waiting on allocation mutex as our signal handler
157 tries to free() some data structures in wait_for_pager(). Reduce
158 these unsafe calls.
159 (merge 507d780 ti/glibc-stdio-mutex-from-signal-handler later to maint).
160
b27dacc1
JH
161 * The way how --ref/--notes to specify the notes tree reference are
162 DWIMmed was not clearly documented.
163 (merge e14c92e jk/notes-dwim-doc later to maint).
164
a838ae9d
JH
165 * "git gc" used to barf when a symbolic ref has gone dangling
166 (e.g. the branch that used to be your upstream's default when you
167 cloned from it is now gone, and you did "fetch --prune").
168 (merge 14886b4 js/gc-with-stale-symref later to maint).
169
170 * "git clone --dissociate" runs a big "git repack" process at the
171 end, and it helps to close file descriptors that are open on the
172 packs and their idx files before doing so on filesystems that
173 cannot remove a file that is still open.
174 (merge 786b150 js/clone-dissociate later to maint).
175
176 * Description of the "log.follow" configuration variable in "git log"
177 documentation is now also copied to "git config" documentation.
178 (merge fd8d07e dt/log-follow-config later to maint).
179
180 * "git rebase -i" had a minor regression recently, which stopped
181 considering a line that begins with an indented '#' in its insn
182 sheet not a comment, which is now fixed.
183 (merge 1db168e gr/rebase-i-drop-warn later to maint).
184
185 * After "git checkout --detach", "git status" reported a fairly
186 useless "HEAD detached at HEAD", instead of saying at which exact
187 commit.
188 (merge 0eb8548 mm/detach-at-HEAD-reflog later to maint).
189
190 * When "git send-email" wanted to talk over Net::SMTP::SSL,
191 Net::Cmd::datasend() did not like to be fed too many bytes at the
192 same time and failed to send messages. Send the payload one line
193 at a time to work around the problem.
194 (merge f60c483 sa/send-email-smtp-batch-data-limit later to maint).
195
196 * When "git am" was rewritten as a built-in, it stopped paying
197 attention to user.signingkey, which was fixed.
198 (merge 434c64d pt/am-builtin later to maint).
199
200 * It was not possible to use a repository-lookalike created by "git
201 worktree add" as a local source of "git clone".
202 (merge d78db84 nd/clone-linked-checkout later to maint).
203
204 * On a case insensitive filesystems, setting GIT_WORK_TREE variable
205 using a random cases that does not agree with what the filesystem
206 thinks confused Git that it wasn't inside the working tree.
207 (merge 63ec5e1 js/icase-wt-detection later to maint).
208
209 * Performance-measurement tests did not work without an installed Git.
210 (merge 31cd128 sb/perf-without-installed-git later to maint).
211
212 * A test script for the HTTP service had a timing dependent bug,
213 which was fixed.
214 (merge 362d8b6 sb/http-flaky-test-fix later to maint).
215
216 * There were some classes of errors that "git fsck" diagnosed to its
217 standard error that did not cause it to exit with non-zero status.
218 (merge 122f76f jc/fsck-dropped-errors later to maint).
219
220 * Work around "git p4" failing when the P4 depot records the contents
221 in UTF-16 without UTF-16 BOM.
222 (merge 1f5f390 ls/p4-translation-failure later to maint).
223
224 * When "git gc --auto" is backgrounded, its diagnosis message is
225 lost. Save it to a file in $GIT_DIR and show it next time the "gc
226 --auto" is run.
227 (merge 329e6e8 nd/gc-auto-background-fix later to maint).
228
229 * The submodule code has been taught to work better with separate
230 work trees created via "git worktree add".
231 (merge 11f9dd7 mk/submodule-gitdir-path later to maint).
232
906c32b9
JH
233 * "git gc" is safe to run anytime only because it has the built-in
234 grace period to protect young objects. In order to run with no
235 grace period, the user must make sure that the repository is
236 quiescent.
237 (merge fae1a90 jc/doc-gc-prune-now later to maint).
238
239 * A recent "filter-branch --msg-filter" broke skipping of the commit
240 object header, which is fixed.
241 (merge a5a4b3f jk/filter-branch-use-of-sed-on-incomplete-line later to maint).
242
243 * The normalize_ceiling_entry() function does not muck with the end
244 of the path it accepts, and the real world callers do rely on that,
245 but a test insisted that the function drops a trailing slash.
246 (merge b2a7123 rd/test-path-utils later to maint).
247
37023ba3
JH
248 * A test for interaction between untracked cache and sparse checkout
249 added in Git 2.5 days were flaky.
250 (merge 9b680fb dt/t7063-fix-flaky-test later to maint).
251
252 * A couple of commands still showed "[options]" in their usage string
253 to note where options should come on their command line, but we
254 spell that "[<options>]" in most places these days.
255 (merge d96a031 rt/placeholder-in-usage later to maint).
256
257 * The synopsis text and the usage string of subcommands that read
258 list of things from the standard input are often shown as if they
259 only take input from a file on a filesystem, which was misleading.
260 (merge 33e8fc8 jc/usage-stdin later to maint).
261
262 * "git am -3" had a small regression where it is aborted in its error
263 handling codepath when underlying merge-recursive failed in certain
264 ways, as it assumed that the internal call to merge-recursive will
265 never die, which is not the case (yet).
266 (merge c63d4b2 jc/am-3-fallback-regression-fix later to maint).
267
80980a1d
JH
268 * The linkage order of libraries was wrong in places around libcurl.
269 (merge 7e91e8d rp/link-curl-before-ssl later to maint).
270
271 * The name-hash subsystem that is used to cope with case insensitive
272 filesystems keeps track of directories and their on-filesystem
273 cases for all the paths in the index by holding a pointer to a
274 randomly chosen cache entry that is inside the directory (for its
275 ce->ce_name component). This pointer was not updated even when the
276 cache entry was removed from the index, leading to use after free.
277 This was fixed by recording the path for each directory instead of
278 borrowing cache entries and restructuring the API somewhat.
279 (merge 41284eb dt/name-hash-dir-entry-fix later to maint).
280
281 * Code clean-up, minor fixes etc.
24a00ef6 282 (merge 15ed07d jc/rerere later to maint).
bca92e88 283 (merge e7a7401 pt/pull-builtin later to maint).
b27dacc1
JH
284 (merge 29bc480 nd/ls-remote-does-not-have-u-option later to maint).
285 (merge be510e0 jk/asciidoctor-section-heading-markup-fix later to maint).
286 (merge 83e6bda tk/typofix-connect-unknown-proto-error later to maint).
a838ae9d
JH
287 (merge a43eb67 tk/doc-interpret-trailers-grammo later to maint).
288 (merge ba128e2 es/worktree-add-cleanup later to maint).
289 (merge 44cd91e cc/quote-comments later to maint).
906c32b9 290 (merge 147875f sb/submodule-config-parse later to maint).
37023ba3 291 (merge ae9f274 es/worktree-add later to maint).
80980a1d
JH
292 (merge 3b19dba jc/em-dash-in-doc later to maint).
293 (merge f3f38c7 jc/everyday-markup later to maint).
294 (merge 77d5f71 xf/user-manual-markup later to maint).