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 * "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 44 the superproject. 45 46 47Performance, Internal Implementation, Development Support etc. 48 49 * Commands that operate on a log message and add lines to the trailer 50 blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and 51 "commit -s", have been taught to use the logic of and share the 52 code with "git interpret-trailer". 53 54 * The default Travis-CI configuration specifies newer P4 and GitLFS. 55 (merge 5f703e8f02 ls/travis-update-p4-and-lfs later to maint). 56 57 * The "fast hash" that had disastrous performance issues in some 58 corner cases has been retired from the internal diff. 59 60 * The character width table has been updated to match Unicode 9.0 61 (merge 9e6e9aefdf bb/unicode-9.0 later to maint). 62 63 * Update the procedure to generate "tags" for developer support. 64 (merge 046e4c1c09 jk/make-tags-find-sources-tweak later to maint). 65 66 67 68Also contains various documentation updates and code clean-ups. 69 70Fixes since v2.10 71----------------- 72 73Unless otherwise noted, all the fixes since v2.9 in the maintenance 74track are contained in this release (see the maintenance releases' 75notes for details). 76 77 * We often decide if a session is interactive by checking if the 78 standard I/O streams are connected to a TTY, but isatty() that 79 comes with Windows incorrectly returned true if it is used on NUL 80 (i.e. an equivalent to /dev/null). This has been fixed. 81 (merge cbb3f3c9b1 js/mingw-isatty later to maint). 82 83 * "git svn" did not work well with path components that are "0", and 84 some configuration variable it uses were not documented. 85 (merge ea9a93dcc2 ew/svn-fixes later to maint). 86 87 * "git rev-parse --symbolic" failed with a more recent notation like 88 "HEAD^-1" and "HEAD^!". 89 (merge a2e7b04c44 jk/rev-parse-symbolic-parents-fix later to maint). 90 91 * An empty directory in a working tree that can simply be nuked used 92 to interfere while merging or cherry-picking a change to create a 93 submodule directory there, which has been fixed.. 94 (merge 5423d2e700 dt/empty-submodule-in-merge later to maint). 95 96 * The code in "git push" to compute if any commit being pushed in the 97 superproject binds a commit in a submodule that hasn't been pushed 98 out was overly inefficient, making it unusable even for a small 99 project that does not have any submodule but have a reasonable 100 number of refs. 101 (merge 250ab24ab3 hv/submodule-not-yet-pushed-fix later to maint). 102 103 * "git push --dry-run --recurse-submodule=on-demand" wasn't 104 "--dry-run" in the submodules. 105 (merge 0301c821c5 bw/push-dry-run later to maint). 106 107 * The output from "git worktree list" was made in readdir() order, 108 and was unstable. 109 (merge 4df1d4d466 nd/worktree-list-fixup later to maint). 110 111 * mergetool.<tool>.trustExitCode configuration variable did not apply 112 to built-in tools, but now it does. 113 (merge 2967284456 da/mergetool-trust-exit-code later to maint). 114 115 * "git p4" LFS support was broken when LFS stores an empty blob. 116 (merge d5eb3cf5e7 ls/p4-empty-file-on-lfs later to maint). 117 118 * A corner case in merge-recursive regression that crept in 119 during 2.10 development cycle has been fixed. 120 (merge 1c25d2d8ed jc/renormalize-merge-kill-safer-crlf later to maint). 121 122 * Transport with dumb http can be fooled into following foreign URLs 123 that the end user does not intend to, especially with the server 124 side redirects and http-alternates mechanism, which can lead to 125 security issues. Tighten the redirection and make it more obvious 126 to the end user when it happens. 127 (merge cb4d2d35c4 jk/http-walker-limit-redirect-2.9 later to maint). 128 129 * Update the error messages from the dumb-http client when it fails 130 to obtain loose objects; we used to give sensible error message 131 only upon 404 but we now forbid unexpected redirects that needs to 132 be reported with something sensible. 133 (merge 3680f16f9d jk/http-walker-limit-redirect later to maint). 134 135 * When diff.renames configuration is on (and with Git 2.9 and later, 136 it is enabled by default, which made it worse), "git stash" 137 misbehaved if a file is removed and another file with a very 138 similar content is added. 139 (merge 9d4e28ead5 jk/stash-disable-renames-internally later to maint). 140 141 * "git diff --no-index" did not take "--no-abbrev" option. 142 (merge 43d1948b7b jb/diff-no-index-no-abbrev later to maint). 143 144 * "git difftool --dir-diff" had a minor regression when started from 145 a subdirectory, which has been fixed. 146 (merge 853e10c197 da/difftool-dir-diff-fix later to maint). 147 148 * "git commit --allow-empty --only" (no pathspec) with dirty index 149 ought to be an acceptable way to create a new commit that does not 150 change any paths, but it was forbidden, perhaps because nobody 151 needed it so far. 152 (merge beb635ca9c ak/commit-only-allow-empty later to maint). 153 154 * Git 2.11 had a minor regression in "merge --ff-only" that competed 155 with another process that simultanously attempted to update the 156 index. We used to explain what went wrong with an error message, 157 but the new code silently failed. The error message has been 158 resurrected. 159 160 * A pathname that begins with "//" or "\\" on Windows is special but 161 path normalization logic was unaware of it. 162 (merge 7814fbe3f1 js/normalize-path-copy-ceil later to maint). 163 164 * "git pull --rebase", when there is no new commits on our side since 165 we forked from the upstream, should be able to fast-forward without 166 invoking "git rebase", but it didn't. 167 (merge 33b842a1e9 jc/pull-rebase-ff later to maint). 168 169 * The way to specify hotkeys to "xxdiff" that is used by "git 170 mergetool" has been modernized to match recent versions of xxdiff. 171 (merge 6cf5f6cef7 da/mergetool-xxdiff-hotkey later to maint). 172 173 * Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back 174 to where cherry-pick started while picking multiple changes, when 175 the cherry-pick stopped to ask for help from the user, and the user 176 did "git reset --hard" to a different commit in order to re-attempt 177 the operation. 178 (merge ce73bb22d8 sb/sequencer-abort-safety later to maint). 179 180 * Code cleanup in shallow boundary computation. 181 (merge 649b0c316a nd/shallow-fixup later to maint). 182 183 * A recent update to receive-pack to make it easier to drop garbage 184 objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot 185 have a pathname with a colon in it (no surprise!), and this in turn 186 made it impossible to push into a repository at such a path. This 187 has been fixed by introducing a quoting mechanism used when 188 appending such a path to the colon-separated list. 189 (merge 5e74824fac jk/quote-env-path-list-component later to maint). 190 191 * The function usage_msg_opt() has been updated to say "fatal:" 192 before the custom message programs give, when they want to die 193 with a message about wrong command line options followed by the 194 standard usage string. 195 (merge 87433261a4 jk/parseopt-usage-msg-opt later to maint). 196 197 * "git index-pack --stdin" needs an access to an existing repository, 198 but "git index-pack file.pack" to generate an .idx file that 199 corresponds to a packfile does not. 200 (merge 29401e1575 jk/index-pack-wo-repo-from-stdin later to maint). 201 202 * Fix for NDEBUG builds. 203 (merge 08414938a2 jt/mailinfo-fold-in-body-headers later to maint). 204 205 * Other minor doc, test and build updates and code cleanups. 206 (merge fa6ca11105 nd/qsort-in-merge-recursive later to maint). 207 (merge fa3142c919 ak/lazy-prereq-mktemp later to maint). 208 (merge 9c48b4fb23 ls/t0021-fixup later to maint). 209 (merge 584f99c87b sb/unpack-trees-grammofix later to maint). 210 (merge 54471fdcc3 jk/readme-gmane-is-no-more later to maint). 211 (merge 9e189f1a5c sb/t3600-cleanup later to maint). 212 (merge e2c20be57c lr/doc-fix-cet later to maint). 213 (merge 47437fd3bd kh/tutorial-grammofix later to maint).