1Git 2.11 Release Notes 2====================== 3 4Updates since v2.10 5------------------- 6 7UI, Workflows & Features 8 9 * "git format-patch --cover-letter HEAD^" to format a single patch 10 with a separate cover letter now numbers the output as [PATCH 0/1] 11 and [PATCH 1/1] by default. 12 13 * An incoming "git push" that attempts to push too many bytes can now 14 be rejected by setting a new configuration variable at the receiving 15 end. 16 17 * "git nosuchcommand --help" said "No manual entry for gitnosuchcommand", 18 which was not intuitive, given that "git nosuchcommand" said "git: 19 'nosuchcommand' is not a git command". 20 21 * "git clone --resurse-submodules --reference $path $URL" is a way to 22 reduce network transfer cost by borrowing objects in an existing 23 $path repository when cloning the superproject from $URL; it 24 learned to also peek into $path for presense of corresponding 25 repositories of submodules and borrow objects from there when able. 26 27 * The "git diff --submodule={short,log}" mechanism has been enhanced 28 to allow "--submodule=diff" to show the patch between the submodule 29 commits bound to the superproject. 30 31 * Even though "git hash-objects", which is a tool to take an 32 on-filesystem data stream and put it into the Git object store, 33 allowed to perform the "outside-world-to-Git" conversions (e.g. 34 end-of-line conversions and application of the clean-filter), and 35 it had the feature on by default from very early days, its reverse 36 operation "git cat-file", which takes an object from the Git object 37 store and externalize for the consumption by the outside world, 38 lacked an equivalent mechanism to run the "Git-to-outside-world" 39 conversion. The command learned the "--filters" option to do so. 40 41 * Output from "git diff" can be made easier to read by selecting 42 which lines are common and which lines are added/deleted 43 intelligently when the lines before and after the changed section 44 are the same. A command line option is added to help with the 45 experiment to find a good heuristics. 46 47 * In some projects, it is common to use "[RFC PATCH]" as the subject 48 prefix for a patch meant for discussion rather than application. A 49 new option "--rfc" was a short-hand for "--subject-prefix=RFC PATCH" 50 to help the participants of such projects. 51 52 * "git add --chmod=+x <pathspec>" added recently only toggled the 53 executable bit for paths that are either new or modified. This has 54 been corrected to flip the executable bit for all paths that match 55 the given pathspec. 56 57 * When "git format-patch --stdout" output is placed as an in-body 58 header and it uses the RFC2822 header folding, "git am" failed to 59 put the header line back into a single logical line. The 60 underlying "git mailinfo" was taught to handle this properly. 61 62 * "gitweb" can spawn "highlight" to show blob contents with 63 (programming) language-specific syntax highlighting, but only 64 when the language is known. "highlight" can however be told 65 to make the guess itself by giving it "--force" option, which 66 has been enabled. 67 68 * "git gui" l10n to Portuguese. 69 70 * When given an abbreviated object name that is not (or more 71 realistically, "no longer") unique, we gave a fatal error 72 "ambiguous argument". This error is now accompanied by hints that 73 lists the objects that begins with the given prefix. During the 74 course of development of this new feature, numerous minor bugs were 75 uncovered and corrected, the most notable one of which is that we 76 gave "short SHA1 xxxx is ambiguous." twice without good reason. 77 78 * "git log rev^..rev" is an often-used revision range specification 79 to show what was done on a side branch merged at rev. This has 80 gained a short-hand "rev^-1". In general "rev^-$n" is the same as 81 "^rev^$n rev", i.e. what has happened on other branches while the 82 history leading to nth parent was looking the other way. 83 84 * In recent versions of cURL, GSSAPI credential delegation is 85 disabled by default due to CVE-2011-2192; introduce a configuration 86 to selectively allow enabling this. 87 (merge 26a7b23429 ps/http-gssapi-cred-delegation later to maint). 88 89 90Performance, Internal Implementation, Development Support etc. 91 92 * The delta-base-cache mechanism has been a key to the performance in 93 a repository with a tightly packed packfile, but it did not scale 94 well even with a larger value of core.deltaBaseCacheLimit. 95 96 * Enhance "git status --porcelain" output by collecting more data on 97 the state of the index and the working tree files, which may 98 further be used to teach git-prompt (in contrib/) to make fewer 99 calls to git. 100 101 * Extract a small helper out of the function that reads the authors 102 script file "git am" internally uses. 103 (merge a77598e jc/am-read-author-file later to maint). 104 105 * Lifts calls to exit(2) and die() higher in the callchain in 106 sequencer.c files so that more helper functions in it can be used 107 by callers that want to handle error conditions themselves. 108 109 * "git am" has been taught to make an internal call to "git apply"'s 110 innards without spawning the latter as a separate process. 111 112 * The ref-store abstraction was introduced to the refs API so that we 113 can plug in different backends to store references. 114 115 * The "unsigned char sha1[20]" to "struct object_id" conversion 116 continues. Notable changes in this round includes that ce->sha1, 117 i.e. the object name recorded in the cache_entry, turns into an 118 object_id. 119 120 * JGit can show a fake ref "capabilities^{}" to "git fetch" when it 121 does not advertise any refs, but "git fetch" was not prepared to 122 see such an advertisement. When the other side disconnects without 123 giving any ref advertisement, we used to say "there may not be a 124 repository at that URL", but we may have seen other advertisement 125 like "shallow" and ".have" in which case we definitely know that a 126 repository is there. The code to detect this case has also been 127 updated. 128 129 * Some codepaths in "git pack-objects" were not ready to use an 130 existing pack bitmap; now they are and as the result they have 131 become faster. 132 133 * The codepath in "git fsck" to detect malformed tree objects has 134 been updated not to die but keep going after detecting them. 135 136 * We call "qsort(array, nelem, sizeof(array[0]), fn)", and most of 137 the time third parameter is redundant. A new QSORT() macro lets us 138 omit it. 139 140 * "git pack-objects" in a repository with many packfiles used to 141 spend a lot of time looking for/at objects in them; the accesses to 142 the packfiles are now optimized by checking the most-recently-used 143 packfile first. 144 (merge c9af708b1a jk/pack-objects-optim-mru later to maint). 145 146 147Also contains various documentation updates and code clean-ups. 148 149 150Fixes since v2.10 151----------------- 152 153Unless otherwise noted, all the fixes since v2.9 in the maintenance 154track are contained in this release (see the maintenance releases' 155notes for details). 156 157 * Clarify various ways to specify the "revision ranges" in the 158 documentation. 159 160 * "diff-highlight" script (in contrib/) learned to work better with 161 "git log -p --graph" output. 162 163 * The test framework left the number of tests and success/failure 164 count in the t/test-results directory, keyed by the name of the 165 test script plus the process ID. The latter however turned out not 166 to serve any useful purpose. The process ID part of the filename 167 has been removed. 168 169 * Having a submodule whose ".git" repository is somehow corrupt 170 caused a few commands that recurse into submodules loop forever. 171 172 * "git symbolic-ref -d HEAD" happily removes the symbolic ref, but 173 the resulting repository becomes an invalid one. Teach the command 174 to forbid removal of HEAD. 175 176 * A test spawned a short-lived background process, which sometimes 177 prevented the test directory from getting removed at the end of the 178 script on some platforms. 179 180 * Update a few tests that used to use GIT_CURL_VERBOSE to use the 181 newer GIT_TRACE_CURL. 182 183 * "git pack-objects --include-tag" was taught that when we know that 184 we are sending an object C, we want a tag B that directly points at 185 C but also a tag A that points at the tag B. We used to miss the 186 intermediate tag B in some cases. 187 188 * Update Japanese translation for "git-gui". 189 190 * "git fetch http::/site/path" did not die correctly and segfaulted 191 instead. 192 193 * "git commit-tree" stopped reading commit.gpgsign configuration 194 variable that was meant for Porcelain "git commit" in Git 2.9; we 195 forgot to update "git gui" to look at the configuration to match 196 this change. 197 198 * "git add --chmod=+x" added recently lacked documentation, which has 199 been corrected. 200 201 * "git log --cherry-pick" used to include merge commits as candidates 202 to be matched up with other commits, resulting a lot of wasted time. 203 The patch-id generation logic has been updated to ignore merges to 204 avoid the wastage. 205 206 * The http transport (with curl-multi option, which is the default 207 these days) failed to remove curl-easy handle from a curlm session, 208 which led to unnecessary API failures. 209 210 * There were numerous corner cases in which the configuration files 211 are read and used or not read at all depending on the directory a 212 Git command was run, leading to inconsistent behaviour. The code 213 to set-up repository access at the beginning of a Git process has 214 been updated to fix them. 215 (merge 4d0efa1 jk/setup-sequence-update later to maint). 216 217 * "git diff -W" output needs to extend the context backward to 218 include the header line of the current function and also forward to 219 include the body of the entire current function up to the header 220 line of the next one. This process may have to merge to adjacent 221 hunks, but the code forgot to do so in some cases. 222 (merge 45d2f75 rs/xdiff-merge-overlapping-hunks-for-W-context later to maint). 223 224 * Performance tests done via "t/perf" did not use the same set of 225 build configuration if the user relied on autoconf generated 226 configuration. 227 228 * "git format-patch --base=..." feature that was recently added 229 showed the base commit information after "-- " e-mail signature 230 line, which turned out to be inconvenient. The base information 231 has been moved above the signature line. 232 233 * More i18n. 234 (merge 43073f8 va/i18n later to maint). 235 236 * Even when "git pull --rebase=preserve" (and the underlying "git 237 rebase --preserve") can complete without creating any new commit 238 (i.e. fast-forwards), it still insisted on having a usable ident 239 information (read: user.email is set correctly), which was less 240 than nice. As the underlying commands used inside "git rebase" 241 would fail with a more meaningful error message and advice text 242 when the bogus ident matters, this extra check was removed. 243 244 * "git gc --aggressive" used to limit the delta-chain length to 250, 245 which is way too deep for gaining additional space savings and is 246 detrimental for runtime performance. The limit has been reduced to 247 50. 248 249 * Documentation for individual configuration variables to control use 250 of color (like `color.grep`) said that their default value is 251 'false', instead of saying their default is taken from `color.ui`. 252 When we updated the default value for color.ui from 'false' to 253 'auto' quite a while ago, all of them broke. This has been 254 corrected. 255 256 * The pretty-format specifier "%C(auto)" used by the "log" family of 257 commands to enable coloring of the output is taught to also issue a 258 color-reset sequence to the output. 259 (merge c99ad27 rs/c-auto-resets-attributes later to maint). 260 261 * A shell script example in check-ref-format documentation has been 262 fixed. 263 264 * "git checkout <word>" does not follow the usual disambiguation 265 rules when the <word> can be both a rev and a path, to allow 266 checking out a branch 'foo' in a project that happens to have a 267 file 'foo' in the working tree without having to disambiguate. 268 This was poorly documented and the check was incorrect when the 269 command was run from a subdirectory. 270 271 * Some codepaths in "git diff" used regexec(3) on a buffer that was 272 mmap(2)ed, which may not have a terminating NUL, leading to a read 273 beyond the end of the mapped region. This was fixed by introducing 274 a regexec_buf() helper that takes a <ptr,len> pair with REG_STARTEND 275 extension. 276 (merge b7d36ff js/regexec-buf later to maint). 277 278 * The procedure to build Git on Mac OS X for Travis CI hardcoded the 279 internal directory structure we assumed HomeBrew uses, which was a 280 no-no. The procedure has been updated to ask HomeBrew things we 281 need to know to fix this. 282 283 * When "git rebase -i" is given a broken instruction, it told the 284 user to fix it with "--edit-todo", but didn't say what the step 285 after that was (i.e. "--continue"). 286 287 * Documentation around tools to import from CVS was fairly outdated. 288 289 * "git clone --recurse-submodules" lost the progress eye-candy in 290 recent update, which has been corrected. 291 292 * A low-level function verify_packfile() was meant to show errors 293 that were detected without dying itself, but under some conditions 294 it didn't and died instead, which has been fixed. 295 (merge a9445d859e jk/verify-packfile-gently later to maint). 296 297 * When "git fetch" tries to find where the history of the repository 298 it runs in has diverged from what the other side has, it has a 299 mechanism to avoid digging too deep into irrelevant side branches. 300 This however did not work well over the "smart-http" transport due 301 to a design bug, which has been fixed. 302 (merge 06b3d386e0 jt/fetch-pack-in-vain-count-with-stateless later to maint). 303 304 * In the codepath that comes up with the hostname to be used in an 305 e-mail when the user didn't tell us, we looked at ai_canonname 306 field in struct addrinfo without making sure it is not NULL first. 307 308 * "git worktree", even though it used the default_abbrev setting that 309 ought to be affected by core.abbrev configuration variable, ignored 310 the variable setting. The command has been taught to read the 311 default set of configuration variables to correct this. 312 (merge d49028e6e7 jc/worktree-config later to maint). 313 314 * "git init" tried to record core.worktree in the repository's 315 'config' file when GIT_WORK_TREE environment variable was set and 316 it was different from where GIT_DIR appears as ".git" at its top, 317 but the logic was faulty when .git is a "gitdir:" file that points 318 at the real place, causing trouble in working trees that are 319 managed by "git worktree". This has been corrected. 320 321 * Codepaths that read from an on-disk loose object were too loose in 322 validating what they are reading is a proper object file and 323 sometimes read past the data they read from the disk, which has 324 been corrected. H/t to Gustavo Grieco for reporting. 325 (merge d21f842690 jc/verify-loose-object-header later to maint). 326 327 * The original command line syntax for "git merge", which was "git 328 merge <msg> HEAD <parent>...", has been deprecated for quite some 329 time, and "git gui" was the last in-tree user of the syntax. This 330 is finally fixed, so that we can move forward with the deprecation. 331 (merge ff65e796f0 rs/git-gui-use-modern-git-merge-syntax later to maint). 332 333 * An author name, that spelled a backslash-quoted double quote in the 334 human readable part "My \"double quoted\" name", was not unquoted 335 correctly while applying a patch from a piece of e-mail. 336 (merge f357e5de31 kd/mailinfo-quoted-string later to maint). 337 338 * Doc update to clarify what "log -3 --reverse" does. 339 (merge 04be69478f pb/rev-list-reverse-with-count later to maint). 340 341 * Almost everybody uses DEFAULT_ABBREV to refer to the default 342 setting for the abbreviation, but "git blame" peeked into 343 underlying variable bypassing the macro for no good reason. 344 (merge 5293284b4d jc/blame-abbrev later to maint). 345 346 * The "graph" API used in "git log --graph" miscounted the number of 347 output columns consumed so far when drawing a padding line, which 348 has been fixed; this did not affect any existing code as nobody 349 tried to write anything after the padding on such a line, though. 350 (merge 1647793524 jk/graph-padding-fix later to maint). 351 352 * The code that parses the format parameter of for-each-ref command 353 has seen a micro-optimization. 354 (merge e94ce1394e sg/ref-filter-parse-optim later to maint). 355 356 * When we started cURL to talk to imap server when a new enough 357 version of cURL library is available, we forgot to explicitly add 358 imap(s):// before the destination. To some folks, that didn't work 359 and the library tried to make HTTP(s) requests instead. 360 (merge d2d07ab861 ak/curl-imap-send-explicit-scheme later to maint). 361 362 * The ./configure script generated from configure.ac was taught how 363 to detect support of SSL by libcurl better. 364 (merge 924b7eb1c9 dp/autoconf-curl-ssl later to maint). 365 366 * The command-line completion script (in contrib/) learned to 367 complete "git cmd ^mas<HT>" to complete the negative end of 368 reference to "git cmd ^master". 369 (merge 49416ad22a cp/completion-negative-refs later to maint). 370 371 * The existing "git fetch --depth=<n>" option was hard to use 372 correctly when making the history of an existing shallow clone 373 deeper. A new option, "--deepen=<n>", has been added to make this 374 easier to use. "git clone" also learned "--shallow-since=<date>" 375 and "--shallow-exclude=<tag>" options to make it easier to specify 376 "I am interested only in the recent N months worth of history" and 377 "Give me only the history since that version". 378 (merge cccf74e2da nd/shallow-deepen later to maint). 379 380 * It is a common mistake to say "git blame --reverse OLD path", 381 expecting that the command line is dwimmed as if asking how lines 382 in path in an old revision OLD have survived up to the current 383 commit. 384 (merge e1d09701a4 jc/blame-reverse later to maint). 385 386 * Other minor doc, test and build updates and code cleanups. 387 (merge a22ae75 rs/cocci later to maint). 388 (merge 45ccef87b3 rs/copy-array later to maint). 389 (merge 8201688ecd dt/mailinfo later to maint).