1Git 2.5 Release Notes 2===================== 3 4Updates since v2.4 5------------------ 6 7Ports 8 9 10UI, Workflows & Features 11 12 * "git p4" now detects the filetype (e.g. binary) correctly even when 13 the files are opened exclusively. 14 15 * git p4 attempts to better handle branches in Perforce. 16 17 * "git p4" learned "--changes-block-size <n>" to read the changes in 18 chunks from Perforce, instead of making one call to "p4 changes" 19 that may trigger "too many rows scanned" error from Perforce. 20 21 * "git show-branch --topics HEAD" (with no other arguments) did not 22 do anything interesting. Instead, contrast the given revision 23 against all the local branches by default. 24 25 * A replacement for contrib/workdir/git-new-workdir that does not 26 rely on symbolic links and make sharing of objects and refs safer 27 by making the borrowee and borrowers aware of each other. 28 29 * Tweak the sample "store" backend of the credential helper to honor 30 XDG configuration file locations when specified. 31 32 * A heuristic to help the "git <cmd> <revs> <pathspec>" command line 33 convention to catch mistyped paths is to make sure all the non-rev 34 parameters in the later part of the command line are names of the 35 files in the working tree, but that means "git grep $str -- \*.c" 36 must always be disambiguated with "--", because nobody sane will 37 create a file whose name literally is asterisk-dot-see. Loosen the 38 heuristic to declare that with a wildcard string the user likely 39 meant to give us a pathspec. 40 41 * "git merge FETCH_HEAD" learned that the previous "git fetch" could 42 be to create an Octopus merge, i.e. recording multiple branches 43 that are not marked as "not-for-merge"; this allows us to lose an 44 old style invocation "git merge <msg> HEAD $commits..." in the 45 implementation of "git pull" script; the old style syntax can now 46 be deprecated. 47 48 * Help us to find broken test script that splits the body part of the 49 test by mistaken use of wrong kind of quotes. 50 (merge d93d5d5 jc/test-prereq-validate later to maint). 51 52 * Developer support to automatically detect broken &&-chain in the 53 test scripts is now turned on by default. 54 (merge 92b269f jk/test-chain-lint later to maint). 55 56 * Filter scripts were run with SIGPIPE disabled on the Git side, 57 expecting that they may not read what Git feeds them to filter. 58 We however treated a filter that does not read its input fully 59 before exiting as an error. 60 61 This changes semantics, but arguably in a good way. If a filter 62 can produce its output without consuming its input using whatever 63 magic, we now let it do so, instead of diagnosing it as a 64 programming error. 65 66 * Instead of dying immediately upon failing to obtain a lock, the 67 locking (of refs etc) retries after a short while with backoff. 68 69 * Introduce http.<url>.SSLCipherList configuration variable to tweak 70 the list of cipher suite to be used with libcURL when talking with 71 https:// sites. 72 73 * "git subtree" script (in contrib/) used "echo -n" to produce 74 progress messages in a non-portable way. 75 76 * "git subtree" script (in contrib/) does not have --squash option 77 when pushing, but the documentation and help text pretended as if 78 it did. 79 80 * The Git subcommand completion (in contrib/) listed credential 81 helpers among candidates, which is not something the end user would 82 invoke interactively. 83 84 * The index file can be taught with "update-index --untracked-cache" 85 to optionally remember already seen untracked files, in order to 86 speed up "git status" in a working tree with tons of cruft. 87 88 89Performance, Internal Implementation, Development Support etc. 90 91 * "unsigned char [20]" used throughout the code to represent object 92 names are being converted into a semi-opaque "struct object_id". 93 This effort is expected to interfere with other topics in flight, 94 but hopefully will give us one extra level of abstraction in the 95 end, when completed. 96 97 * Catch a programmer mistake to feed a pointer not an array to 98 ARRAY_SIZE() macro, by using a couple of GCC extensions. 99 (merge 89c855e ep/do-not-feed-a-pointer-to-array-size later to maint). 100 101 * Some error messages in "git config" were emitted without calling 102 the usual error() facility. 103 104 * When "add--interactive" splits a hunk into two overlapping hunks 105 and then let the user choose only one, it sometimes feeds an 106 incorrect patch text to "git apply". Add tests to demonstrate 107 this. 108 109 I have a slight suspicion that this may be $gmane/87202 coming back 110 and biting us (I seem to have said "let's run with this and see 111 what happens" back then). 112 113 * More line-ending tests. 114 115 * An earlier rewrite to use strbuf_getwholeline() instead of fgets(3) 116 to read packed-refs file revealed that the former is unacceptably 117 inefficient. 118 119 * The refs API uses ref_lock struct which had its own "int fd", even 120 though the same file descriptor was in the lock struct it contains. 121 Clean-up the code to lose this redundant field. 122 123 * Add the "--allow-unknown-type" option to "cat-file" to allow 124 inspecting loose objects of an experimental or a broken type. 125 126 * Many long-running operations show progress eye-candy, even when 127 they are later backgrounded. Hide the eye-candy when the process 128 is sent to the background instead. 129 (merge 9a9a41d lm/squelch-bg-progress later to maint). 130 131 * There was a dead code that used to handle "git pull --tags" and 132 show special-cased error message, which was made irrelevant when 133 the semantics of the option changed back in Git 1.9 days. 134 (merge 19d122b pt/pull-tags-error-diag later to maint). 135 136 137Also contains various documentation updates and code clean-ups. 138 139 140Fixes since v2.4 141---------------- 142 143Unless otherwise noted, all the fixes since v2.4 in the maintenance 144track are contained in this release (see the maintenance releases' 145notes for details). 146 147 * Git 2.4 broke setting verbosity and progress levels on "git clone" 148 with native transports. 149 (merge 822f0c4 mh/clone-verbosity-fix later to maint). 150 151 * "git add -e" did not allow the user to abort the operation by 152 killing the editor. 153 (merge cb64800 jk/add-e-kill-editor later to maint). 154 155 * Memory usage of "git index-pack" has been trimmed by tens of 156 per-cent. 157 (merge c6458e6 nd/slim-index-pack-memory-usage later to maint). 158 159 * "git rev-list --objects $old --not --all" to see if everything that 160 is reachable from $old is already connected to the existing refs 161 was very inefficient. 162 (merge b6e8a3b jk/still-interesting later to maint). 163 164 * "hash-object --literally" introduced in v2.2 was not prepared to 165 take a really long object type name. 166 (merge 1427a7f jc/hash-object later to maint). 167 168 * "git rebase --quiet" was not quite quiet when there is nothing to 169 do. 170 (merge 22946a9 jk/rebase-quiet-noop later to maint). 171 172 * The completion for "log --decorate=" parameter value was incorrect. 173 (merge af16bda sg/complete-decorate-full-not-long later to maint). 174 175 * "filter-branch" corrupted commit log message that ends with an 176 incomplete line on platforms with some "sed" implementations that 177 munge such a line. Work it around by avoiding to use "sed". 178 (merge df06201 jk/filter-branch-use-of-sed-on-incomplete-line later to maint). 179 180 * "git daemon" fails to build from the source under NO_IPV6 181 configuration (regression in 2.4). 182 (merge d358f77 jc/daemon-no-ipv6-for-2.4.1 later to maint). 183 184 * Some time ago, "git blame" (incorrectly) lost the convert_to_git() 185 call when synthesizing a fake "tip" commit that represents the 186 state in the working tree, which broke folks who record the history 187 with LF line ending to make their project portable across platforms 188 while terminating lines in their working tree files with CRLF for 189 their platform. 190 (merge 4bf256d tb/blame-resurrect-convert-to-git later to maint). 191 192 * We avoid setting core.worktree when the repository location is the 193 ".git" directory directly at the top level of the working tree, but 194 the code misdetected the case in which the working tree is at the 195 root level of the filesystem (which arguably is a silly thing to 196 do, but still valid). 197 (merge 84ccad8 jk/init-core-worktree-at-root later to maint). 198 199 * "git commit --date=now" or anything that relies on approxidate lost 200 the daylight-saving-time offset. 201 (merge f6e6362 jc/epochtime-wo-tz later to maint). 202 203 * Access to objects in repositories that borrow from another one on a 204 slow NFS server unnecessarily got more expensive due to recent code 205 becoming more cautious in a naive way not to lose objects to pruning. 206 (merge ee1c6c3 jk/prune-mtime later to maint). 207 208 * The codepaths that read .gitignore and .gitattributes files have been 209 taught that these files encoded in UTF-8 may have UTF-8 BOM marker at 210 the beginning; this makes it in line with what we do for configuration 211 files already. 212 (merge 27547e5 cn/bom-in-gitignore later to maint). 213 214 * a few helper scripts in the test suite did not report errors 215 correctly. 216 (merge de248e9 ep/fix-test-lib-functions-report later to maint). 217 218 * The default $HOME/.gitconfig file created upon "git config --global" 219 that edits it had incorrectly spelled user.name and user.email 220 entries in it. 221 (merge 7e11052 oh/fix-config-default-user-name-section later to maint). 222 223 * "git cat-file bl $blob" failed to barf even though there is no 224 object type that is "bl". 225 (merge b7994af jk/type-from-string-gently later to maint). 226 227 * The usual "git diff" when seeing a file turning into a directory 228 showed a patchset to remove the file and create all files in the 229 directory, but "git diff --no-index" simply refused to work. Also, 230 when asked to compare a file and a directory, imitate POSIX "diff" 231 and compare the file with the file with the same name in the 232 directory, instead of refusing to run. 233 (merge 0615173 jc/diff-no-index-d-f later to maint). 234 235 * "git rebase -i" moved the "current" command from "todo" to "done" a 236 bit too prematurely, losing a step when a "pick" did not even start. 237 (merge 8cbc57c ph/rebase-i-redo later to maint). 238 239 * The connection initiation code for "ssh" transport tried to absorb 240 differences between the stock "ssh" and Putty-supplied "plink" and 241 its derivatives, but the logic to tell that we are using "plink" 242 variants were too loose and falsely triggered when "plink" appeared 243 anywhere in the path (e.g. "/home/me/bin/uplink/ssh"). 244 (merge baaf233 bc/connect-plink later to maint). 245 246 * "git stash pop/apply" forgot to make sure that not just the working 247 tree is clean but also the index is clean. The latter is important 248 as a stash application can conflict and the index will be used for 249 conflict resolution. 250 (merge ed178ef jk/stash-require-clean-index later to maint). 251 252 * We have prepended $GIT_EXEC_PATH and the path "git" is installed in 253 (typically "/usr/bin") to $PATH when invoking subprograms and hooks 254 for almost eternity, but the original use case the latter tried to 255 support was semi-bogus (i.e. install git to /opt/foo/git and run it 256 without having /opt/foo on $PATH), and more importantly it has 257 become less and less relevant as Git grew more mainstream (i.e. the 258 users would _want_ to have it on their $PATH). Stop prepending the 259 path in which "git" is installed to users' $PATH, as that would 260 interfere the command search order people depend on (e.g. they may 261 not like versions of programs that are unrelated to Git in /usr/bin 262 and want to override them by having different ones in /usr/local/bin 263 and have the latter directory earlier in their $PATH). 264 (merge a0b4507 jk/git-no-more-argv0-path-munging later to maint). 265 266 * core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed 267 to be overridden by repository-specific .git/info/exclude file, but 268 the order was swapped from the beginning. This belatedly fixes it. 269 (merge 099d2d8 jc/gitignore-precedence later to maint). 270 271 * After "git add -N", the path appeared in output of "git diff HEAD" 272 and "git diff --cached HEAD", leading "git status" to classify it 273 as "Changes to be committed". Such a path, however, is not yet to 274 be scheduled to be committed. "git diff" showed the change to the 275 path as modification, not as a "new file", in the header of its 276 output. 277 278 Treat such paths as "yet to be added to the index but Git already 279 know about them"; "git diff HEAD" and "git diff --cached HEAD" 280 should not talk about them, and "git diff" should show them as new 281 files yet to be added to the index. 282 (merge d95d728 nd/diff-i-t-a later to maint). 283 284 * There was a commented-out (instead of being marked to expect 285 failure) test that documented a breakage that was fixed since the 286 test was written; turn it into a proper test. 287 (merge 66d2e04 sb/t1020-cleanup later to maint). 288 289 * The "log --decorate" enhancement in Git 2.4 that shows the commit 290 at the tip of the current branch e.g. "HEAD -> master", did not 291 work with --decorate=full. 292 (merge 429ad20 mg/log-decorate-HEAD later to maint). 293 294 * The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is 295 removed at the same time as 'refs/heads/xyzzy' is added (or vice 296 versa) very well. 297 (merge c628edf mh/ref-directory-file later to maint). 298 299 * Multi-ref transaction support we merged a few releases ago 300 unnecessarily kept many file descriptors open, risking to fail with 301 resource exhaustion. This is for 2.4.x track. 302 (merge 185ce3a mh/write-refs-sooner-2.4 later to maint). 303 304 * "git bundle verify" did not diagnose extra parameters on the 305 command line. 306 (merge 7886cfa ps/bundle-verify-arg later to maint). 307 308 * Various documentation mark-up fixes to make the output more 309 consistent in general and also make AsciiDoctor (an alternative 310 formatter) happier. 311 (merge d0258b9 jk/asciidoc-markup-fix later to maint). 312 (merge ad3967a jk/stripspace-asciidoctor-fix later to maint). 313 (merge 975e382 ja/tutorial-asciidoctor-fix later to maint). 314 315 * The code to read pack-bitmap wanted to allocate a few hundred 316 pointers to a structure, but by mistake allocated and leaked memory 317 enough to hold that many actual structures. Correct the allocation 318 size and also have it on stack, as it is small enough. 319 (merge 599dc76 rs/plug-leak-in-pack-bitmaps later to maint). 320 321 * The pull.ff configuration was supposed to override the merge.ff 322 configuration, but it didn't. 323 (merge db9bb28 pt/pull-ff-vs-merge-ff later to maint). 324 325 * "git pull --log" and "git pull --no-log" worked as expected, but 326 "git pull --log=20" did not. 327 (merge 5061a44 pt/pull-log-n later to maint). 328 329 * "git rerere forget" in a repository without rerere enabled gave a 330 cryptic error message; it should be a silent no-op instead. 331 (merge 0544574 jk/rerere-forget-check-enabled later to maint). 332 333 * Code cleanups and documentation updates. 334 (merge 0269f96 mm/usage-log-l-can-take-regex later to maint). 335 (merge 64f2589 nd/t1509-chroot-test later to maint). 336 (merge f86a374 sb/test-bitmap-free-at-end later to maint). 337 (merge 05bfc7d sb/line-log-plug-pairdiff-leak later to maint). 338 (merge 846e5df pt/xdg-config-path later to maint). 339 (merge 1154aa4 jc/plug-fmt-merge-msg-leak later to maint). 340 (merge 319b678 jk/sha1-file-reduce-useless-warnings later to maint). 341 (merge 9a35c14 fg/document-commit-message-stripping later to maint). 342 (merge bbf431c ps/doc-packfile-vs-pack-file later to maint). 343 (merge 309a9e3 jk/skip-http-tests-under-no-curl later to maint). 344 (merge ccd593c dl/branch-error-message later to maint).