1Git 2.12 Release Notes 2====================== 3 4Backward compatibility notes. 5 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). 12 13 * The historical argument order "git merge <msg> HEAD <commit>..." 14 has been deprecated for quite some time, and will be removed in the 15 upcoming release. 16 17 18Updates since v2.11 19------------------- 20 21UI, Workflows & Features 22 23 * Various updates to "git p4". 24 25 * "git p4" didn't interact with the internal of .git directory 26 correctly in the modern "git-worktree"-enabled world. 27 28 * "git branch --list" and friends learned "--ignore-case" option to 29 optionally sort branches and tags case insensitively. 30 31 * In addition to %(subject), %(body), "log --pretty=format:..." 32 learned a new placeholder %(trailers). 33 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". 37 38 39Performance, Internal Implementation, Development Support etc. 40 41 * Commands that operate on a log message and add lines to the trailer 42 blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and 43 "commit -s", have been taught to use the logic of and share the 44 code with "git interpret-trailer". 45 46 * The default Travis-CI configuration specifies newer P4 and GitLFS. 47 (merge 5f703e8f02 ls/travis-update-p4-and-lfs later to maint). 48 49 * The "fast hash" that had disastrous performance issues in some 50 corner cases has been retired from the internal diff. 51 52 * The character width table has been updated to match Unicode 9.0 53 (merge 9e6e9aefdf bb/unicode-9.0 later to maint). 54 55 * Update the procedure to generate "tags" for developer support. 56 (merge 046e4c1c09 jk/make-tags-find-sources-tweak later to maint). 57 58 59 60Also contains various documentation updates and code clean-ups. 61 62Fixes since v2.10 63----------------- 64 65Unless otherwise noted, all the fixes since v2.9 in the maintenance 66track are contained in this release (see the maintenance releases' 67notes for details). 68 69 * We often decide if a session is interactive by checking if the 70 standard I/O streams are connected to a TTY, but isatty() that 71 comes with Windows incorrectly returned true if it is used on NUL 72 (i.e. an equivalent to /dev/null). This has been fixed. 73 (merge cbb3f3c9b1 js/mingw-isatty later to maint). 74 75 * "git svn" did not work well with path components that are "0", and 76 some configuration variable it uses were not documented. 77 (merge ea9a93dcc2 ew/svn-fixes later to maint). 78 79 * "git rev-parse --symbolic" failed with a more recent notation like 80 "HEAD^-1" and "HEAD^!". 81 (merge a2e7b04c44 jk/rev-parse-symbolic-parents-fix later to maint). 82 83 * An empty directory in a working tree that can simply be nuked used 84 to interfere while merging or cherry-picking a change to create a 85 submodule directory there, which has been fixed.. 86 (merge 5423d2e700 dt/empty-submodule-in-merge later to maint). 87 88 * The code in "git push" to compute if any commit being pushed in the 89 superproject binds a commit in a submodule that hasn't been pushed 90 out was overly inefficient, making it unusable even for a small 91 project that does not have any submodule but have a reasonable 92 number of refs. 93 (merge 250ab24ab3 hv/submodule-not-yet-pushed-fix later to maint). 94 95 * "git push --dry-run --recurse-submodule=on-demand" wasn't 96 "--dry-run" in the submodules. 97 (merge 0301c821c5 bw/push-dry-run later to maint). 98 99 * The output from "git worktree list" was made in readdir() order, 100 and was unstable. 101 (merge 4df1d4d466 nd/worktree-list-fixup later to maint). 102 103 * mergetool.<tool>.trustExitCode configuration variable did not apply 104 to built-in tools, but now it does. 105 (merge 2967284456 da/mergetool-trust-exit-code later to maint). 106 107 * "git p4" LFS support was broken when LFS stores an empty blob. 108 (merge d5eb3cf5e7 ls/p4-empty-file-on-lfs later to maint). 109 110 * A corner case in merge-recursive regression that crept in 111 during 2.10 development cycle has been fixed. 112 (merge 1c25d2d8ed jc/renormalize-merge-kill-safer-crlf later to maint). 113 114 * Transport with dumb http can be fooled into following foreign URLs 115 that the end user does not intend to, especially with the server 116 side redirects and http-alternates mechanism, which can lead to 117 security issues. Tighten the redirection and make it more obvious 118 to the end user when it happens. 119 (merge cb4d2d35c4 jk/http-walker-limit-redirect-2.9 later to maint). 120 121 * Update the error messages from the dumb-http client when it fails 122 to obtain loose objects; we used to give sensible error message 123 only upon 404 but we now forbid unexpected redirects that needs to 124 be reported with something sensible. 125 (merge 3680f16f9d jk/http-walker-limit-redirect later to maint). 126 127 * When diff.renames configuration is on (and with Git 2.9 and later, 128 it is enabled by default, which made it worse), "git stash" 129 misbehaved if a file is removed and another file with a very 130 similar content is added. 131 (merge 9d4e28ead5 jk/stash-disable-renames-internally later to maint). 132 133 * "git diff --no-index" did not take "--no-abbrev" option. 134 (merge 43d1948b7b jb/diff-no-index-no-abbrev later to maint). 135 136 * "git difftool --dir-diff" had a minor regression when started from 137 a subdirectory, which has been fixed. 138 (merge 853e10c197 da/difftool-dir-diff-fix later to maint). 139 140 * "git commit --allow-empty --only" (no pathspec) with dirty index 141 ought to be an acceptable way to create a new commit that does not 142 change any paths, but it was forbidden, perhaps because nobody 143 needed it so far. 144 (merge beb635ca9c ak/commit-only-allow-empty later to maint). 145 146 * Git 2.11 had a minor regression in "merge --ff-only" that competed 147 with another process that simultanously attempted to update the 148 index. We used to explain what went wrong with an error message, 149 but the new code silently failed. The error message has been 150 resurrected. 151 152 * A pathname that begins with "//" or "\\" on Windows is special but 153 path normalization logic was unaware of it. 154 (merge 7814fbe3f1 js/normalize-path-copy-ceil later to maint). 155 156 * "git pull --rebase", when there is no new commits on our side since 157 we forked from the upstream, should be able to fast-forward without 158 invoking "git rebase", but it didn't. 159 (merge 33b842a1e9 jc/pull-rebase-ff later to maint). 160 161 * The way to specify hotkeys to "xxdiff" that is used by "git 162 mergetool" has been modernized to match recent versions of xxdiff. 163 (merge 6cf5f6cef7 da/mergetool-xxdiff-hotkey later to maint). 164 165 * Other minor doc, test and build updates and code cleanups. 166 (merge fa6ca11105 nd/qsort-in-merge-recursive later to maint). 167 (merge fa3142c919 ak/lazy-prereq-mktemp later to maint). 168 (merge 9c48b4fb23 ls/t0021-fixup later to maint). 169 (merge 584f99c87b sb/unpack-trees-grammofix later to maint). 170 (merge 54471fdcc3 jk/readme-gmane-is-no-more later to maint). 171 (merge 9e189f1a5c sb/t3600-cleanup later to maint). 172 (merge e2c20be57c lr/doc-fix-cet later to maint). 173 (merge 47437fd3bd kh/tutorial-grammofix later to maint).