4 Backward compatibility warning(s)
5 ---------------------------------
7 This release has a few changes in the user-visible output from
8 Porcelain commands. These are not meant to be parsed by scripts, but
9 the users still may want to be aware of the changes:
11 * Output from "git log --decorate" (and "%d" format specifier used in
12 the userformat "--format=<string>" parameter "git log" family of
13 command takes) used to list "HEAD" just like other tips of branch
14 names, separated with a comma in between. E.g.
16 $ git log --decorate -1 master
17 commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master)
20 This release updates the output slightly when HEAD refers to the tip
21 of a branch whose name is also shown in the output. The above is
24 $ git log --decorate -1 master
25 commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master)
28 * The phrasing "git branch" uses to describe a detached HEAD has been
29 updated to match that of "git status":
31 - When the HEAD is at the same commit as it was originally
32 detached, they now both show "detached at <commit object name>".
34 - When the HEAD has moved since it was originally detached,
35 they now both show "detached from <commit object name>".
37 Earlier "git branch" always used "from"
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)
49 * We did not check the curl library version before using
50 CURLOPT_PROXYAUTH feature that may not exist.
52 * We now detect number of CPUs on older BSD-derived systems.
54 * Portability fixes and workarounds for shell scripts have been added
55 to help BSD-derived systems.
58 UI, Workflows & Features
60 * The command usage info strings given by "git cmd -h" and in
61 documentation have been tweaked for consistency.
63 * The "sync" subcommand of "git p4" now allows users to exclude
64 subdirectories like its "clone" subcommand does.
66 * "git log --invert-grep --grep=WIP" will show only commits that do
67 not have the string "WIP" in their messages.
69 * "git push" has been taught a "--atomic" option that makes push to
70 update more than one ref an "all-or-none" affair.
72 * Extending the "push to deploy" added in 2.3, the behaviour of "git
73 push" when updating the branch that is checked out can now be
74 tweaked by push-to-checkout hook.
76 * Using environment variable LANGUAGE and friends on the client side,
77 HTTP-based transports now send Accept-Language when making requests.
79 * "git send-email" used to accept a mistaken "y" (or "yes") as an
80 answer to "What encoding do you want to use [UTF-8]? " without
81 questioning. Now it asks for confirmation when the answer looks
82 too short to be a valid encoding name.
84 * When "git apply --whitespace=fix" fixed whitespace errors in the
85 common context lines, the command reports that it did so.
87 * "git status" now allows the "-v" to be given twice to show the
88 differences that are left in the working tree not to be committed.
90 * "git cherry-pick" used to clean-up the log message even when it is
91 merely replaying an existing commit. It now replays the message
92 verbatim unless you are editing the message of resulting commits.
94 * "git archive" can now be told to set the 'text' attribute in the
95 resulting zip archive.
97 * Output from "git log --decorate" mentions HEAD when it points at a
98 tip of an branch differently from a detached HEAD.
100 This is a potentially backward-incompatible change.
102 * "git branch" on a detached HEAD always said "(detached from xyz)",
103 even when "git status" would report "detached at xyz". The HEAD is
104 actually at xyz and haven't been moved since it was detached in
105 such a case, but the user cannot read what the current value of
106 HEAD is when "detached from" is used.
108 * "git -C '' subcmd" refused to work in the current directory, unlike
109 "cd ''" which silently behaves as a no-op.
110 (merge 6a536e2 kn/git-cd-to-empty later to maint).
112 * The versionsort.prerelease configuration variable can be used to
113 specify that v1.0-pre1 comes before v1.0.
115 * A new "push.followTags" configuration turns the "--follow-tags"
116 option on by default for the "git push" command.
118 * "git log --graph --no-walk A B..." is a conflicting request that
119 asks nonsense; no-walk tells us show discrete points in the
120 history, while graph asks to draw connections between these
121 discrete points. Forbid the combination.
123 * "git rev-list --bisect --first-parent" does not work (yet) and can
124 even cause SEGV; forbid it. "git log --bisect --first-parent"
125 would not be useful until "git bisect --first-parent" materializes,
126 so it is also forbidden for now.
129 Performance, Internal Implementation, Development Support etc.
131 * Implementation of N_() macro has been updated slightly to help us
134 * Implementation of "reflog expire" has been restructured to fit the
135 reflogs better with the recently updated ref API.
137 * The transport-helper did not give transport options such as
138 verbosity, progress, cloning, etc. to import and export based
139 helpers, like it did for fetch and push based helpers, robbing them
140 the chance to honor the wish of the end-users better.
142 * The tests that wanted to see that file becomes unreadable after
143 running "chmod a-r file", and the tests that wanted to make sure it
144 is not run as root, we used "can we write into the / directory?" as
145 a cheap substitute, but on some platforms that is not a good
146 heuristics. The tests and their prerequisites have been updated to
147 check what they really require.
148 (merge f400e51 jk/sanity later to maint).
150 * Various issues around "reflog expire", e.g. using --updateref when
151 expiring a reflog for a symbolic reference, have been corrected
154 * The strbuf API was explained between the API documentation and in
155 the header file. Move missing bits to strbuf.h so that programmers
156 can check only one place for all necessary information.
158 * The error handling functions and conventions are now documented in
161 * Optimize attribute look-up, mostly useful in "git grep" on a
162 project that does not use many attributes, by avoiding it when we
163 (should) know that the attributes are not defined in the first
166 * Typofix in comments.
167 (merge ef2956a ak/git-pm-typofix later to maint).
170 (merge 0b868f0 sb/hex-object-name-is-at-most-41-bytes-long later to maint).
171 (merge 5d30851 dp/remove-duplicated-header-inclusion later to maint).
173 * Simplify the ref transaction API around how "the ref should be
174 pointing at this object" is specified.
176 * Code in "git daemon" to parse out and hold hostnames used in
177 request interpolation has been simplified.
179 * "git push" codepath has been restructured to make it easier to add
180 new configuration bits.
182 * The run-command interface was easy to abuse and make a pipe for us
183 to read from the process, wait for the process to finish and then
184 attempt to read its output, which is a pattern that lead to a
185 deadlock. Fix such uses by introducing a helper to do this
186 correctly (i.e. we need to read first and then wait the process to
187 finish) and also add code to prevent such abuse in the run-command
190 * People often forget to chain the commands in their test together
191 with &&, leaving a failure from an earlier command in the test go
192 unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to
193 catch such a mistake more easily.
196 Also contains various documentation updates and code clean-ups.
202 Unless otherwise noted, all the fixes since v2.3 in the maintenance
203 track are contained in this release (see the maintenance releases'
206 * "git blame HEAD -- missing" failed to correctly say "HEAD" when it
207 tried to say "No such path 'missing' in HEAD".
208 (merge a46442f jk/blame-commit-label later to maint).
210 * "git rerere" (invoked internally from many mergy operations) did
211 not correctly signal errors when told to update the working tree
212 files and failed to do so for whatever reason.
213 (merge 89ea903 jn/rerere-fail-on-auto-update-failure later to maint).
215 * Setting diff.submodule to 'log' made "git format-patch" produce
217 (merge 339de50 dk/format-patch-ignore-diff-submodule later to maint).
219 * After attempting and failing a password-less authentication
220 (e.g. Kerberos), libcURL refuses to fall back to password based
221 Basic authentication without a bit of help/encouragement.
222 (merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint).
224 * The "git push" documentation made the "--repo=<there>" option
225 easily misunderstood.
226 (merge 57b92a7 mg/push-repo-option-doc later to maint).
228 * Code to read branch name from various files in .git/ directory
229 would have misbehaved if the code to write them left an empty file.
230 (merge 66ec904 jk/status-read-branch-name-fix later to maint).
232 * A misspelled conditional that is always true has been fixed.
233 (merge 94ee8e2 jk/remote-curl-an-array-in-struct-cannot-be-null later to maint).
235 * The documentation incorrectly said that C(opy) and R(ename) are the
236 only ones that can be followed by the score number in the output in
238 (merge ac1c2d9 jc/diff-format-doc later to maint).
240 * A broken pack .idx file in the receiving repository prevented the
241 dumb http transport from fetching a good copy of it from the other
243 (merge 8b9c2dd jk/dumb-http-idx-fetch-fix later to maint).
245 * The error message from "git commit", when a non-existing author
246 name was given as value to the "--author=" parameter, has been
247 reworded to avoid misunderstanding.
248 (merge 1044b1f mg/commit-author-no-match-malformed-message later to maint).
250 * "git log --help" used to show rev-list options that are irrelevant
251 to the "log" command.
252 (merge 3cab02d jc/doc-log-rev-list-options later to maint).
254 * "git apply --whitespace=fix" used to under-allocate the memory when
255 the fix resulted in a longer text than the original patch.
256 (merge 407a792 jc/apply-ws-fix-expands later to maint).
258 * The interactive "show a list and let the user choose from it"
259 interface "add -i" used showed and prompted to the user even when
260 the candidate list was empty, against which the only "choice" the
261 user could have made was to choose nothing.
262 (merge a9c4641 ak/add-i-empty-candidates later to maint).
264 * The insn sheet "git rebase -i" creates did not fully honor
265 core.abbrev settings.
266 (merge edb72d5 ks/rebase-i-abbrev later to maint).
268 * "git fetch" over a remote-helper that cannot respond to "list"
269 command could not fetch from a symbolic reference e.g. HEAD.
270 (merge 33cae54 mh/deref-symref-over-helper-transport later to maint).
272 * "git push --signed" gave an incorrectly worded error message when
273 the other side did not support the capability.
274 (merge 45917f0 jc/push-cert later to maint).
276 * We didn't format an integer that wouldn't fit in "int" but in
277 "uintmax_t" correctly.
278 (merge d306f3d jk/decimal-width-for-uintmax later to maint).
280 * Reading configuration from a blob object, when it ends with a lone
281 CR, use to confuse the configuration parser.
282 (merge 1d0655c jk/config-no-ungetc-eof later to maint).
284 * The pack bitmap support did not build with older versions of GCC.
285 (merge bd4e882 jk/pack-bitmap later to maint).
287 * The documentation wasn't clear that "remote.<nick>.pushURL" and
288 "remote.<nick>.URL" are there to name the same repository accessed
289 via different transports, not two separate repositories.
290 (merge 697f652 jc/remote-set-url-doc later to maint).
292 * Older GnuPG implementations may not correctly import the keyring
293 material we prepare for the tests to use.
294 (merge 1f985d6 ch/new-gpg-drops-rfc-1991 later to maint).
296 * The credential helper for Windows (in contrib/) used to mishandle
297 a user name with an at-sign in it.
298 (merge 13d261e av/wincred-with-at-in-username-fix later to maint).
300 * Longstanding configuration variable naming rules has been added to
302 (merge 35840a3 jc/conf-var-doc later to maint).
304 * An earlier workaround to squelch unhelpful deprecation warnings
305 from the compiler on Mac OSX unnecessarily set minimum required
306 version of the OS, which the user might want to raise (or lower)
308 (merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint).
310 * Certain older vintages of cURL give irregular output from
311 "curl-config --vernum", which confused our build system.
312 (merge 3af6792 tc/curl-vernum-output-broken-in-7.11 later to maint).
314 * In v2.2.0, we broke "git prune" that runs in a repository that
315 borrows from an alternate object store.
316 (merge b0a4264 jk/prune-mtime later to maint).
318 * "git submodule add" failed to squash "path/to/././submodule" to
320 (merge 8196e72 ps/submodule-sanitize-path-upon-add later to maint).
322 * "git merge-file" did not work correctly in a subdirectory.
323 (merge 204a8ff ab/merge-file-prefix later to maint).
325 * "git blame" died, trying to free an uninitialized piece of memory.
326 (merge e600592 es/blame-commit-info-fix later to maint).
328 * "git fast-import" used to crash when it could not close and
329 conclude the resulting packfile cleanly.
330 (merge 5e915f3 jk/fast-import-die-nicely-fix later to maint).
332 * "update-index --refresh" used to leak when an entry cannot be
333 refreshed for whatever reason.
334 (merge bc1c2ca sb/plug-leak-in-make-cache-entry later to maint).
336 * The "interpolated-path" option of "git daemon" inserted any string
337 client declared on the "host=" capability request without checking.
338 Sanitize and limit %H and %CH to a saner and a valid DNS name.
339 (merge b485373 jk/daemon-interpolate later to maint).
341 * "git daemon" looked up the hostname even when "%CH" and "%IP"
342 interpolations are not requested, which was unnecessary.
343 (merge dc8edc8 rs/daemon-interpolate later to maint).
345 * Even though we officially haven't dropped Perl 5.8 support, the
346 Getopt::Long package that came with it does not support "--no-"
347 prefix to negate a boolean option; manually add support to help
348 people with older Getopt::Long package.
349 (merge f471494 km/send-email-getopt-long-workarounds later to maint).
351 * "git apply" was not very careful about reading from, removing,
352 updating and creating paths outside the working tree (under
353 --index/--cached) or the current directory (when used as a
354 replacement for GNU patch).
355 (merge e0d201b jc/apply-beyond-symlink later to maint).
357 * A breakage to git-svn around v2.2 era that triggers premature
358 closing of FileHandle has been corrected.
359 (merge e426311 ew/svn-maint-fixes later to maint).
361 * We did not parse username followed by literal IPv6 address in SSH
362 transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
364 (merge 3f55cca tb/connect-ipv6-parse-fix later to maint).
366 * The configuration variable 'mailinfo.scissors' was hard to
367 discover in the documentation.
368 (merge afb5de7 mm/am-c-doc later to maint).
370 * The interaction between "git submodule update" and the
371 submodule.*.update configuration was not clearly documented.
372 (merge 5c31acf ms/submodule-update-config-doc later to maint).
374 * "git diff --shortstat --dirstat=changes" showed a dirstat based on
375 lines that was never asked by the end user in addition to the
376 dirstat that the user asked for.
377 (merge ab27389 mk/diff-shortstat-dirstat-fix later to maint).
379 * "git remote add" mentioned "--tags" and "--no-tags" and was not
380 clear that fetch from the remote in the future will use the default
381 behaviour when neither is given to override it.
382 (merge aaba0ab mg/doc-remote-tags-or-not later to maint).
384 * Description given by "grep -h" for its --exclude-standard option
386 (merge 77fdb8a nd/grep-exclude-standard-help-fix later to maint).
388 * "git rebase -i" recently started to include the number of
389 commits in the insn sheet to be processed, but on a platform
390 that prepends leading whitespaces to "wc -l" output, the numbers
391 are shown with extra whitespaces that aren't necessary.
392 (merge 2185d3b es/rebase-i-count-todo later to maint).
394 * The borrowed code in kwset API did not follow our usual convention
395 to use "unsigned char" to store values that range from 0-255.
396 (merge 189c860 bw/kwset-use-unsigned later to maint).
398 * A corrupt input to "git diff -M" used to cause it to segfault.
399 (merge 4d6be03 jk/diffcore-rename-duplicate later to maint).
401 * Certain builds of GPG triggered false breakages in a test.
402 (merge 3f88c1b mg/verify-commit later to maint).
404 * "git imap-send" learned to optionally talk with an IMAP server via
405 libcURL; because there is no other option when Git is built with
406 NO_OPENSSL option, use that codepath by default under such
408 (merge dcd01ea km/imap-send-libcurl-options later to maint).
410 * "git log --decorate" did not reset colors correctly around the
412 (merge 5ee8758 jc/decorate-leaky-separator-color later to maint).
414 * The code that reads from the ctags file in the completion script
415 (in contrib/) did not spell ${param/pattern/string} substitution
416 correctly, which happened to work with bash but not with zsh.
417 (merge db8d750 js/completion-ctags-pattern-substitution-fix later to maint).
419 * The transfer.hiderefs support did not quite work for smart-http
421 (merge 8ddf3ca jk/smart-http-hide-refs later to maint).
423 * "git tag -h" used to show the "--column" and "--sort" options
424 that are about listing in a wrong section.
425 (merge dd059c6 jk/tag-h-column-is-a-listing-option later to maint).
427 * "git prune" used to largely ignore broken refs when deciding which
428 objects are still being used, which could spread an existing small
429 damage and make it a larger one.
430 (merge ea56c4e jk/prune-with-corrupt-refs later to maint).
432 * The split-index mode introduced at v2.3.0-rc0~41 was broken in the
433 codepath to protect us against a broken reimplementation of Git
434 that writes an invalid index with duplicated index entries, etc.
435 (merge 03f15a7 tg/fix-check-order-with-split-index later to maint).
437 * "git fetch" that fetches a commit using the allow-tip-sha1-in-want
438 extension could have failed to fetch all the requested refs.
439 (merge 32d0462 jk/fetch-pack later to maint).
441 * An failure early in the "git clone" that started creating the
442 working tree and repository could have resulted in some directories
443 and files left without getting cleaned up.
444 (merge 16eff6c jk/cleanup-failed-clone later to maint).
446 * Recommend format-patch and send-email for those who want to submit
447 patches to this project.
448 (merge b25c469 jc/submitting-patches-mention-send-email later to maint).
450 * Even though "git grep --quiet" is run merely to ask for the exit
451 status, we spawned the pager regardless. Stop doing that.
452 (merge c2048f0 ws/grep-quiet-no-pager later to maint).
454 * The prompt script (in contrib/) did not show the untracked sign
455 when working in a subdirectory without any untracked files.
456 (merge 9bdc517 ct/prompt-untracked-fix later to maint).
458 * Code cleanups and documentation updates.
459 (merge 2ce63e9 rs/simple-cleanups later to maint).
460 (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint).
461 (merge 817d03e jc/diff-test-updates later to maint).
462 (merge eb32c66 ak/t5516-typofix later to maint).
463 (merge bcd57cb mr/doc-clean-f-f later to maint).
464 (merge 0d6accc mg/doc-status-color-slot later to maint).
465 (merge 53e53c7 sg/completion-remote later to maint).
466 (merge 8fa7975 ak/git-done-help-cleanup later to maint).
467 (merge 9a6f128 rs/deflate-init-cleanup later to maint).
468 (merge 6f75d45 rs/use-isxdigit later to maint).
469 (merge 376e4b3 jk/test-annoyances later to maint).
470 (merge 7032054 nd/doc-git-index-version later to maint).
471 (merge e869c5e tg/test-index-v4 later to maint).
472 (merge 599d223 jk/simplify-csum-file-sha1fd-check later to maint).
473 (merge 260d585 sg/completion-gitcomp-nl-for-refs later to maint).
474 (merge 777c55a jc/report-path-error-to-dir later to maint).
475 (merge fddfaf8 ph/push-doc-cas later to maint).
476 (merge 129260c ss/pull-rebase-preserve later to maint).