1Git 2.9 Release Notes 2===================== 3 4Backward compatibility note 5--------------------------- 6 7The end-user facing Porcelain level commands in the "git diff" and 8"git log" by default enables the rename detection; you can still use 9"diff.renames" configuration variable to disable this. 10 11Merging two branches that have no common ancestor with "git merge" is 12by default forbidden now to prevent creating such an unusual merge by 13mistake. 14 15The output formats of "git log" that indents the commit log message by 164 spaces now expands HT in the log message by default. You can use 17the "--no-expand-tabs" option to disable this. 18 19 20Updates since v2.8 21------------------ 22 23UI, Workflows & Features 24 25 * The end-user facing Porcelain level commands like "diff" and "log" 26 now enables the rename detection by default. 27 28 * The credential.helper configuration variable is cumulative and 29 there is no good way to override it from the command line. As 30 a special case, giving an empty string as its value now serves 31 as the signal to clear the values specified in various files. 32 33 * A new "interactive.diffFilter" configuration can be used to 34 customize the diff shown in "git add -i" session. 35 36 * "git p4" now allows P4 author names to be mapped to Git author 37 names. 38 39 * "git rebase -x" can be used without passing "-i" option. 40 41 * "git -c credential.<var>=<value> submodule" can now be used to 42 propagate configuration variables related to credential helper 43 down to the submodules. 44 45 * "git tag" can create an annotated tag without explicitly given an 46 "-a" (or "-s") option (i.e. when a tag message is given). A new 47 configuration variable, tag.forceSignAnnotated, can be used to tell 48 the command to create signed tag in such a situation. 49 50 * "git merge" used to allow merging two branches that have no common 51 base by default, which led to a brand new history of an existing 52 project created and then get pulled by an unsuspecting maintainer, 53 which allowed an unnecessary parallel history merged into the 54 existing project. The command has been taught not to allow this by 55 default, with an escape hatch "--allow-unrelated-histories" option 56 to be used in a rare event that merges histories of two projects 57 that started their lives independently. 58 59 * "git pull" has been taught to pass --allow-unrelated-histories 60 option to underlying "git merge". 61 62 * "git apply -v" learned to report paths in the patch that were 63 skipped via --include/--exclude mechanism or being outside the 64 current working directory. 65 66 * Shell completion (in contrib/) updates. 67 68 * The commit object name reported when "rebase -i" stops has been 69 shortened. 70 71 * "git worktree add" can be given "--no-checkout" option to only 72 create an empty worktree without checking out the files. 73 74 * "git mergetools" learned to drive ExamDiff. 75 76 * "git pull --rebase" learned "--[no-]autostash" option, so that 77 the rebase.autostash configuration variable set to true can be 78 overridden from the command line. 79 80 * When "git log" shows the log message indented by 4-spaces, the 81 remainder of a line after a HT does not align in the way the author 82 originally intended. The command now expands tabs by default in 83 such a case, and allows the users to override it with a new option, 84 "--no-expand-tabs". 85 86 * "git send-email" now uses a more readable timestamps when 87 formulating a message ID. 88 (merge f916ab0 ew/send-email-readable-message-id later to maint). 89 90 * "git rerere" can encounter two or more files with the same conflict 91 signature that have to be resolved in different ways, but there was 92 no way to record these separate resolutions. 93 (merge 890fca8 jc/rerere-multi later to maint). 94 95 96Performance, Internal Implementation, Development Support etc. 97 98 * The embedded args argv-array in the child process is used to build 99 the command line to run pack-objects instead of using a separate 100 array of strings. 101 (merge 65a3629 mp/upload-pack-use-embedded-args later to maint). 102 103 * A test for tags has been restructured so that more parts of it can 104 easily be run on a platform without a working GnuPG. 105 106 * The startup_info data, which records if we are working inside a 107 repository (among other things), are now uniformly available to Git 108 subcommand implementations, and Git avoids attempting to touch 109 references when we are not in a repository. 110 (merge 11e6b3f jk/startup-info later to maint). 111 112 * The command line argument parser for "receive-pack" has been 113 rewritten to use parse-options. 114 115 * A major part of "git submodule update" has been ported to C to take 116 advantage of the recently added framework to run download tasks in 117 parallel. 118 119 * Rename bunch of tests on "git clone" for better organization. 120 (merge 8fbb03a sb/clone-t57-t56 later to maint). 121 122 * The tests that involve running httpd leaked the system-wide 123 configuration in /etc/gitconfig to the tested environment. 124 (merge 1fad503 jk/test-httpd-config-nosystem later to maint). 125 126 * Build updates for MSVC. 127 (merge 0ef60af ss/msvc later to maint). 128 129 * The repository set-up sequence has been streamlined (the biggest 130 change is that there is no longer git_config_early()), so that we 131 do not attempt to look into refs/* when we know we do not have a 132 Git repository. 133 (merge 274db84 jk/check-repository-format later to maint). 134 135 * Code restructuring around the "refs" area to prepare for pluggable 136 refs backends. 137 138 * Sources to many test helper binaries (and the generated helpers) 139 have been moved to t/helper/ subdirectory to reduce clutter at the 140 top level of the tree. 141 142 Note that this can break your tests if you check out revisions 143 across the merge boundary of this topic, e0b58519 (Merge branch 144 'nd/test-helpers', 2016-04-29), as bin-wrappers/test-* are not 145 rebuilt to point the underlying executables. For now, "make 146 distclean" is your friend. 147 148 * Unify internal logic between "git tag -v" and "git verify-tag" 149 commands by making one directly call into the other. 150 (merge bef234b st/verify-tag later to maint). 151 152 153Also contains various documentation updates and code clean-ups. 154 155 156Fixes since v2.8 157---------------- 158 159Unless otherwise noted, all the fixes since v2.8 in the maintenance 160track are contained in this release (see the maintenance releases' 161notes for details). 162 163 * "git config --get-urlmatch", unlike other variants of the "git 164 config --get" family, did not signal error with its exit status 165 when there was no matching configuration. 166 (merge 24990b2 jk/config-get-urlmatch later to maint). 167 168 * The "--local-env-vars" and "--resolve-git-dir" options of "git 169 rev-parse" failed to work outside a repository when the command's 170 option parsing was rewritten in 1.8.5 era. 171 (merge fc7d47f jk/rev-parse-local-env-vars later to maint). 172 173 * "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work. 174 (merge 0e94242 jc/maint-index-pack-keep later to maint). 175 176 * Fetching of history by naming a commit object name directly didn't 177 work across remote-curl transport. 178 (merge 754ecb1 gf/fetch-pack-direct-object-fetch later to maint). 179 180 * A small memory leak in an error codepath has been plugged in xdiff 181 code. 182 (merge 87f1625 rj/xdiff-prepare-plug-leak-on-error-codepath later to maint). 183 184 * strbuf_getwholeline() did not NUL-terminate the buffer on certain 185 corner cases in its error codepath. 186 (merge b709043 jk/getwholeline-getdelim-empty later to maint). 187 188 * "git mergetool" did not work well with conflicts that both sides 189 deleted. 190 (merge a298604 da/mergetool-delete-delete-conflict later to maint). 191 192 * "git send-email" had trouble parsing alias file in mailrc format 193 when lines in it had trailing whitespaces on them. 194 (merge a277d1e jk/send-email-rtrim-mailrc-alias later to maint). 195 196 * When "git merge --squash" stopped due to conflict, the concluding 197 "git commit" failed to read in the SQUASH_MSG that shows the log 198 messages from all the squashed commits. 199 (merge b64c1e0 ss/commit-squash-msg later to maint). 200 201 * "git merge FETCH_HEAD" dereferenced NULL pointer when merging 202 nothing into an unborn history (which is arguably unusual usage, 203 which perhaps was the reason why nobody noticed it). 204 (merge b84e65d jv/merge-nothing-into-void later to maint). 205 206 * When "git worktree" feature is in use, "git branch -d" allowed 207 deletion of a branch that is checked out in another worktree, 208 which was wrong. 209 (merge f292244 ky/branch-d-worktree later to maint). 210 211 * When "git worktree" feature is in use, "git branch -m" renamed a 212 branch that is checked out in another worktree without adjusting 213 the HEAD symbolic ref for the worktree. 214 (merge 18eb3a9 ky/branch-m-worktree later to maint). 215 216 * "git diff -M" used to work better when two originally identical 217 files A and B got renamed to X/A and X/B by pairing A to X/A and B 218 to X/B, but this was broken in the 2.0 timeframe. 219 (merge ca4e3ca sg/diff-multiple-identical-renames later to maint). 220 221 * "git send-pack --all <there>" was broken when its command line 222 option parsing was written in the 2.6 timeframe. 223 (merge c677756 sk/send-pack-all-fix later to maint). 224 225 * "git format-patch --help" showed `-s` and `--no-patch` as if these 226 are valid options to the command. We already hide `--patch` option 227 from the documentation, because format-patch is about showing the 228 diff, and the documentation now hides these options as well. 229 (merge b73a1bc es/format-patch-doc-hide-no-patch later to maint). 230 231 * When running "git blame $path" with unnormalized data in the index 232 for the path, the data in the working tree was blamed, even though 233 "git add" would not have changed what is already in the index, due 234 to "safe crlf" that disables the line-end conversion. It has been 235 corrected. 236 (merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint). 237 238 * A change back in version 2.7 to "git branch" broke display of a 239 symbolic ref in a non-standard place in the refs/ hierarchy (we 240 expect symbolic refs to appear in refs/remotes/*/HEAD to point at 241 the primary branch the remote has, and as .git/HEAD to point at the 242 branch we locally checked out). 243 (merge 95c38fb jk/branch-shortening-funny-symrefs later to maint). 244 245 * A partial rewrite of "git submodule" in the 2.7 timeframe changed 246 the way the gitdir: pointer in the submodules point at the real 247 repository location to use absolute paths by accident. This has 248 been corrected. 249 (merge 1f15ba1 sb/submodule-helper-clone-regression-fix later to maint). 250 251 * "git commit" misbehaved in a few minor ways when an empty message 252 is given via -m '', all of which has been corrected. 253 (merge 27014cb ad/commit-have-m-option later to maint). 254 255 * Support for CRAM-MD5 authentication method in "git imap-send" did 256 not work well. 257 (merge eb94ee7 ky/imap-send later to maint). 258 259 * Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs 260 we use in imap-send, which has been adjusted for the change. 261 (merge 1245c74 ky/imap-send-openssl-1.1.0 later to maint). 262 263 * The socks5:// proxy support added back in 2.6.4 days was not aware 264 that socks5h:// proxies behave differently. 265 (merge 87f8a0b jc/http-socks5h later to maint). 266 267 * "git config" had a codepath that tried to pass a NULL to 268 printf("%s"), which nobody seems to have noticed. 269 (merge 1cae428 jk/do-not-printf-NULL later to maint). 270 271 * On Cygwin, object creation uses the "create a temporary and then 272 rename it to the final name" pattern, not "create a temporary, 273 hardlink it to the final name and then unlink the temporary" 274 pattern. 275 276 This is necessary to use Git on Windows shared directories, and is 277 already enabled for the MinGW and plain Windows builds. It also 278 has been used in Cygwin packaged versions of Git for quite a while. 279 See http://thread.gmane.org/gmane.comp.version-control.git/291853 280 (merge e53a64b ad/cygwin-wants-rename later to maint). 281 282 * "merge-octopus" strategy did not ensure that the index is clean 283 when merge begins. 284 285 * When "git merge" notices that the merge can be resolved purely at 286 the tree level (without having to merge blobs) and the resulting 287 tree happens to already exist in the object store, it forgot to 288 update the index, which lead to an inconsistent state for later 289 operations. 290 291 * "git submodule" reports the paths of submodules the command 292 recurses into, but this was incorrect when the command was not run 293 from the root level of the superproject. 294 (merge 2ab5660 sb/submodule-path-misc-bugs later to maint). 295 296 * The "user.useConfigOnly" configuration variable makes it an error 297 if users do not explicitly set user.name and user.email. However, 298 its check was not done early enough and allowed another error to 299 trigger, reporting that the default value we guessed from the 300 system setting was unusable. This was a suboptimal end-user 301 experience as we want the users to set user.name/user.email without 302 relying on the auto-detection at all. 303 (merge d3c06c1 da/user-useconfigonly later to maint). 304 305 * "git mv old new" did not adjust the path for a submodule that lives 306 as a subdirectory inside old/ directory correctly. 307 (merge a127331 sb/mv-submodule-fix later to maint). 308 309 * "git replace -e" did not honour "core.editor" configuration. 310 (merge 36b1437 js/replace-edit-use-editor-configuration later to maint). 311 312 * "git push" from a corrupt repository that attempts to push a large 313 number of refs deadlocked; the thread to relay rejection notices 314 for these ref updates blocked on writing them to the main thread, 315 after the main thread at the receiving end notices that the push 316 failed and decides not to read these notices and return a failure. 317 (merge c4b2751 jk/push-client-deadlock-fix later to maint). 318 319 * mmap emulation on Windows has been optimized and work better without 320 consuming paging store when not needed. 321 (merge d5425d1 js/win32-mmap later to maint). 322 323 * Other minor clean-ups and documentation updates 324 (merge aed7480 mm/lockfile-error-message later to maint). 325 (merge bfee614 jc/index-pack later to maint). 326 (merge f870899 ss/exc-flag-is-a-collection-of-bits later to maint). 327 (merge dde7891 pb/t7502-drop-dup later to maint). 328 (merge 3bd1b51 cc/doc-recommend-performance-trace-to-file later to maint). 329 (merge 7d5e9c9 jk/credential-cache-comment-exit later to maint). 330 (merge 16a86d4 nd/apply-doc later to maint). 331 (merge c3f6b85 pb/opt-cmdmode-doc later to maint). 332 (merge 30211fb oa/doc-diff-check later to maint). 333 (merge 01d98e8 ak/use-hashmap-iter-first-in-submodule-config later to maint). 334 (merge 8b5a3e9 kn/for-each-tag-branch later to maint). 335 (merge 9c60d9f sb/misc-cleanups later to maint). 336 (merge 7a6a44c cc/apply later to maint). 337 (merge 8e9b208 js/mingw-tests-2.8 later to maint). 338 (merge d55de70 jc/makefile-redirection-stderr later to maint). 339 (merge 4232b21 ep/trace-doc-sample-fix later to maint). 340 (merge ef8c95e ew/send-email-drop-data-dumper later to maint). 341 (merge 24041d6 jc/xstrfmt-null-with-prec-0 later to maint). 342 (merge 7bec7f5 jk/use-write-script-more later to maint).