4 Backward compatibility notes.
6 * Use of an empty string that is used for 'everything matches' is
7 still warned and Git asks users to use a more explicit '.' for that
8 instead. The hope is that existing users will not mind this
9 change, and eventually the warning can be turned into a hard error,
10 upgrading the deprecation into removal of this (mis)feature. That
11 is not scheduled to happen in the upcoming release (yet).
13 * The historical argument order "git merge <msg> HEAD <commit>..."
14 has been deprecated for quite some time, and will be removed in the
21 UI, Workflows & Features
23 * Various updates to "git p4".
25 * "git p4" didn't interact with the internal of .git directory
26 correctly in the modern "git-worktree"-enabled world.
28 * "git branch --list" and friends learned "--ignore-case" option to
29 optionally sort branches and tags case insensitively.
31 * In addition to %(subject), %(body), "log --pretty=format:..."
32 learned a new placeholder %(trailers).
34 * "git rebase" learned "--quit" option, which allows a user to
35 remove the metadata left by an earlier "git rebase" that was
36 manually aborted without using "git rebase --abort".
38 * "git clone --reference $there --recurse-submodules $super" has been
39 taught to guess repositories usable as references for submodules of
40 $super that are embedded in $there while making a clone of the
41 superproject borrow objects from $there; extend the mechanism to
42 also allow submodules of these submodules to borrow repositories
43 embedded in these clones of the submodules embedded in the clone of
46 * Porcelain scripts written in Perl are getting internationalized.
48 * "git merge --continue" has been added as a synonym to "git commit"
49 to conclude a merge that has stopped due to conflicts.
51 * Finer-grained control of what protocols are allowed for transports
52 during clone/fetch/push have been enabled via a new configuration
55 * "git shortlog" learned "--committer" option to group commits by
56 committer, instead of author.
58 * GitLFS integration with "git p4" has been updated.
60 * The isatty() emulation for Windows has been updated to eradicate
61 the previous hack that depended on internals of (older) MSVC
64 * Some platforms no longer understand "latin-1" that is still seen in
65 the wild in e-mail headers; replace them with "iso-8859-1" that is
66 more widely known when conversion fails from/to it.
67 (merge df3755888b jc/latin-1 later to maint).
70 Performance, Internal Implementation, Development Support etc.
72 * Commands that operate on a log message and add lines to the trailer
73 blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and
74 "commit -s", have been taught to use the logic of and share the
75 code with "git interpret-trailer".
77 * The default Travis-CI configuration specifies newer P4 and GitLFS.
79 * The "fast hash" that had disastrous performance issues in some
80 corner cases has been retired from the internal diff.
82 * The character width table has been updated to match Unicode 9.0
84 * Update the procedure to generate "tags" for developer support.
85 (merge 046e4c1c09 jk/make-tags-find-sources-tweak later to maint).
87 * The codeflow of setting NOATIME and CLOEXEC on file descriptors Git
88 opens has been simplified.
89 (merge b4d065df03 jc/git-open-cloexec later to maint).
91 * "git diff" and its family had two experimental heuristics to shift
92 the contents of a hunk to make the patch easier to read. One of
93 them turns out to be better than the other, so leave only the
94 "--indent-heuristic" option and remove the other one.
95 (merge 3cde4e02ee jc/retire-compaction-heuristics later to maint).
97 * A new submodule helper "git submodule embedgitdirs" to make it
98 easier to move embedded .git/ directory for submodules in a
99 superproject to .git/modules/ (and point the latter with the former
100 that is turned into a "gitdir:" file) has been added.
103 Also contains various documentation updates and code clean-ups.
108 Unless otherwise noted, all the fixes since v2.9 in the maintenance
109 track are contained in this release (see the maintenance releases'
112 * We often decide if a session is interactive by checking if the
113 standard I/O streams are connected to a TTY, but isatty() that
114 comes with Windows incorrectly returned true if it is used on NUL
115 (i.e. an equivalent to /dev/null). This has been fixed.
117 * "git svn" did not work well with path components that are "0", and
118 some configuration variable it uses were not documented.
119 (merge ea9a93dcc2 ew/svn-fixes later to maint).
121 * "git rev-parse --symbolic" failed with a more recent notation like
122 "HEAD^-1" and "HEAD^!".
124 * An empty directory in a working tree that can simply be nuked used
125 to interfere while merging or cherry-picking a change to create a
126 submodule directory there, which has been fixed..
128 * The code in "git push" to compute if any commit being pushed in the
129 superproject binds a commit in a submodule that hasn't been pushed
130 out was overly inefficient, making it unusable even for a small
131 project that does not have any submodule but have a reasonable
134 * "git push --dry-run --recurse-submodule=on-demand" wasn't
135 "--dry-run" in the submodules.
137 * The output from "git worktree list" was made in readdir() order,
140 * mergetool.<tool>.trustExitCode configuration variable did not apply
141 to built-in tools, but now it does.
143 * "git p4" LFS support was broken when LFS stores an empty blob.
145 * A corner case in merge-recursive regression that crept in
146 during 2.10 development cycle has been fixed.
148 * Transport with dumb http can be fooled into following foreign URLs
149 that the end user does not intend to, especially with the server
150 side redirects and http-alternates mechanism, which can lead to
151 security issues. Tighten the redirection and make it more obvious
152 to the end user when it happens.
154 * Update the error messages from the dumb-http client when it fails
155 to obtain loose objects; we used to give sensible error message
156 only upon 404 but we now forbid unexpected redirects that needs to
157 be reported with something sensible.
159 * When diff.renames configuration is on (and with Git 2.9 and later,
160 it is enabled by default, which made it worse), "git stash"
161 misbehaved if a file is removed and another file with a very
162 similar content is added.
164 * "git diff --no-index" did not take "--no-abbrev" option.
166 * "git difftool --dir-diff" had a minor regression when started from
167 a subdirectory, which has been fixed.
169 * "git commit --allow-empty --only" (no pathspec) with dirty index
170 ought to be an acceptable way to create a new commit that does not
171 change any paths, but it was forbidden, perhaps because nobody
174 * Git 2.11 had a minor regression in "merge --ff-only" that competed
175 with another process that simultanously attempted to update the
176 index. We used to explain what went wrong with an error message,
177 but the new code silently failed. The error message has been
180 * A pathname that begins with "//" or "\\" on Windows is special but
181 path normalization logic was unaware of it.
183 * "git pull --rebase", when there is no new commits on our side since
184 we forked from the upstream, should be able to fast-forward without
185 invoking "git rebase", but it didn't.
187 * The way to specify hotkeys to "xxdiff" that is used by "git
188 mergetool" has been modernized to match recent versions of xxdiff.
190 * Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
191 to where cherry-pick started while picking multiple changes, when
192 the cherry-pick stopped to ask for help from the user, and the user
193 did "git reset --hard" to a different commit in order to re-attempt
196 * Code cleanup in shallow boundary computation.
198 * A recent update to receive-pack to make it easier to drop garbage
199 objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
200 have a pathname with a colon in it (no surprise!), and this in turn
201 made it impossible to push into a repository at such a path. This
202 has been fixed by introducing a quoting mechanism used when
203 appending such a path to the colon-separated list.
205 * The function usage_msg_opt() has been updated to say "fatal:"
206 before the custom message programs give, when they want to die
207 with a message about wrong command line options followed by the
208 standard usage string.
210 * "git index-pack --stdin" needs an access to an existing repository,
211 but "git index-pack file.pack" to generate an .idx file that
212 corresponds to a packfile does not.
214 * Fix for NDEBUG builds.
216 * A lazy "git push" without refspec did not internally use a fully
217 specified refspec to perform 'current', 'simple', or 'upstream'
218 push, causing unnecessary "ambiguous ref" errors.
220 * "git p4" misbehaved when swapping a directory and a symbolic link.
222 * Even though an fix was attempted in Git 2.9.3 days, but running
223 "git difftool --dir-diff" from a subdirectory never worked. This
226 * "git p4" that tracks multile p4 paths imported a single changelist
227 that touches files in these multiple paths as one commit, followed
228 by many empty commits. This has been fixed.
230 * A potential but unlikely buffer overflow in Windows port has been
233 * When the http server gives an incomplete response to a smart-http
234 rpc call, it could lead to client waiting for a full response that
235 will never come. Teach the client side to notice this condition
236 and abort the transfer.
238 * Compression setting for producing packfiles were spread across
239 three codepaths, one of which did not honor any configuration.
240 Unify these so that all of them honor core.compression and
241 pack.compression variables the same way.
242 (merge 8de7eeb54b jc/compression-config later to maint).
244 * "git fast-import" sometimes mishandled while rebalancing notes
245 tree, which has been fixed.
246 (merge 405d7f4af6 mh/fast-import-notes-fix-new later to maint).
248 * Recent update to the default abbreviation length that auto-scales
249 lacked documentation update, which has been corrected.
250 (merge 48d5014dd4 jc/abbrev-autoscale-config later to maint).
252 * Leakage of lockfiles in the config subsystem has been fixed.
253 (merge c06fa62dfc nd/config-misc-fixes later to maint).
255 * Other minor doc, test and build updates and code cleanups.
256 (merge f2627d9b19 sb/submodule-config-cleanup later to maint).
projects / thirdparty / git.git / blob