{"thread":{"id":"44540","subject":"[ANNOUNCE] Git v2.11.0-rc3","startedAt":"2016-11-23T23:22:14Z","lastAt":"2016-11-29T18:50:31Z","messageCount":8,"participants":["Junio C Hamano","Marc Branchaud","Johannes Sixt","Tobias Klauser"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"306400","messageId":"xmqqinrdlr3o.fsf@gitster.mtv.corp.google.com","threadId":"44540","inReplyTo":null,"subject":"[ANNOUNCE] Git v2.11.0-rc3","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-23T23:21:47Z","receivedAt":"2016-11-23T23:22:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A release candidate Git v2.11.0-rc3 is now available for testing\nat the usual places. It is comprised of 666 non-merge commits\nsince v2.10.0, contributed by 73 people, 15 of which are new faces.\n\nIt turns out that one recent fix exposed codepaths that have not\nbeen using the API correctly, resulting apparent minor regressions\nin a few programs. This hopefully final release candidate contains\nfixes to them.\n\nThe tarballs are found at:\n\n https://www.kernel.org/pub/software/scm/git/testing/\n\nThe following public repositories all have a copy of the\n'v2.11.0-rc3' tag and the 'master' branch that the tag points at:\n\n url = https://kernel.googlesource.com/pub/scm/git/git\n url = git://repo.or.cz/alt-git.git\n url = git://git.sourceforge.jp/gitroot/git-core/git.git\n url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core\n url = https://github.com/gitster/git\n\nNew contributors whose contributions weren't in v2.10.0 are as follows.\nWelcome to the Git development community!\n\n Aaron M Watson, Brandon Williams, Brian Henderson, Emily Xie,\n Gavin Lambert, Ian Kelling, Jeff Hostetler, jfbu, Mantas\n Mikulėnas, Petr Stodulka, Satoshi Yasushima, Stefan Christ,\n Vegard Nossum, yaras, and Younes Khoudli.\n\nReturning contributors who helped this release are as follows.\nThanks for your continued support.\n\n Ævar Arnfjörð Bjarmason, Alexander Shopov, Alex Henrie,\n Alex Riesen, Anders Kaseorg, Andreas Schwab, Beat Bolli, Ben\n North, brian m. carlson, Changwoo Ryu, Chris Packham, Christian\n Couder, David Aguilar, David Turner, Dennis Kaarsemaker,\n Dimitriy Ryazantcev, Elia Pinto, Eric Wong, Jacob Keller,\n Jakub Narębski, Jean-Noel Avila, Jean-Noël AVILA, Jeff King,\n Jiang Xin, Johannes Schindelin, Johannes Sixt, Jonathan Nieder,\n Jonathan Tan, Josh Triplett, Junio C Hamano, Karsten Blees, Kevin\n Daudt, Kirill Smelkov, Lars Schneider, Linus Torvalds, Matthieu\n Moy, Michael Haggerty, Michael J Gruber, Mike Ralphson, Nguyễn\n Thái Ngọc Duy, Olaf Hering, Orgad Shaneh, Patrick Steinhardt,\n Pat Thoyts, Peter Krefting, Philip Oakley, Pranit Bauva, Ralf\n Thielow, Ray Chen, René Scharfe, Ronnie Sahlberg, Stefan Beller,\n SZEDER Gábor, Thomas Gummerer, Tobias Klauser, Trần Ngọc\n Quân, Vasco Almeida, and Дилян Палаузов.\n\n----------------------------------------------------------------\n\nGit 2.11 Release Notes (draft)\n==============================\n\nBackward compatibility notes.\n\n * An empty string used as a pathspec element has always meant\n 'everything matches', but it is too easy to write a script that\n finds a path to remove in $path and run 'git rm \"$paht\"' by\n mistake (when the user meant to give \"$path\"), which ends up\n removing everything. This release starts warning about the\n use of an empty string that is used for 'everything matches' and\n asks users to use a more explicit '.' for that instead.\n\n The hope is that existing users will not mind this change, and\n eventually the warning can be turned into a hard error, upgrading\n the deprecation into removal of this (mis)feature.\n\n * The historical argument order \"git merge HEAD ...\"\n has been deprecated for quite some time, and will be removed in the\n next release (not this one).\n\n * The default abbreviation length, which has historically been 7, now\n scales as the repository grows, using the approximate number of\n objects in the repository and a bit of math around the birthday\n paradox. The logic suggests to use 12 hexdigits for the Linux\n kernel, and 9 to 10 for Git itself.\n\n\nUpdates since v2.10\n-------------------\n\nUI, Workflows & Features\n\n * Comes with new version of git-gui, now at its 0.21.0 tag.\n\n * \"git format-patch --cover-letter HEAD^\" to format a single patch\n with a separate cover letter now numbers the output as [PATCH 0/1]\n and [PATCH 1/1] by default.\n\n * An incoming \"git push\" that attempts to push too many bytes can now\n be rejected by setting a new configuration variable at the receiving\n end.\n\n * \"git nosuchcommand --help\" said \"No manual entry for gitnosuchcommand\",\n which was not intuitive, given that \"git nosuchcommand\" said \"git:\n 'nosuchcommand' is not a git command\".\n\n * \"git clone --recurse-submodules --reference $path $URL\" is a way to\n reduce network transfer cost by borrowing objects in an existing\n $path repository when cloning the superproject from $URL; it\n learned to also peek into $path for presence of corresponding\n repositories of submodules and borrow objects from there when able.\n\n * The \"git diff --submodule={short,log}\" mechanism has been enhanced\n to allow \"--submodule=diff\" to show the patch between the submodule\n commits bound to the superproject.\n\n * Even though \"git hash-objects\", which is a tool to take an\n on-filesystem data stream and put it into the Git object store,\n allowed to perform the \"outside-world-to-Git\" conversions (e.g.\n end-of-line conversions and application of the clean-filter), and\n it had the feature on by default from very early days, its reverse\n operation \"git cat-file\", which takes an object from the Git object\n store and externalize for the consumption by the outside world,\n lacked an equivalent mechanism to run the \"Git-to-outside-world\"\n conversion. The command learned the \"--filters\" option to do so.\n\n * Output from \"git diff\" can be made easier to read by selecting\n which lines are common and which lines are added/deleted\n intelligently when the lines before and after the changed section\n are the same. A command line option is added to help with the\n experiment to find a good heuristics.\n\n * In some projects, it is common to use \"[RFC PATCH]\" as the subject\n prefix for a patch meant for discussion rather than application. A\n new option \"--rfc\" is a short-hand for \"--subject-prefix=RFC PATCH\"\n to help the participants of such projects.\n\n * \"git add --chmod=+x \" added recently only toggled the\n executable bit for paths that are either new or modified. This has\n been corrected to flip the executable bit for all paths that match\n the given pathspec.\n\n * When \"git format-patch --stdout\" output is placed as an in-body\n header and it uses the RFC2822 header folding, \"git am\" failed to\n put the header line back into a single logical line. The\n underlying \"git mailinfo\" was taught to handle this properly.\n\n * \"gitweb\" can spawn \"highlight\" to show blob contents with\n (programming) language-specific syntax highlighting, but only\n when the language is known. \"highlight\" can however be told\n to make the guess itself by giving it \"--force\" option, which\n has been enabled.\n\n * \"git gui\" l10n to Portuguese.\n\n * When given an abbreviated object name that is not (or more\n realistically, \"no longer\") unique, we gave a fatal error\n \"ambiguous argument\". This error is now accompanied by a hint that\n lists the objects beginning with the given prefix. During the\n course of development of this new feature, numerous minor bugs were\n uncovered and corrected, the most notable one of which is that we\n gave \"short SHA1 xxxx is ambiguous.\" twice without good reason.\n\n * \"git log rev^..rev\" is an often-used revision range specification\n to show what was done on a side branch merged at rev. This has\n gained a short-hand \"rev^-1\". In general \"rev^-$n\" is the same as\n \"^rev^$n rev\", i.e. what has happened on other branches while the\n history leading to nth parent was looking the other way.\n\n * In recent versions of cURL, GSSAPI credential delegation is\n disabled by default due to CVE-2011-2192; introduce a configuration\n to selectively allow enabling this.\n (merge 26a7b23429 ps/http-gssapi-cred-delegation later to maint).\n\n * \"git mergetool\" learned to honor \"-O\" to control the\n order of paths to present to the end user.\n\n * \"git diff/log --ws-error-highlight=\" lacked the corresponding\n configuration variable to set it by default.\n\n * \"git ls-files\" learned \"--recurse-submodules\" option that can be\n used to get a listing of tracked files across submodules (i.e. this\n only works with \"--cached\" option, not for listing untracked or\n ignored files). This would be a useful tool to sit on the upstream\n side of a pipe that is read with xargs to work on all working tree\n files from the top-level superproject.\n\n * A new credential helper that talks via \"libsecret\" with\n implementations of XDG Secret Service API has been added to\n contrib/credential/.\n\n * The GPG verification status shown in \"%G?\" pretty format specifier\n was not rich enough to differentiate a signature made by an expired\n key, a signature made by a revoked key, etc. New output letters\n have been assigned to express them.\n\n * In addition to purely abbreviated commit object names, \"gitweb\"\n learned to turn \"git describe\" output (e.g. v2.9.3-599-g2376d31787)\n into clickable links in its output.\n\n * When new paths were added by \"git add -N\" to the index, it was\n enough to circumvent the check by \"git commit\" to refrain from\n making an empty commit without \"--allow-empty\". The same logic\n prevented \"git status\" to show such a path as \"new file\" in the\n \"Changes not staged for commit\" section.\n\n * The smudge/clean filter API expect an external process is spawned\n to filter the contents for each path that has a filter defined. A\n new type of \"process\" filter API has been added to allow the first\n request to run the filter for a path to spawn a single process, and\n all filtering need is served by this single process for multiple\n paths, reducing the process creation overhead.\n\n * The user always has to say \"stash@{$N}\" when naming a single\n element in the default location of the stash, i.e. reflogs in\n refs/stash. The \"git stash\" command learned to accept \"git stash\n apply 4\" as a short-hand for \"git stash apply stash@{4}\".\n\n\nPerformance, Internal Implementation, Development Support etc.\n\n * The delta-base-cache mechanism has been a key to the performance in\n a repository with a tightly packed packfile, but it did not scale\n well even with a larger value of core.deltaBaseCacheLimit.\n\n * Enhance \"git status --porcelain\" output by collecting more data on\n the state of the index and the working tree files, which may\n further be used to teach git-prompt (in contrib/) to make fewer\n calls to git.\n\n * Extract a small helper out of the function that reads the authors\n script file \"git am\" internally uses.\n (merge a77598e jc/am-read-author-file later to maint).\n\n * Lifts calls to exit(2) and die() higher in the callchain in\n sequencer.c files so that more helper functions in it can be used\n by callers that want to handle error conditions themselves.\n\n * \"git am\" has been taught to make an internal call to \"git apply\"'s\n innards without spawning the latter as a separate process.\n\n * The ref-store abstraction was introduced to the refs API so that we\n can plug in different backends to store references.\n\n * The \"unsigned char sha1[20]\" to \"struct object_id\" conversion\n continues. Notable changes in this round includes that ce->sha1,\n i.e. the object name recorded in the cache_entry, turns into an\n object_id.\n\n * JGit can show a fake ref \"capabilities^{}\" to \"git fetch\" when it\n does not advertise any refs, but \"git fetch\" was not prepared to\n see such an advertisement. When the other side disconnects without\n giving any ref advertisement, we used to say \"there may not be a\n repository at that URL\", but we may have seen other advertisement\n like \"shallow\" and \".have\" in which case we definitely know that a\n repository is there. The code to detect this case has also been\n updated.\n\n * Some codepaths in \"git pack-objects\" were not ready to use an\n existing pack bitmap; now they are and as the result they have\n become faster.\n\n * The codepath in \"git fsck\" to detect malformed tree objects has\n been updated not to die but keep going after detecting them.\n\n * We call \"qsort(array, nelem, sizeof(array[0]), fn)\", and most of\n the time third parameter is redundant. A new QSORT() macro lets us\n omit it.\n\n * \"git pack-objects\" in a repository with many packfiles used to\n spend a lot of time looking for/at objects in them; the accesses to\n the packfiles are now optimized by checking the most-recently-used\n packfile first.\n (merge c9af708b1a jk/pack-objects-optim-mru later to maint).\n\n * Codepaths involved in interacting alternate object store have\n been cleaned up.\n\n * In order for the receiving end of \"git push\" to inspect the\n received history and decide to reject the push, the objects sent\n from the sending end need to be made available to the hook and\n the mechanism for the connectivity check, and this was done\n traditionally by storing the objects in the receiving repository\n and letting \"git gc\" to expire it. Instead, store the newly\n received objects in a temporary area, and make them available by\n reusing the alternate object store mechanism to them only while we\n decide if we accept the check, and once we decide, either migrate\n them to the repository or purge them immediately.\n\n * The require_clean_work_tree() helper was recreated in C when \"git\n pull\" was rewritten from shell; the helper is now made available to\n other callers in preparation for upcoming \"rebase -i\" work.\n\n * \"git upload-pack\" had its code cleaned-up and performance improved\n by reducing use of timestamp-ordered commit-list, which was\n replaced with a priority queue.\n\n * \"git diff --no-index\" codepath has been updated not to try to peek\n into .git/ directory that happens to be under the current\n directory, when we know we are operating outside any repository.\n\n * Update of the sequencer codebase to make it reusable to reimplement\n \"rebase -i\" continues.\n\n * Git generally does not explicitly close file descriptors that were\n open in the parent process when spawning a child process, but most\n of the time the child does not want to access them. As Windows does\n not allow removing or renaming a file that has a file descriptor\n open, a slow-to-exit child can even break the parent process by\n holding onto them. Use O_CLOEXEC flag to open files in various\n codepaths.\n\n * Update \"interpret-trailers\" machinery and teaches it that people in\n real world write all sorts of crufts in the \"trailer\" that was\n originally designed to have the neat-o \"Mail-Header: like thing\"\n and nothing else.\n\n\nAlso contains various documentation updates and code clean-ups.\n\n\nFixes since v2.10\n-----------------\n\nUnless otherwise noted, all the fixes since v2.9 in the maintenance\ntrack are contained in this release (see the maintenance releases'\nnotes for details).\n\n * Clarify various ways to specify the \"revision ranges\" in the\n documentation.\n\n * \"diff-highlight\" script (in contrib/) learned to work better with\n \"git log -p --graph\" output.\n\n * The test framework left the number of tests and success/failure\n count in the t/test-results directory, keyed by the name of the\n test script plus the process ID. The latter however turned out not\n to serve any useful purpose. The process ID part of the filename\n has been removed.\n\n * Having a submodule whose \".git\" repository is somehow corrupt\n caused a few commands that recurse into submodules loop forever.\n\n * \"git symbolic-ref -d HEAD\" happily removes the symbolic ref, but\n the resulting repository becomes an invalid one. Teach the command\n to forbid removal of HEAD.\n\n * A test spawned a short-lived background process, which sometimes\n prevented the test directory from getting removed at the end of the\n script on some platforms.\n\n * Update a few tests that used to use GIT_CURL_VERBOSE to use the\n newer GIT_TRACE_CURL.\n\n * \"git pack-objects --include-tag\" was taught that when we know that\n we are sending an object C, we want a tag B that directly points at\n C but also a tag A that points at the tag B. We used to miss the\n intermediate tag B in some cases.\n\n * Update Japanese translation for \"git-gui\".\n\n * \"git fetch http::/site/path\" did not die correctly and segfaulted\n instead.\n\n * \"git commit-tree\" stopped reading commit.gpgsign configuration\n variable that was meant for Porcelain \"git commit\" in Git 2.9; we\n forgot to update \"git gui\" to look at the configuration to match\n this change.\n\n * \"git add --chmod=+x\" added recently lacked documentation, which has\n been corrected.\n\n * \"git log --cherry-pick\" used to include merge commits as candidates\n to be matched up with other commits, resulting a lot of wasted time.\n The patch-id generation logic has been updated to ignore merges to\n avoid the wastage.\n\n * The http transport (with curl-multi option, which is the default\n these days) failed to remove curl-easy handle from a curlm session,\n which led to unnecessary API failures.\n\n * There were numerous corner cases in which the configuration files\n are read and used or not read at all depending on the directory a\n Git command was run, leading to inconsistent behaviour. The code\n to set-up repository access at the beginning of a Git process has\n been updated to fix them.\n (merge 4d0efa1 jk/setup-sequence-update later to maint).\n\n * \"git diff -W\" output needs to extend the context backward to\n include the header line of the current function and also forward to\n include the body of the entire current function up to the header\n line of the next one. This process may have to merge two adjacent\n hunks, but the code forgot to do so in some cases.\n\n * Performance tests done via \"t/perf\" did not use the same set of\n build configuration if the user relied on autoconf generated\n configuration.\n\n * \"git format-patch --base=...\" feature that was recently added\n showed the base commit information after \"-- \" e-mail signature\n line, which turned out to be inconvenient. The base information\n has been moved above the signature line.\n\n * More i18n.\n\n * Even when \"git pull --rebase=preserve\" (and the underlying \"git\n rebase --preserve\") can complete without creating any new commit\n (i.e. fast-forwards), it still insisted on having a usable ident\n information (read: user.email is set correctly), which was less\n than nice. As the underlying commands used inside \"git rebase\"\n would fail with a more meaningful error message and advice text\n when the bogus ident matters, this extra check was removed.\n\n * \"git gc --aggressive\" used to limit the delta-chain length to 250,\n which is way too deep for gaining additional space savings and is\n detrimental for runtime performance. The limit has been reduced to\n 50.\n\n * Documentation for individual configuration variables to control use\n of color (like `color.grep`) said that their default value is\n 'false', instead of saying their default is taken from `color.ui`.\n When we updated the default value for color.ui from 'false' to\n 'auto' quite a while ago, all of them broke. This has been\n corrected.\n\n * The pretty-format specifier \"%C(auto)\" used by the \"log\" family of\n commands to enable coloring of the output is taught to also issue a\n color-reset sequence to the output.\n\n * A shell script example in check-ref-format documentation has been\n fixed.\n\n * \"git checkout \" does not follow the usual disambiguation\n rules when the can be both a rev and a path, to allow\n checking out a branch 'foo' in a project that happens to have a\n file 'foo' in the working tree without having to disambiguate.\n This was poorly documented and the check was incorrect when the\n command was run from a subdirectory.\n\n * Some codepaths in \"git diff\" used regexec(3) on a buffer that was\n mmap(2)ed, which may not have a terminating NUL, leading to a read\n beyond the end of the mapped region. This was fixed by introducing\n a regexec_buf() helper that takes a pair with REG_STARTEND\n extension.\n\n * The procedure to build Git on Mac OS X for Travis CI hardcoded the\n internal directory structure we assumed HomeBrew uses, which was a\n no-no. The procedure has been updated to ask HomeBrew things we\n need to know to fix this.\n\n * When \"git rebase -i\" is given a broken instruction, it told the\n user to fix it with \"--edit-todo\", but didn't say what the step\n after that was (i.e. \"--continue\").\n\n * Documentation around tools to import from CVS was fairly outdated.\n\n * \"git clone --recurse-submodules\" lost the progress eye-candy in\n recent update, which has been corrected.\n\n * A low-level function verify_packfile() was meant to show errors\n that were detected without dying itself, but under some conditions\n it didn't and died instead, which has been fixed.\n\n * When \"git fetch\" tries to find where the history of the repository\n it runs in has diverged from what the other side has, it has a\n mechanism to avoid digging too deep into irrelevant side branches.\n This however did not work well over the \"smart-http\" transport due\n to a design bug, which has been fixed.\n\n * In the codepath that comes up with the hostname to be used in an\n e-mail when the user didn't tell us, we looked at ai_canonname\n field in struct addrinfo without making sure it is not NULL first.\n\n * \"git worktree\", even though it used the default_abbrev setting that\n ought to be affected by core.abbrev configuration variable, ignored\n the variable setting. The command has been taught to read the\n default set of configuration variables to correct this.\n\n * \"git init\" tried to record core.worktree in the repository's\n 'config' file when GIT_WORK_TREE environment variable was set and\n it was different from where GIT_DIR appears as \".git\" at its top,\n but the logic was faulty when .git is a \"gitdir:\" file that points\n at the real place, causing trouble in working trees that are\n managed by \"git worktree\". This has been corrected.\n\n * Codepaths that read from an on-disk loose object were too loose in\n validating what they are reading is a proper object file and\n sometimes read past the data they read from the disk, which has\n been corrected. H/t to Gustavo Grieco for reporting.\n\n * The original command line syntax for \"git merge\", which was \"git\n merge HEAD ...\", has been deprecated for quite some\n time, and \"git gui\" was the last in-tree user of the syntax. This\n is finally fixed, so that we can move forward with the deprecation.\n\n * An author name, that spelled a backslash-quoted double quote in the\n human readable part \"My \\\"double quoted\\\" name\", was not unquoted\n correctly while applying a patch from a piece of e-mail.\n\n * Doc update to clarify what \"log -3 --reverse\" does.\n\n * Almost everybody uses DEFAULT_ABBREV to refer to the default\n setting for the abbreviation, but \"git blame\" peeked into\n underlying variable bypassing the macro for no good reason.\n\n * The \"graph\" API used in \"git log --graph\" miscounted the number of\n output columns consumed so far when drawing a padding line, which\n has been fixed; this did not affect any existing code as nobody\n tried to write anything after the padding on such a line, though.\n\n * The code that parses the format parameter of for-each-ref command\n has seen a micro-optimization.\n\n * When we started cURL to talk to imap server when a new enough\n version of cURL library is available, we forgot to explicitly add\n imap(s):// before the destination. To some folks, that didn't work\n and the library tried to make HTTP(s) requests instead.\n\n * The ./configure script generated from configure.ac was taught how\n to detect support of SSL by libcurl better.\n\n * The command-line completion script (in contrib/) learned to\n complete \"git cmd ^mas\" to complete the negative end of\n reference to \"git cmd ^master\".\n (merge 49416ad22a cp/completion-negative-refs later to maint).\n\n * The existing \"git fetch --depth=\" option was hard to use\n correctly when making the history of an existing shallow clone\n deeper. A new option, \"--deepen=\", has been added to make this\n easier to use. \"git clone\" also learned \"--shallow-since=\"\n and \"--shallow-exclude=\" options to make it easier to specify\n \"I am interested only in the recent N months worth of history\" and\n \"Give me only the history since that version\".\n (merge cccf74e2da nd/shallow-deepen later to maint).\n\n * It is a common mistake to say \"git blame --reverse OLD path\",\n expecting that the command line is dwimmed as if asking how lines\n in path in an old revision OLD have survived up to the current\n commit.\n (merge e1d09701a4 jc/blame-reverse later to maint).\n\n * http.emptyauth configuration is a way to allow an empty username to\n pass when attempting to authenticate using mechanisms like\n Kerberos. We took an unspecified (NULL) username and sent \":\"\n (i.e. no username, no password) to CURLOPT_USERPWD, but did not do\n the same when the username is explicitly set to an empty string.\n\n * \"git clone\" of a local repository can be done at the filesystem\n level, but the codepath did not check errors while copying and\n adjusting the file that lists alternate object stores.\n\n * Documentation for \"git commit\" was updated to clarify that \"commit\n -p \" adds to the current contents of the index to come up\n with what to commit.\n\n * A stray symbolic link in $GIT_DIR/refs/ directory could make name\n resolution loop forever, which has been corrected.\n\n * The \"submodule..path\" stored in .gitmodules is never copied\n to .git/config and such a key in .git/config has no meaning, but\n the documentation described it and submodule..url next to\n each other as if both belong to .git/config. This has been fixed.\n\n * In a worktree connected to a repository elsewhere, created via \"git\n worktree\", \"git checkout\" attempts to protect users from confusion\n by refusing to check out a branch that is already checked out in\n another worktree. However, this also prevented checking out a\n branch, which is designated as the primary branch of a bare\n reopsitory, in a worktree that is connected to the bare\n repository. The check has been corrected to allow it.\n\n * \"git rebase\" immediately after \"git clone\" failed to find the fork\n point from the upstream.\n\n * When fetching from a remote that has many tags that are irrelevant\n to branches we are following, we used to waste way too many cycles\n when checking if the object pointed at by a tag (that we are not\n going to fetch!) exists in our repository too carefully.\n\n * Protect our code from over-eager compilers.\n\n * Recent git allows submodule..branch to use a special token\n \".\" instead of the branch name; the documentation has been updated\n to describe it.\n\n * A hot-fix for a test added by a recent topic that went to both\n 'master' and 'maint' already.\n\n * \"git send-email\" attempts to pick up valid e-mails from the\n trailers, but people in real world write non-addresses there, like\n \"Cc: Stable # 4.8+\", which broke the output depending\n on the availability and vintage of Mail::Address perl module.\n (merge dcfafc5214 mm/send-email-cc-cruft-after-address later to maint).\n\n * The Travis CI configuration we ship ran the tests with --verbose\n option but this risks non-TAP output that happens to be \"ok\" to be\n misinterpreted as TAP signalling a test that passed. This resulted\n in unnecessary failure. This has been corrected by introducing a\n new mode to run our tests in the test harness to send the verbose\n output separately to the log file.\n\n * Some AsciiDoc formatter mishandles a displayed illustration with\n tabs in it. Adjust a few of them in merge-base documentation to\n work around them.\n\n * A minor regression fix for \"git submodule\" that was introduced\n when more helper functions were reimplemented in C.\n (merge 77b63ac31e sb/submodule-ignore-trailing-slash later to maint).\n\n * The code that we have used for the past 10+ years to cycle\n 4-element ring buffers turns out to be not quite portable in\n theoretical world.\n (merge bb84735c80 rs/ring-buffer-wraparound later to maint).\n\n * \"git daemon\" used fixed-length buffers to turn URL to the\n repository the client asked for into the server side directory\n path, using snprintf() to avoid overflowing these buffers, but\n allowed possibly truncated paths to the directory. This has been\n tightened to reject such a request that causes overlong path to be\n required to serve.\n (merge 6bdb0083be jk/daemon-path-ok-check-truncation later to maint).\n\n * Recent update to git-sh-setup (a library of shell functions that\n are used by our in-tree scripted Porcelain commands) included\n another shell library git-sh-i18n without specifying where it is,\n relying on the $PATH. This has been fixed to be more explicit by\n prefixing $(git --exec-path) output in front.\n (merge 1073094f30 ak/sh-setup-dot-source-i18n-fix later to maint).\n\n * Fix for a racy false-positive test failure.\n (merge fdf4f6c79b as/merge-attr-sleep later to maint).\n\n * Portability update and workaround for builds on recent Mac OS X.\n (merge a296bc0132 ls/macos-update later to maint).\n\n * Using a %(HEAD) placeholder in \"for-each-ref --format=\" option\n caused the command to segfault when on an unborn branch.\n (merge 84679d470d jc/for-each-ref-head-segfault-fix later to maint).\n\n * \"git rebase -i\" did not work well with core.commentchar\n configuration variable for two reasons, both of which have been\n fixed.\n (merge 882cd23777 js/rebase-i-commentchar-fix later to maint).\n\n * Other minor doc, test and build updates and code cleanups.\n (merge 5c238e29a8 jk/common-main later to maint).\n (merge 5a5749e45b ak/pre-receive-hook-template-modefix later to maint).\n (merge 6d834ac8f1 jk/rebase-config-insn-fmt-docfix later to maint).\n (merge de9f7fa3b0 rs/commit-pptr-simplify later to maint).\n (merge 4259d693fc sc/fmt-merge-msg-doc-markup-fix later to maint).\n (merge 28fab7b23d nd/test-helpers later to maint).\n (merge c2bb0c1d1e rs/cocci later to maint).\n (merge 3285b7badb ps/common-info-doc later to maint).\n (merge 2b090822e8 nd/worktree-lock later to maint).\n (merge 4bd488ea7c jk/create-branch-remove-unused-param later to maint).\n (merge 974e0044d6 tk/diffcore-delta-remove-unused later to maint).\n\n----------------------------------------------------------------\n\nChanges since v2.10.0 are as follows:\n\nAaron M Watson (1):\n stash: allow stashes to be referenced by index only\n\nAlex Henrie (5):\n am: put spaces around pipe in usage string\n cat-file: put spaces around pipes in usage string\n git-rebase--interactive: fix English grammar\n git-merge-octopus: do not capitalize \"octopus\"\n unpack-trees: do not capitalize \"working\"\n\nAlex Riesen (2):\n git-gui: support for $FILENAMES in tool definitions\n git-gui: ensure the file in the diff pane is in the list of selected files\n\nAlexander Shopov (2):\n git-gui i18n: Updated Bulgarian translation (565,0f,0u)\n git-gui: Mark 'All' in remote.tcl for translation\n\nAnders Kaseorg (3):\n imap-send: Tell cURL to use imap:// or imaps://\n pre-receive.sample: mark it executable\n git-sh-setup: be explicit where to dot-source git-sh-i18n from.\n\nAndreas Schwab (2):\n t6026-merge-attr: don't fail if sleep exits early\n t6026-merge-attr: ensure that the merge driver was called\n\nBeat Bolli (1):\n SubmittingPatches: use gitk's \"Copy commit summary\" format\n\nBen North (1):\n git-worktree.txt: fix typo \"to\"/\"two\", and add comma\n\nBrandon Williams (6):\n pathspec: remove unnecessary function prototypes\n git: make super-prefix option\n ls-files: optionally recurse into submodules\n ls-files: pass through safe options for --recurse-submodules\n ls-files: add pathspec matching for submodules\n submodules doc: update documentation for \".\" used for submodule branches\n\nBrian Henderson (3):\n diff-highlight: add some tests\n diff-highlight: add failing test for handling --graph output\n diff-highlight: add support for --graph output\n\nChangwoo Ryu (1):\n l10n: ko.po: Update Korean translation\n\nChris Packham (1):\n completion: support excluding refs\n\nChristian Couder (43):\n apply: make some names more specific\n apply: move 'struct apply_state' to apply.h\n builtin/apply: make apply_patch() return -1 or -128 instead of die()ing\n builtin/apply: read_patch_file() return -1 instead of die()ing\n builtin/apply: make find_header() return -128 instead of die()ing\n builtin/apply: make parse_chunk() return a negative integer on error\n builtin/apply: make parse_single_patch() return -1 on error\n builtin/apply: make parse_whitespace_option() return -1 instead of die()ing\n builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing\n builtin/apply: move init_apply_state() to apply.c\n apply: make init_apply_state() return -1 instead of exit()ing\n builtin/apply: make check_apply_state() return -1 instead of die()ing\n builtin/apply: move check_apply_state() to apply.c\n builtin/apply: make apply_all_patches() return 128 or 1 on error\n builtin/apply: make parse_traditional_patch() return -1 on error\n builtin/apply: make gitdiff_*() return 1 at end of header\n builtin/apply: make gitdiff_*() return -1 on error\n builtin/apply: change die_on_unsafe_path() to check_unsafe_path()\n builtin/apply: make build_fake_ancestor() return -1 on error\n builtin/apply: make remove_file() return -1 on error\n builtin/apply: make add_conflicted_stages_file() return -1 on error\n builtin/apply: make add_index_file() return -1 on error\n builtin/apply: make create_file() return -1 on error\n builtin/apply: make write_out_one_result() return -1 on error\n builtin/apply: make write_out_results() return -1 on error\n unpack-objects: add --max-input-size= option\n builtin/apply: make try_create_file() return -1 on error\n builtin/apply: make create_one_file() return -1 on error\n builtin/apply: rename option parsing functions\n apply: rename and move opt constants to apply.h\n apply: move libified code from builtin/apply.c to apply.{c,h}\n apply: make some parsing functions static again\n apply: use error_errno() where possible\n apply: make it possible to silently apply\n apply: don't print on stdout in verbosity_silent mode\n usage: add set_warn_routine()\n usage: add get_error_routine() and get_warn_routine()\n apply: change error_routine when silent\n apply: refactor `git apply` option parsing\n apply: pass apply state to build_fake_ancestor()\n apply: learn to use a different index file\n builtin/am: use apply API in run_apply()\n split-index: s/eith/with/ typo fix\n\nDavid Aguilar (4):\n mergetool: add copyright\n mergetool: move main program flow into a main() function\n mergetool: honor diff.orderFile\n mergetool: honor -O\n\nDavid Turner (11):\n rename_ref_available(): add docstring\n refs: add methods for reflog\n refs: add method for initial ref transaction commit\n refs: make delete_refs() virtual\n refs: add methods to init refs db\n refs: add method to rename refs\n refs: make lock generic\n refs: implement iteration over only per-worktree refs\n add David Turner's Two Sigma address\n fsck: handle bad trees like other errors\n http: http.emptyauth should allow empty (not just NULL) usernames\n\nDennis Kaarsemaker (1):\n worktree: allow the main brach of a bare repository to be checked out\n\nDimitriy Ryazantcev (3):\n l10n: ru.po: update Russian translation\n git-gui: Update Russian translation\n l10n: ru.po: update Russian translation\n\nElia Pinto (6):\n t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment var\n test-lib.sh: preserve GIT_TRACE_CURL from the environment\n t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment var\n t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment var\n git-check-ref-format.txt: fixup documentation\n git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution\n\nEmily Xie (1):\n pathspec: warn on empty strings as pathspec\n\nEric Wong (5):\n http: warn on curl_multi_add_handle failures\n http: consolidate #ifdefs for curl_multi_remove_handle\n http: always remove curl easy from curlm session on release\n git-svn: reduce scope of input record separator change\n git-svn: \"git worktree\" awareness\n\nGavin Lambert (1):\n git-svn: do not reuse caches memoized for a different architecture\n\nIan Kelling (2):\n gitweb: remove unused guess_file_syntax() parameter\n gitweb: use highlight's shebang detection\n\nJacob Keller (9):\n format-patch: show 0/1 and 1/1 for singleton patch with cover letter\n cache: add empty_tree_oid object and helper function\n graph: add support for --line-prefix on all graph-aware output\n diff: prepare for additional submodule formats\n allow do_submodule_path to work even if submodule isn't checked out\n submodule: convert show_submodule_summary to use struct object_id *\n submodule: refactor show_submodule_summary with helper function\n diff: teach diff to display submodule difference with an inline diff\n rev-list: use hdr_termination instead of a always using a newline\n\nJakub Narębski (1):\n configure.ac: improve description of NO_REGEX test\n\nJean-Noel Avila (1):\n l10n: fr.po v2.11.0_rnd1\n\nJean-Noël AVILA (1):\n i18n: i18n: diff: mark die messages for translation\n\nJeff Hostetler (9):\n status: rename long-format print routines\n status: cleanup API to wt_status_print\n status: support --porcelain[=]\n status: collect per-file data for --porcelain=v2\n status: print per-file porcelain v2 status data\n status: print branch info with --porcelain=v2 --branch\n git-status.txt: describe --porcelain=v2 format\n test-lib-functions.sh: add lf_to_nul helper\n status: unit tests for --porcelain=v2\n\nJeff King (116):\n rebase-interactive: drop early check for valid ident\n provide an initializer for \"struct object_info\"\n sha1_file: make packed_object_info public\n pack-objects: break delta cycles before delta-search phase\n pack-objects: use mru list when iterating over packs\n gc: default aggressive depth to 50\n cache_or_unpack_entry: drop keep_cache parameter\n clear_delta_base_cache_entry: use a more descriptive name\n release_delta_base_cache: reuse existing detach function\n delta_base_cache: use list.h for LRU\n delta_base_cache: drop special treatment of blobs\n delta_base_cache: use hashmap.h\n t/perf: add basic perf tests for delta base cache\n index-pack: add --max-input-size= option\n receive-pack: allow a maximum input size to be specified\n test-lib: drop PID from test-results/*.count\n diff-highlight: ignore test cruft\n diff-highlight: add multi-byte tests\n diff-highlight: avoid highlighting combined diffs\n error_errno: use constant return similar to error()\n color_parse_mem: initialize \"struct color\" temporary\n t5305: move cleanup into test block\n t5305: drop \"dry-run\" of unpack-objects\n t5305: use \"git -C\"\n t5305: simplify packname handling\n pack-objects: walk tag chains for --include-tag\n remote-curl: handle URLs without protocol\n patch-ids: turn off rename detection\n add_delta_base_cache: use list_for_each_safe\n patch-ids: refuse to compute patch-id for merge commit\n hash-object: always try to set up the git repository\n patch-id: use RUN_SETUP_GENTLY\n diff: skip implicit no-index check when given --no-index\n diff: handle --no-index prefixes consistently\n diff: always try to set up the repository\n pager: remove obsolete comment\n pager: stop loading git_default_config()\n pager: make pager_program a file-local static\n pager: use callbacks instead of configset\n pager: handle early config\n t1302: use \"git -C\"\n test-config: setup git directory\n config: only read .git/config from configured repos\n init: expand comments explaining config trickery\n init: reset cached config when entering new repo\n t1007: factor out repeated setup\n verify_packfile: check pack validity before accessing data\n clone: pass --progress decision to recursive submodules\n docs/cvsimport: prefer cvs-fast-export to parsecvs\n docs/cvs-migration: update link to cvsps homepage\n docs/cvs-migration: mention cvsimport caveats\n ident: handle NULL ai_canonname\n get_sha1: detect buggy calls with multiple disambiguators\n get_sha1: avoid repeating ourselves via ONLY_TO_DIE\n get_sha1: propagate flags to child functions\n get_short_sha1: parse tags when looking for treeish\n get_short_sha1: refactor init of disambiguation code\n get_short_sha1: NUL-terminate hex prefix\n get_short_sha1: mark ambiguity error for translation\n sha1_array: let callbacks interrupt iteration\n for_each_abbrev: drop duplicate objects\n get_short_sha1: list ambiguous objects on error\n xdiff: rename \"struct group\" to \"struct xdlgroup\"\n get_short_sha1: make default disambiguation configurable\n tree-walk: be more specific about corrupt tree errors\n graph: fix extra spaces in graph_padding_line\n t5613: drop reachable_via function\n t5613: drop test_valid_repo function\n t5613: use test_must_fail\n t5613: whitespace/style cleanups\n t5613: do not chdir in main process\n find_unique_abbrev: move logic out of get_short_sha1()\n clone: detect errors in normalize_path_copy\n files_read_raw_ref: avoid infinite loop on broken symlinks\n files_read_raw_ref: prevent infinite retry loops in general\n t5613: clarify \"too deep\" recursion tests\n link_alt_odb_entry: handle normalize_path errors\n link_alt_odb_entry: refactor string handling\n alternates: provide helper for adding to alternates list\n alternates: provide helper for allocating alternate\n alternates: encapsulate alt->base munging\n alternates: use a separate scratch space\n fill_sha1_file: write \"boring\" characters\n alternates: store scratch buffer as strbuf\n fill_sha1_file: write into a strbuf\n count-objects: report alternates via verbose mode\n sha1_file: always allow relative paths to alternates\n alternates: use fspathcmp to detect duplicates\n check_connected: accept an env argument\n tmp-objdir: introduce API for temporary object directories\n receive-pack: quarantine objects until pre-receive accepts\n tmp-objdir: put quarantine information in the environment\n tmp-objdir: do not migrate files starting with '.'\n upload-pack: use priority queue in reachable() check\n merge-base: handle --fork-point without reflog\n fetch: use \"quick\" has_sha1_file for tag following\n test-lib: handle TEST_OUTPUT_DIRECTORY with spaces\n test-lib: add --verbose-log option\n travis: use --verbose-log test option\n test-lib: bail out when \"-v\" used under \"prove\"\n daemon: detect and reject too-long paths\n read info/{attributes,exclude} only when in repository\n test-*-cache-tree: setup git dir\n find_unique_abbrev: use 4-buffer ring\n diff_unique_abbrev: rename to diff_aligned_abbrev\n diff_aligned_abbrev: use \"struct oid\"\n diff: handle sha1 abbreviations outside of repository\n git-compat-util: move content inside ifdef/endif guards\n doc: fix missing \"::\" in config list\n t0021: use write_script to create rot13 shell script\n t0021: put $TEST_ROOT in $PATH\n t0021: use $PERL_PATH for rot13-filter.pl\n t0021: fix filehandle usage on older perl\n alternates: re-allow relative paths from environment\n sequencer: silence -Wtautological-constant-out-of-range-compare\n create_branch: drop unused \"head\" parameter\n\nJiang Xin (6):\n l10n: zh_CN: fixed some typos for git 2.10.0\n l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)\n l10n: zh_CN: for git v2.11.0 l10n round 1\n i18n: fix unmatched single quote in error message\n l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)\n l10n: Fixed typo of git fetch-pack command\n\nJohannes Schindelin (63):\n cat-file: fix a grammo in the man page\n sequencer: lib'ify sequencer_pick_revisions()\n sequencer: do not die() in do_pick_commit()\n sequencer: lib'ify write_message()\n sequencer: lib'ify do_recursive_merge()\n sequencer: lib'ify do_pick_commit()\n sequencer: lib'ify walk_revs_populate_todo()\n sequencer: lib'ify prepare_revs()\n sequencer: lib'ify read_and_refresh_cache()\n sequencer: lib'ify read_populate_todo()\n sequencer: lib'ify read_populate_opts()\n sequencer: lib'ify create_seq_dir()\n sequencer: lib'ify save_head()\n sequencer: lib'ify save_todo()\n sequencer: lib'ify save_opts()\n sequencer: lib'ify fast_forward_to()\n sequencer: lib'ify checkout_fast_forward()\n sequencer: ensure to release the lock when we could not read the index\n cat-file: introduce the --filters option\n cat-file --textconv/--filters: allow specifying the path separately\n cat-file: support --textconv/--filters in batch mode\n git-gui: respect commit.gpgsign again\n regex: -G feeds a non NUL-terminated string to regexec() and fails\n regex: add regexec_buf() that can work on a non NUL-terminated string\n regex: use regexec_buf()\n pull: drop confusing prefix parameter of die_on_unclean_work_tree()\n pull: make code more similar to the shell script again\n wt-status: make the require_clean_work_tree() function reusable\n wt-status: export also the has_un{staged,committed}_changes() functions\n wt-status: teach has_{unstaged,uncommitted}_changes() about submodules\n wt-status: begin error messages with lower-case\n reset: fix usage\n sequencer: use static initializers for replay_opts\n sequencer: use memoized sequencer directory path\n sequencer: avoid unnecessary indirection\n sequencer: future-proof remove_sequencer_state()\n sequencer: plug memory leaks for the option values\n sequencer: future-proof read_populate_todo()\n sequencer: refactor the code to obtain a short commit name\n sequencer: completely revamp the \"todo\" script parsing\n sequencer: strip CR from the todo script\n sequencer: avoid completely different messages for different actions\n sequencer: get rid of the subcommand field\n sequencer: remember the onelines when parsing the todo file\n sequencer: prepare for rebase -i's commit functionality\n sequencer: introduce a helper to read files written by scripts\n sequencer: allow editing the commit message on a case-by-case basis\n sequencer: support amending commits\n sequencer: support cleaning up commit messages\n sequencer: left-trim lines read from the script\n sequencer: stop releasing the strbuf in write_message()\n sequencer: roll back lock file if write_message() failed\n sequencer: refactor write_message() to take a pointer/length\n sequencer: teach write_message() to append an optional LF\n sequencer: remove overzealous assumption in rebase -i mode\n sequencer: mark action_name() for translation\n sequencer: quote filenames in error messages\n sequencer: start error messages consistently with lower case\n sequencer: mark all error messages for translation\n t6026: ensure that long-running script really is\n rebase -i: highlight problems with core.commentchar\n stripspace: respect repository config\n rebase -i: handle core.commentChar=auto\n\nJohannes Sixt (9):\n t9903: fix broken && chain\n t6026-merge-attr: clean up background process at end of test case\n t3700-add: create subdirectory gently\n t3700-add: do not check working tree file mode without POSIXPERM\n t0060: sidestep surprising path mangling results on Windows\n t0021: expect more variations in the output of uniq -c\n t0021: compute file size with a single process instead of a pipeline\n t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables\n t6026: clarify the point of \"kill $(cat sleep.pid)\"\n\nJonathan Nieder (1):\n connect: tighten check for unexpected early hang up\n\nJonathan Tan (15):\n tests: move test_lazy_prereq JGIT to test-lib.sh\n connect: advertized capability is not a ref\n mailinfo: separate in-body header processing\n mailinfo: make is_scissors_line take plain char *\n mailinfo: handle in-body header continuations\n fetch-pack: do not reset in_vain on non-novel acks\n trailer: improve const correctness\n trailer: use list.h for doubly-linked list\n trailer: streamline trailer item create and add\n trailer: make args have their own struct\n trailer: clarify failure modes in parse_trailer\n trailer: allow non-trailers in trailer block\n trailer: forbid leading whitespace in trailers\n trailer: support values folded to multiple lines\n doc: mention user-configured trailers\n\nJosh Triplett (2):\n format-patch: show base info before email signature\n format-patch: add \"--rfc\" for the common case of [RFC PATCH]\n\nJunio C Hamano (53):\n blame: improve diagnosis for \"--reverse NEW\"\n blame: dwim \"blame --reverse OLD\" as \"blame --reverse OLD..\"\n am: refactor read_author_script()\n diff.c: remove output_prefix_length field\n submodule: avoid auto-discovery in prepare_submodule_repo_env()\n symbolic-ref -d: do not allow removal of HEAD\n Prepare for 2.9.4\n Start the 2.11 cycle\n First batch for 2.11\n Second batch for 2.11\n Third batch for 2.11\n Start preparing for 2.10.1\n Fourth batch for 2.11\n streaming: make sure to notice corrupt object\n unpack_sha1_header(): detect malformed object header\n Fifth batch for 2.11\n worktree: honor configuration variables\n blame: use DEFAULT_ABBREV macro\n Prepare for 2.10.1\n Sixth batch for 2.11\n diff_unique_abbrev(): document its assumption and limitation\n abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing\n abbrev: prepare for new world order\n Git 2.10.1\n Seventh batch for 2.11\n t4015: split out the \"setup\" part of ws-error-highlight test\n diff.c: refactor parse_ws_error_highlight()\n diff.c: move ws-error-highlight parsing helpers up\n diff: introduce diff.wsErrorHighlight option\n Eighth batch for 2.11\n Ninth batch for 2.11\n Start preparing for 2.10.2\n cocci: refactor common patterns to use xstrdup_or_null()\n Tenth batch for 2.11\n t3700: fix broken test under !SANITY\n transport: pass summary_width down the callchain\n fetch: pass summary_width down the callchain\n transport: allow summary-width to be computed dynamically\n transport: compute summary-width dynamically\n Eleventh batch for 2.11\n Getting ready for 2.11-rc0\n Git 2.10.2\n Git 2.11-rc0\n A bit of updates post -rc0\n Revert \"t6026-merge-attr: ensure that the merge driver was called\"\n Revert \"t6026-merge-attr: don't fail if sleep exits early\"\n t0021: remove debugging cruft\n Git 2.11.0-rc1\n Git 2.11-rc2\n for-each-ref: do not segv with %(HEAD) on an unborn branch\n mailinfo: read local configuration\n archive: read local configuration\n Git 2.11-rc3\n\nKarsten Blees (2):\n git-gui: unicode file name support on windows\n git-gui: handle the encoding of Git's output correctly\n\nKevin Daudt (2):\n t5100-mailinfo: replace common path prefix with variable\n mailinfo: unescape quoted-pair in header fields\n\nKirill Smelkov (3):\n pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use\n pack-objects: use reachability bitmap index when generating non-stdout pack\n t/perf/run: copy config.mak.autogen & friends to build area\n\nLars Schneider (20):\n travis-ci: ask homebrew for its path instead of hardcoding it\n convert: quote filter names in error messages\n convert: modernize tests\n run-command: move check_pipe() from write_or_die to run_command\n run-command: add clean_on_exit_handler\n pkt-line: rename packet_write() to packet_write_fmt()\n pkt-line: extract set_packet_header()\n pkt-line: add packet_write_fmt_gently()\n pkt-line: add packet_flush_gently()\n pkt-line: add packet_write_gently()\n pkt-line: add functions to read/write flush terminated packet streams\n convert: make apply_filter() adhere to standard Git error handling\n convert: prepare filter..process option\n convert: add filter..process option\n contrib/long-running-filter: add long running filter example\n sha1_file: rename git_open_noatime() to git_open()\n sha1_file: open window into packfiles with O_CLOEXEC\n read-cache: make sure file handles are not inherited by child processes\n Makefile: set NO_OPENSSL on macOS by default\n travis-ci: disable GIT_TEST_HTTPD for macOS\n\nLinus Torvalds (1):\n abbrev: auto size the default abbreviation\n\nMantas Mikulėnas (1):\n contrib: add credential helper for libsecret\n\nMatthieu Moy (4):\n Documentation/config: default for color.* is color.ui\n parse_mailboxes: accept extra text after <...> address\n t9000-addresses: update expected results after fix\n Git.pm: add comment pointing to t9000\n\nMichael Haggerty (36):\n xdl_change_compact(): fix compaction heuristic to adjust ixo\n xdl_change_compact(): only use heuristic if group can't be matched\n is_blank_line(): take a single xrecord_t as argument\n recs_match(): take two xrecord_t pointers as arguments\n xdl_change_compact(): introduce the concept of a change group\n resolve_gitlink_ref(): eliminate temporary variable\n refs: rename struct ref_cache to files_ref_store\n refs: create a base class \"ref_store\" for files_ref_store\n add_packed_ref(): add a files_ref_store argument\n get_packed_ref(): add a files_ref_store argument\n resolve_missing_loose_ref(): add a files_ref_store argument\n {lock,commit,rollback}_packed_refs(): add files_ref_store arguments\n refs: reorder definitions\n resolve_packed_ref(): rename function from resolve_missing_loose_ref()\n resolve_gitlink_packed_ref(): remove function\n read_raw_ref(): take a (struct ref_store *) argument\n resolve_ref_recursively(): new function\n resolve_gitlink_ref(): implement using resolve_ref_recursively()\n resolve_gitlink_ref(): avoid memory allocation in many cases\n resolve_gitlink_ref(): rename path parameter to submodule\n refs: make read_raw_ref() virtual\n refs: make verify_refname_available() virtual\n refs: make pack_refs() virtual\n refs: make create_symref() virtual\n refs: make peel_ref() virtual\n repack_without_refs(): add a files_ref_store argument\n lock_raw_ref(): add a files_ref_store argument\n commit_ref_update(): add a files_ref_store argument\n lock_ref_for_update(): add a files_ref_store argument\n lock_ref_sha1_basic(): add a files_ref_store argument\n split_symref_update(): add a files_ref_store argument\n files_ref_iterator_begin(): take a ref_store argument\n refs: add method iterator_begin\n diff: improve positioning of add/delete blocks in diffs\n parse-options: add parse_opt_unknown_cb()\n blame: honor the diff heuristic options and config\n\nMichael J Gruber (1):\n gpg-interface: use more status letters\n\nMike Ralphson (1):\n vcs-svn/fast_export: fix timestamp fmt specifiers\n\nNguyễn Thái Ngọc Duy (40):\n remote-curl.c: convert fetch_git() to use argv_array\n transport-helper.c: refactor set_helper_option()\n upload-pack: move shallow deepen code out of receive_needs()\n upload-pack: move \"shallow\" sending code out of deepen()\n upload-pack: remove unused variable \"backup\"\n upload-pack: move \"unshallow\" sending code out of deepen()\n upload-pack: use skip_prefix() instead of starts_with()\n upload-pack: tighten number parsing at \"deepen\" lines\n upload-pack: make check_non_tip() clean things up on error\n upload-pack: move rev-list code out of check_non_tip()\n fetch-pack: use skip_prefix() instead of starts_with()\n fetch-pack: use a common function for verbose printing\n fetch-pack.c: mark strings for translating\n fetch-pack: use a separate flag for fetch in deepening mode\n shallow.c: implement a generic shallow boundary finder based on rev-list\n upload-pack: add deepen-since to cut shallow repos based on time\n fetch: define shallow boundary with --shallow-since\n clone: define shallow clone boundary based on time with --shallow-since\n t5500, t5539: tests for shallow depth since a specific date\n refs: add expand_ref()\n upload-pack: support define shallow boundary by excluding revisions\n fetch: define shallow boundary with --shallow-exclude\n clone: define shallow clone boundary with --shallow-exclude\n t5500, t5539: tests for shallow depth excluding a ref\n upload-pack: split check_unreachable() in two, prep for get_reachable_list()\n upload-pack: add get_reachable_list()\n fetch, upload-pack: --deepen=N extends shallow boundary by N commits\n checkout: add some spaces between code and comment\n checkout.txt: document a common case that ignores ambiguation rules\n checkout: fix ambiguity check in subdir\n init: correct re-initialization from a linked worktree\n init: call set_git_dir_init() from within init_db()\n init: kill set_git_dir_init()\n init: do not set unnecessary core.worktree\n init: kill git_link variable\n git-commit.txt: clarify --patch mode with pathspec\n diff-lib: allow ita entries treated as \"not yet exist in index\"\n diff: add --ita-[in]visible-in-index\n commit: fix empty commit creation when there's no changes but ita entries\n commit: don't be fooled by ita entries when creating initial commit\n\nOlaf Hering (1):\n git-gui: sort entries in tclIndex\n\nOrgad Shaneh (1):\n git-gui: Do not reset author details on amend\n\nPat Thoyts (7):\n Allow keyboard control to work in the staging widgets.\n Amend tab ordering and text widget border and highlighting.\n git-gui: fix detection of Cygwin\n git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`\n git-gui: maintain backwards compatibility for merge syntax\n git-gui: avoid persisting modified author identity\n git-gui: set version 0.21\n\nPatrick Steinhardt (1):\n doc: fix location of 'info/' with $GIT_COMMON_DIR\n\nPeter Krefting (1):\n l10n: sv.po: Update Swedish translation (2913t0f0u)\n\nPetr Stodulka (1):\n http: control GSSAPI credential delegation\n\nPhilip Oakley (14):\n doc: use 'symmetric difference' consistently\n doc: revisions - name the left and right sides\n doc: show the actual left, right, and boundary marks\n doc: revisions: give headings for the two and three dot notations\n doc: revisions: extra clarification of ^! notation effects\n doc: revisions: single vs multi-parent notation comparison\n doc: gitrevisions - use 'reachable' in page description\n doc: gitrevisions - clarify 'latter case' is revision walk\n doc: revisions - define `reachable`\n doc: revisions - clarify reachability examples\n doc: revisions: show revision expansion in examples\n doc: revisions: sort examples and fix alignment of the unchanged\n doc: fix merge-base ASCII art tab spacing\n doc: fix the 'revert a faulty merge' ASCII art tab spacing\n\nPranit Bauva (2):\n rev-list-options: clarify the usage of --reverse\n t0040: convert all possible tests to use `test-parse-options --expect`\n\nRalf Thielow (6):\n help: introduce option --exclude-guides\n help: make option --help open man pages only for Git commands\n rebase -i: improve advice on bad instruction lines\n l10n: de.po: fix translation of autostash\n l10n: de.po: translate 260 new messages\n fetch-pack.c: correct command at the beginning of an error message\n\nRay Chen (1):\n l10n: zh_CN: review for git v2.10.0 l10n\n\nRené Scharfe (36):\n compat: move strdup(3) replacement to its own file\n introduce hex2chr() for converting two hexadecimal digits to a character\n strbuf: use valid pointer in strbuf_remove()\n checkout: constify parameters of checkout_stage() and checkout_merged()\n unpack-trees: pass checkout state explicitly to check_updates()\n sha1_file: use llist_mergesort() for sorting packs\n xdiff: fix merging of hunks with -W context and -u context\n contrib/coccinelle: fix semantic patch for oid_to_hex_r()\n add coccicheck make target\n use strbuf_addstr() for adding constant strings to a strbuf, part 2\n pretty: let %C(auto) reset all attributes\n introduce CHECKOUT_INIT\n add COPY_ARRAY\n use COPY_ARRAY\n git-gui: stop using deprecated merge syntax\n gitignore: ignore output files of coccicheck make target\n use strbuf_addstr() instead of strbuf_addf() with \"%s\", part 2\n use strbuf_add_unique_abbrev() for adding short hashes, part 2\n add QSORT\n use QSORT\n remove unnecessary check before QSORT\n coccicheck: use --all-includes by default\n use QSORT, part 2\n pretty: avoid adding reset for %C(auto) if output is empty\n coccicheck: make transformation for strbuf_addf(sb, \"...\") more precise\n show-branch: use QSORT\n remove unnecessary NULL check before free(3)\n use strbuf_add_unique_abbrev() for adding short hashes, part 3\n pretty: fix document link for color specification\n avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM\n inline xalloc_flex() into FLEXPTR_ALLOC_MEM\n hex: make wraparound of the index into ring-buffer explicit\n valgrind: support test helpers\n commit: simplify building parents list\n sha1_name: make wraparound of the index into ring-buffer explicit\n cocci: avoid self-references in object_id transformations\n\nRonnie Sahlberg (2):\n refs: add a backend method structure\n refs: add a transaction_commit() method\n\nSZEDER Gábor (1):\n ref-filter: strip format option after a field name only once while parsing\n\nSatoshi Yasushima (6):\n git-gui: consistently use the same word for \"remote\" in Japanese\n git-gui: consistently use the same word for \"blame\" in Japanese\n git-gui: apply po template to Japanese translation\n git-gui: add Japanese language code\n git-gui: update Japanese translation\n git-gui: update Japanese information\n\nStefan Beller (16):\n t7408: modernize style\n t7408: merge short tests, factor out testing method\n submodule--helper module-clone: allow multiple references\n submodule--helper update-clone: allow multiple references\n clone: factor out checking for an alternate path\n clone: clarify option_reference as required\n clone: implement optional references\n clone: recursive and reference option triggers submodule alternates\n xdiff: remove unneeded declarations\n transport: report missing submodule pushes consistently on stderr\n diff.c: use diff_options directly\n diff: omit found pointer from emit_callback\n diff: remove dead code\n submodule: ignore trailing slash on superproject URL\n submodule: ignore trailing slash in relative url\n documentation: improve submodule..{url, path} description\n\nStefan Christ (1):\n Documentation/fmt-merge-msg: fix markup in example\n\nThomas Gummerer (4):\n add: document the chmod option\n update-index: add test for chmod flags\n read-cache: introduce chmod_index_entry\n add: modify already added files when --chmod is given\n\nTobias Klauser (1):\n diffcore-delta: remove unused parameter to diffcore_count_changes()\n\nTrần Ngọc Quân (1):\n l10n: vi.po: Updated translation to v2.11.0 (2913t)\n\nVasco Almeida (33):\n l10n: pt_PT: update Portuguese translation\n l10n: pt_PT: update Portuguese repository info\n i18n: blame: mark error messages for translation\n i18n: branch: mark option description for translation\n i18n: config: mark error message for translation\n i18n: merge-recursive: mark error messages for translation\n i18n: merge-recursive: mark verbose message for translation\n i18n: notes: mark error messages for translation\n notes: spell first word of error messages in lowercase\n i18n: receive-pack: mark messages for translation\n i18n: show-branch: mark error messages for translation\n i18n: show-branch: mark plural strings for translation\n i18n: update-index: mark warnings for translation\n i18n: commit: mark message for translation\n i18n: connect: mark die messages for translation\n i18n: ident: mark hint for translation\n i18n: notes-merge: mark die messages for translation\n i18n: stash: mark messages for translation\n git-gui i18n: mark strings for translation\n git-gui: l10n: add Portuguese translation\n git-gui i18n: internationalize use of colon punctuation\n git-gui i18n: mark \"usage:\" strings for translation\n git-gui: fix incorrect use of Tcl append command\n git-gui i18n: mark string in lib/error.tcl for translation\n t1512: become resilient to GETTEXT_POISON build\n i18n: apply: mark plural string for translation\n i18n: apply: mark info messages for translation\n i18n: apply: mark error messages for translation\n i18n: apply: mark error message for translation\n i18n: convert mark error messages for translation\n i18n: credential-cache--daemon: mark advice for translation\n i18n: diff: mark warnings for translation\n l10n: pt_PT: update Portuguese translation\n\nVegard Nossum (1):\n revision: new rev^-n shorthand for rev^n..rev\n\nYounes Khoudli (1):\n doc: remove reference to the traditional layout in git-tag.txt\n\nbrian m. carlson (20):\n cache: convert struct cache_entry to use struct object_id\n builtin/apply: convert static functions to struct object_id\n builtin/blame: convert struct origin to use struct object_id\n builtin/log: convert some static functions to use struct object_id\n builtin/cat-file: convert struct expand_data to use struct object_id\n builtin/cat-file: convert some static functions to struct object_id\n builtin: convert textconv_object to use struct object_id\n streaming: make stream_blob_to_fd take struct object_id\n builtin/checkout: convert some static functions to struct object_id\n notes-merge: convert struct notes_merge_pair to struct object_id\n Convert read_mmblob to take struct object_id.\n builtin/blame: convert file to use struct object_id\n builtin/rm: convert to use struct object_id\n notes: convert init_notes to use struct object_id\n builtin/update-index: convert file to struct object_id\n sha1_name: convert get_sha1_mb to struct object_id\n refs: add an update_ref_oid function.\n builtin/am: convert to struct object_id\n builtin/commit-tree: convert to struct object_id\n builtin/reset: convert to use struct object_id\n\njfbu (1):\n l10n: fr.po fix grammar mistakes\n\nyaras (1):\n git-gui: fix initial git gui message encoding\n\nÆvar Arnfjörð Bjarmason (3):\n gitweb: fix a typo in a comment\n gitweb: link to 7-char+ SHA-1s, not only 8-char+\n gitweb: link to \"git describe\"'d commits in log messages\n\nДилян Палаузов (1):\n ./configure.ac: detect SSL in libcurl using curl-config\n\n"},{"id":"306407","messageId":"836824f5-79e5-fbbf-dfe0-78cc19af1fb2@xiplink.com","threadId":"44540","inReplyTo":"xmqqinrdlr3o.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc3","fromName":"Marc Branchaud","fromEmail":"marcnarc@xiplink.com","sentAt":"2016-11-24T16:25:02Z","receivedAt":"2016-11-24T16:31:46Z","isPatch":false,"sender":{"key":"marcnarc@xiplink.com","avatar":"https://avatars.githubusercontent.com/u/14980203?v=4"},"body":"On 2016-11-23 06:21 PM, Junio C Hamano wrote:\n>\n> * The original command line syntax for \"git merge\", which was \"git\n> merge HEAD ...\", has been deprecated for quite some\n> time, and \"git gui\" was the last in-tree user of the syntax. This\n> is finally fixed, so that we can move forward with the deprecation.\n\nIs this still true, given j6t's recent patch at\n\nhttp://public-inbox.org/git/e61cc267-a59b-3be1-29db-c49d56f521f7@kdbg.org/T/\n\n?\n\n\t\tM.\n\n"},{"id":"306408","messageId":"20161124165900.30605-1-marcnarc@xiplink.com","threadId":"44540","inReplyTo":"xmqqinrdlr3o.fsf@gitster.mtv.corp.google.com","subject":"[PATCH] Release note spelling and phrasing fixups.","fromName":"Marc Branchaud","fromEmail":"marcnarc@xiplink.com","sentAt":"2016-11-24T16:59:00Z","receivedAt":"2016-11-24T17:09:15Z","isPatch":true,"sender":{"key":"marcnarc@xiplink.com","avatar":"https://avatars.githubusercontent.com/u/14980203?v=4"},"body":"Signed-off-by: Marc Branchaud \n---\n\nMostly just missing words and what I feel are clarifications.\n\nThe biggest change is to the \"git add -N\" item. Not 100% sure\nI got it right.\n\n\t\tM.\n\n Documentation/RelNotes/2.11.0.txt | 145 +++++++++++++++++++-------------------\n 1 file changed, 72 insertions(+), 73 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt\nindex cea2a50..de5892e 100644\n--- a/Documentation/RelNotes/2.11.0.txt\n+++ b/Documentation/RelNotes/2.11.0.txt\n@@ -57,39 +57,40 @@ UI, Workflows & Features\n \n * Even though \"git hash-objects\", which is a tool to take an\n on-filesystem data stream and put it into the Git object store,\n- allowed to perform the \"outside-world-to-Git\" conversions (e.g.\n+ can perform \"outside-world-to-Git\" conversions (e.g.\n end-of-line conversions and application of the clean-filter), and\n- it had the feature on by default from very early days, its reverse\n+ it has had this feature on by default from very early days, its reverse\n operation \"git cat-file\", which takes an object from the Git object\n- store and externalize for the consumption by the outside world,\n+ store and externalizes it for consumption by the outside world,\n lacked an equivalent mechanism to run the \"Git-to-outside-world\"\n conversion. The command learned the \"--filters\" option to do so.\n \n- * Output from \"git diff\" can be made easier to read by selecting\n+ * Output from \"git diff\" can be made easier to read by intelligently selecting\n which lines are common and which lines are added/deleted\n- intelligently when the lines before and after the changed section\n- are the same. A command line option is added to help with the\n- experiment to find a good heuristics.\n+ when the lines before and after the changed section\n+ are the same. A command line option (--indent-heuristic) and a\n+ configuration variable (diff.indentHeuristic) are added to help with the\n+ experiment to find good heuristics.\n \n * In some projects, it is common to use \"[RFC PATCH]\" as the subject\n prefix for a patch meant for discussion rather than application. A\n- new option \"--rfc\" is a short-hand for \"--subject-prefix=RFC PATCH\"\n+ new format-patch option \"--rfc\" is a short-hand for \"--subject-prefix=RFC PATCH\"\n to help the participants of such projects.\n \n- * \"git add --chmod=+x \" added recently only toggled the\n+ * \"git add --chmod={+,-}x \" only changed the\n executable bit for paths that are either new or modified. This has\n- been corrected to flip the executable bit for all paths that match\n+ been corrected to change the executable bit for all paths that match\n the given pathspec.\n \n * When \"git format-patch --stdout\" output is placed as an in-body\n- header and it uses the RFC2822 header folding, \"git am\" failed to\n+ header and it uses RFC2822 header folding, \"git am\" fails to\n put the header line back into a single logical line. The\n underlying \"git mailinfo\" was taught to handle this properly.\n \n * \"gitweb\" can spawn \"highlight\" to show blob contents with\n (programming) language-specific syntax highlighting, but only\n when the language is known. \"highlight\" can however be told\n- to make the guess itself by giving it \"--force\" option, which\n+ to guess the language itself by giving it \"--force\" option, which\n has been enabled.\n \n * \"git gui\" l10n to Portuguese.\n@@ -109,19 +110,19 @@ UI, Workflows & Features\n history leading to nth parent was looking the other way.\n \n * In recent versions of cURL, GSSAPI credential delegation is\n- disabled by default due to CVE-2011-2192; introduce a configuration\n- to selectively allow enabling this.\n+ disabled by default due to CVE-2011-2192; introduce a http.delegation\n+ configuration variable to selectively allow enabling this.\n (merge 26a7b23429 ps/http-gssapi-cred-delegation later to maint).\n \n * \"git mergetool\" learned to honor \"-O\" to control the\n order of paths to present to the end user.\n \n * \"git diff/log --ws-error-highlight=\" lacked the corresponding\n- configuration variable to set it by default.\n+ configuration variable (diff.wsErrorHighlight) to set it by default.\n \n- * \"git ls-files\" learned \"--recurse-submodules\" option that can be\n- used to get a listing of tracked files across submodules (i.e. this\n- only works with \"--cached\" option, not for listing untracked or\n+ * \"git ls-files\" learned the \"--recurse-submodules\" option\n+ to get a listing of tracked files across submodules (i.e. this\n+ only works with the \"--cached\" option, not for listing untracked or\n ignored files). This would be a useful tool to sit on the upstream\n side of a pipe that is read with xargs to work on all working tree\n files from the top-level superproject.\n@@ -130,7 +131,7 @@ UI, Workflows & Features\n implementations of XDG Secret Service API has been added to\n contrib/credential/.\n \n- * The GPG verification status shown in \"%G?\" pretty format specifier\n+ * The GPG verification status shown by the \"%G?\" pretty format specifier\n was not rich enough to differentiate a signature made by an expired\n key, a signature made by a revoked key, etc. New output letters\n have been assigned to express them.\n@@ -139,17 +140,17 @@ UI, Workflows & Features\n learned to turn \"git describe\" output (e.g. v2.9.3-599-g2376d31787)\n into clickable links in its output.\n \n- * When new paths were added by \"git add -N\" to the index, it was\n- enough to circumvent the check by \"git commit\" to refrain from\n- making an empty commit without \"--allow-empty\". The same logic\n- prevented \"git status\" to show such a path as \"new file\" in the\n+ * \"git commit\" created an empty commit when invoked with an index\n+ consisting solely of intend-to-add paths (added with \"git add -N\").\n+ It now requires the \"--allow-empty\" option to create such a commit.\n+ The same logic prevented \"git status\" from showing such paths as \"new files\" in the\n \"Changes not staged for commit\" section.\n \n- * The smudge/clean filter API expect an external process is spawned\n- to filter the contents for each path that has a filter defined. A\n+ * The smudge/clean filter API spawns an external process\n+ to filter the contents of each path that has a filter defined. A\n new type of \"process\" filter API has been added to allow the first\n request to run the filter for a path to spawn a single process, and\n- all filtering need is served by this single process for multiple\n+ all filtering is served by this single process for multiple\n paths, reducing the process creation overhead.\n \n * The user always has to say \"stash@{$N}\" when naming a single\n@@ -173,7 +174,7 @@ Performance, Internal Implementation, Development Support etc.\n script file \"git am\" internally uses.\n (merge a77598e jc/am-read-author-file later to maint).\n \n- * Lifts calls to exit(2) and die() higher in the callchain in\n+ * Lift calls to exit(2) and die() higher in the callchain in\n sequencer.c files so that more helper functions in it can be used\n by callers that want to handle error conditions themselves.\n \n@@ -192,13 +193,13 @@ Performance, Internal Implementation, Development Support etc.\n does not advertise any refs, but \"git fetch\" was not prepared to\n see such an advertisement. When the other side disconnects without\n giving any ref advertisement, we used to say \"there may not be a\n- repository at that URL\", but we may have seen other advertisement\n+ repository at that URL\", but we may have seen other advertisements\n like \"shallow\" and \".have\" in which case we definitely know that a\n repository is there. The code to detect this case has also been\n updated.\n \n * Some codepaths in \"git pack-objects\" were not ready to use an\n- existing pack bitmap; now they are and as the result they have\n+ existing pack bitmap; now they are and as a result they have\n become faster.\n \n * The codepath in \"git fsck\" to detect malformed tree objects has\n@@ -214,7 +215,7 @@ Performance, Internal Implementation, Development Support etc.\n packfile first.\n (merge c9af708b1a jk/pack-objects-optim-mru later to maint).\n \n- * Codepaths involved in interacting alternate object store have\n+ * Codepaths involved in interacting alternate object stores have\n been cleaned up.\n \n * In order for the receiving end of \"git push\" to inspect the\n@@ -222,7 +223,7 @@ Performance, Internal Implementation, Development Support etc.\n from the sending end need to be made available to the hook and\n the mechanism for the connectivity check, and this was done\n traditionally by storing the objects in the receiving repository\n- and letting \"git gc\" to expire it. Instead, store the newly\n+ and letting \"git gc\" expire them. Instead, store the newly\n received objects in a temporary area, and make them available by\n reusing the alternate object store mechanism to them only while we\n decide if we accept the check, and once we decide, either migrate\n@@ -237,7 +238,7 @@ Performance, Internal Implementation, Development Support etc.\n replaced with a priority queue.\n \n * \"git diff --no-index\" codepath has been updated not to try to peek\n- into .git/ directory that happens to be under the current\n+ into a .git/ directory that happens to be under the current\n directory, when we know we are operating outside any repository.\n \n * Update of the sequencer codebase to make it reusable to reimplement\n@@ -251,8 +252,8 @@ Performance, Internal Implementation, Development Support etc.\n holding onto them. Use O_CLOEXEC flag to open files in various\n codepaths.\n \n- * Update \"interpret-trailers\" machinery and teaches it that people in\n- real world write all sorts of crufts in the \"trailer\" that was\n+ * Update \"interpret-trailers\" machinery and teach it that people in\n+ the real world write all sorts of cruft in the \"trailer\" that was\n originally designed to have the neat-o \"Mail-Header: like thing\"\n and nothing else.\n \n@@ -280,7 +281,7 @@ notes for details).\n has been removed.\n \n * Having a submodule whose \".git\" repository is somehow corrupt\n- caused a few commands that recurse into submodules loop forever.\n+ caused a few commands that recurse into submodules to loop forever.\n \n * \"git symbolic-ref -d HEAD\" happily removes the symbolic ref, but\n the resulting repository becomes an invalid one. Teach the command\n@@ -308,12 +309,12 @@ notes for details).\n forgot to update \"git gui\" to look at the configuration to match\n this change.\n \n- * \"git add --chmod=+x\" added recently lacked documentation, which has\n+ * \"git add --chmod={+,-}x\" added recently lacked documentation, which has\n been corrected.\n \n * \"git log --cherry-pick\" used to include merge commits as candidates\n to be matched up with other commits, resulting a lot of wasted time.\n- The patch-id generation logic has been updated to ignore merges to\n+ The patch-id generation logic has been updated to ignore merges and\n avoid the wastage.\n \n * The http transport (with curl-multi option, which is the default\n@@ -333,20 +334,20 @@ notes for details).\n line of the next one. This process may have to merge two adjacent\n hunks, but the code forgot to do so in some cases.\n \n- * Performance tests done via \"t/perf\" did not use the same set of\n+ * Performance tests done via \"t/perf\" did not use the right\n build configuration if the user relied on autoconf generated\n configuration.\n \n * \"git format-patch --base=...\" feature that was recently added\n- showed the base commit information after \"-- \" e-mail signature\n+ showed the base commit information after the \"-- \" e-mail signature\n line, which turned out to be inconvenient. The base information\n has been moved above the signature line.\n \n * More i18n.\n \n * Even when \"git pull --rebase=preserve\" (and the underlying \"git\n- rebase --preserve\") can complete without creating any new commit\n- (i.e. fast-forwards), it still insisted on having a usable ident\n+ rebase --preserve\") can complete without creating any new commits\n+ (i.e. fast-forwards), it still insisted on having usable ident\n information (read: user.email is set correctly), which was less\n than nice. As the underlying commands used inside \"git rebase\"\n would fail with a more meaningful error message and advice text\n@@ -396,7 +397,7 @@ notes for details).\n * Documentation around tools to import from CVS was fairly outdated.\n \n * \"git clone --recurse-submodules\" lost the progress eye-candy in\n- recent update, which has been corrected.\n+ a recent update, which has been corrected.\n \n * A low-level function verify_packfile() was meant to show errors\n that were detected without dying itself, but under some conditions\n@@ -409,23 +410,23 @@ notes for details).\n to a design bug, which has been fixed.\n \n * In the codepath that comes up with the hostname to be used in an\n- e-mail when the user didn't tell us, we looked at ai_canonname\n+ e-mail when the user didn't tell us, we looked at the ai_canonname\n field in struct addrinfo without making sure it is not NULL first.\n \n * \"git worktree\", even though it used the default_abbrev setting that\n- ought to be affected by core.abbrev configuration variable, ignored\n+ ought to be affected by the core.abbrev configuration variable, ignored\n the variable setting. The command has been taught to read the\n default set of configuration variables to correct this.\n \n * \"git init\" tried to record core.worktree in the repository's\n- 'config' file when GIT_WORK_TREE environment variable was set and\n+ 'config' file when the GIT_WORK_TREE environment variable was set and\n it was different from where GIT_DIR appears as \".git\" at its top,\n but the logic was faulty when .git is a \"gitdir:\" file that points\n at the real place, causing trouble in working trees that are\n managed by \"git worktree\". This has been corrected.\n \n * Codepaths that read from an on-disk loose object were too loose in\n- validating what they are reading is a proper object file and\n+ validating that they are reading a proper object file and\n sometimes read past the data they read from the disk, which has\n been corrected. H/t to Gustavo Grieco for reporting.\n \n@@ -434,8 +435,8 @@ notes for details).\n time, and \"git gui\" was the last in-tree user of the syntax. This\n is finally fixed, so that we can move forward with the deprecation.\n \n- * An author name, that spelled a backslash-quoted double quote in the\n- human readable part \"My \\\"double quoted\\\" name\", was not unquoted\n+ * An author name that has a backslash-quoted double quote in the\n+ human readable part (\"My \\\"double quoted\\\" name\"), was not unquoted\n correctly while applying a patch from a piece of e-mail.\n \n * Doc update to clarify what \"log -3 --reverse\" does.\n@@ -449,11 +450,10 @@ notes for details).\n has been fixed; this did not affect any existing code as nobody\n tried to write anything after the padding on such a line, though.\n \n- * The code that parses the format parameter of for-each-ref command\n+ * The code that parses the format parameter of the for-each-ref command\n has seen a micro-optimization.\n \n- * When we started cURL to talk to imap server when a new enough\n- version of cURL library is available, we forgot to explicitly add\n+ * When we started to use cURL to talk to an imap server, we forgot to explicitly add\n imap(s):// before the destination. To some folks, that didn't work\n and the library tried to make HTTP(s) requests instead.\n \n@@ -474,13 +474,12 @@ notes for details).\n \"Give me only the history since that version\".\n (merge cccf74e2da nd/shallow-deepen later to maint).\n \n- * It is a common mistake to say \"git blame --reverse OLD path\",\n- expecting that the command line is dwimmed as if asking how lines\n+ * \"git blame --reverse OLD path\" is now DWIMmed to show how lines\n in path in an old revision OLD have survived up to the current\n commit.\n (merge e1d09701a4 jc/blame-reverse later to maint).\n \n- * http.emptyauth configuration is a way to allow an empty username to\n+ * The http.emptyauth configuration variable is a way to allow an empty username to\n pass when attempting to authenticate using mechanisms like\n Kerberos. We took an unspecified (NULL) username and sent \":\"\n (i.e. no username, no password) to CURLOPT_USERPWD, but did not do\n@@ -494,19 +493,19 @@ notes for details).\n -p \" adds to the current contents of the index to come up\n with what to commit.\n \n- * A stray symbolic link in $GIT_DIR/refs/ directory could make name\n+ * A stray symbolic link in the $GIT_DIR/refs/ directory could make name\n resolution loop forever, which has been corrected.\n \n * The \"submodule..path\" stored in .gitmodules is never copied\n to .git/config and such a key in .git/config has no meaning, but\n- the documentation described it and submodule..url next to\n- each other as if both belong to .git/config. This has been fixed.\n+ the documentation described it next to submodule..url\n+ as if both belong to .git/config. This has been fixed.\n \n- * In a worktree connected to a repository elsewhere, created via \"git\n+ * In a worktree created via \"git\n worktree\", \"git checkout\" attempts to protect users from confusion\n by refusing to check out a branch that is already checked out in\n another worktree. However, this also prevented checking out a\n- branch, which is designated as the primary branch of a bare\n+ branch which is designated as the primary branch of a bare\n reopsitory, in a worktree that is connected to the bare\n repository. The check has been corrected to allow it.\n \n@@ -515,7 +514,7 @@ notes for details).\n \n * When fetching from a remote that has many tags that are irrelevant\n to branches we are following, we used to waste way too many cycles\n- when checking if the object pointed at by a tag (that we are not\n+ checking if the object pointed at by a tag (that we are not\n going to fetch!) exists in our repository too carefully.\n \n * Protect our code from over-eager compilers.\n@@ -524,27 +523,27 @@ notes for details).\n \".\" instead of the branch name; the documentation has been updated\n to describe it.\n \n- * A hot-fix for a test added by a recent topic that went to both\n+ * Hot-fixed a test added by a recent topic that went to both\n 'master' and 'maint' already.\n \n * \"git send-email\" attempts to pick up valid e-mails from the\n- trailers, but people in real world write non-addresses there, like\n+ trailers, but people in the real world write non-addresses there, like\n \"Cc: Stable # 4.8+\", which broke the output depending\n- on the availability and vintage of Mail::Address perl module.\n+ on the availability and vintage of the Mail::Address perl module.\n (merge dcfafc5214 mm/send-email-cc-cruft-after-address later to maint).\n \n- * The Travis CI configuration we ship ran the tests with --verbose\n+ * The Travis CI configuration we ship ran the tests with the --verbose\n option but this risks non-TAP output that happens to be \"ok\" to be\n misinterpreted as TAP signalling a test that passed. This resulted\n- in unnecessary failure. This has been corrected by introducing a\n+ in unnecessary failures. This has been corrected by introducing a\n new mode to run our tests in the test harness to send the verbose\n output separately to the log file.\n \n- * Some AsciiDoc formatter mishandles a displayed illustration with\n+ * Some AsciiDoc formatters mishandle a displayed illustration with\n tabs in it. Adjust a few of them in merge-base documentation to\n work around them.\n \n- * A minor regression fix for \"git submodule\" that was introduced\n+ * Fixed a minor regression in \"git submodule\" that was introduced\n when more helper functions were reimplemented in C.\n (merge 77b63ac31e sb/submodule-ignore-trailing-slash later to maint).\n \n@@ -553,19 +552,19 @@ notes for details).\n theoretical world.\n (merge bb84735c80 rs/ring-buffer-wraparound later to maint).\n \n- * \"git daemon\" used fixed-length buffers to turn URL to the\n+ * \"git daemon\" used fixed-length buffers to turn URLs to the\n repository the client asked for into the server side directory\n- path, using snprintf() to avoid overflowing these buffers, but\n+ paths, using snprintf() to avoid overflowing these buffers, but\n allowed possibly truncated paths to the directory. This has been\n- tightened to reject such a request that causes overlong path to be\n- required to serve.\n+ tightened to reject such a request that causes an overlong path to be\n+ served.\n (merge 6bdb0083be jk/daemon-path-ok-check-truncation later to maint).\n \n * Recent update to git-sh-setup (a library of shell functions that\n are used by our in-tree scripted Porcelain commands) included\n another shell library git-sh-i18n without specifying where it is,\n relying on the $PATH. This has been fixed to be more explicit by\n- prefixing $(git --exec-path) output in front.\n+ prefixing with $(git --exec-path) output.\n (merge 1073094f30 ak/sh-setup-dot-source-i18n-fix later to maint).\n \n * Fix for a racy false-positive test failure.\n@@ -578,7 +577,7 @@ notes for details).\n caused the command to segfault when on an unborn branch.\n (merge 84679d470d jc/for-each-ref-head-segfault-fix later to maint).\n \n- * \"git rebase -i\" did not work well with core.commentchar\n+ * \"git rebase -i\" did not work well with the core.commentchar\n configuration variable for two reasons, both of which have been\n fixed.\n (merge 882cd23777 js/rebase-i-commentchar-fix later to maint).\n-- \n2.10.2\n\n"},{"id":"306409","messageId":"e14747cd-f3ab-a840-f743-c72a15989aa1@kdbg.org","threadId":"44540","inReplyTo":"836824f5-79e5-fbbf-dfe0-78cc19af1fb2@xiplink.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc3","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2016-11-24T17:40:23Z","receivedAt":"2016-11-24T17:40:43Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 24.11.2016 um 17:25 schrieb Marc Branchaud:\n> On 2016-11-23 06:21 PM, Junio C Hamano wrote:\n>>\n>> * The original command line syntax for \"git merge\", which was \"git\n>> merge HEAD ...\", has been deprecated for quite some\n>> time, and \"git gui\" was the last in-tree user of the syntax. This\n>> is finally fixed, so that we can move forward with the deprecation.\n>\n> Is this still true, given j6t's recent patch at\n>\n> http://public-inbox.org/git/e61cc267-a59b-3be1-29db-c49d56f521f7@kdbg.org/T/\n\nIt is still true. The git-gui shipped with 2.11 does not depend on the \ndeprecated syntax. The deprecation can move forward.\n\nIn what ever way the regression will be fixed: we do not have to return \nto the deprecated syntax.\n\n-- Hannes\n\n"},{"id":"306524","messageId":"xmqqtwargnuo.fsf@gitster.mtv.corp.google.com","threadId":"44540","inReplyTo":"20161124165900.30605-1-marcnarc@xiplink.com","subject":"Re: [PATCH] Release note spelling and phrasing fixups.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-28T23:56:47Z","receivedAt":"2016-11-28T23:56:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Marc Branchaud writes:\n\n> Signed-off-by: Marc Branchaud \n> ---\n>\n> Mostly just missing words and what I feel are clarifications.\n>\n> The biggest change is to the \"git add -N\" item. Not 100% sure\n> I got it right.\n>\n> \t\tM.\n\n> - * When new paths were added by \"git add -N\" to the index, it was\n> - enough to circumvent the check by \"git commit\" to refrain from\n> - making an empty commit without \"--allow-empty\". The same logic\n> - prevented \"git status\" to show such a path as \"new file\" in the\n> + * \"git commit\" created an empty commit when invoked with an index\n> + consisting solely of intend-to-add paths (added with \"git add -N\").\n> + It now requires the \"--allow-empty\" option to create such a commit.\n> + The same logic prevented \"git status\" from showing such paths as \"new files\" in the\n> \"Changes not staged for commit\" section.\n\nYes this is much easier to read. Greatly appreciated.\n\n> * Codepaths that read from an on-disk loose object were too loose in\n> - validating what they are reading is a proper object file and\n> + validating that they are reading a proper object file and\n> sometimes read past the data they read from the disk, which has\n> been corrected. H/t to Gustavo Grieco for reporting.\n> ...\n> - * An author name, that spelled a backslash-quoted double quote in the\n> - human readable part \"My \\\"double quoted\\\" name\", was not unquoted\n> + * An author name that has a backslash-quoted double quote in the\n> + human readable part (\"My \\\"double quoted\\\" name\"), was not unquoted\n> correctly while applying a patch from a piece of e-mail.\n> ...\n> - * It is a common mistake to say \"git blame --reverse OLD path\",\n> - expecting that the command line is dwimmed as if asking how lines\n> + * \"git blame --reverse OLD path\" is now DWIMmed to show how lines\n> in path in an old revision OLD have survived up to the current\n> commit.\n> (merge e1d09701a4 jc/blame-reverse later to maint).\n> ...\n> * The \"submodule..path\" stored in .gitmodules is never copied\n> to .git/config and such a key in .git/config has no meaning, but\n> - the documentation described it and submodule..url next to\n> - each other as if both belong to .git/config. This has been fixed.\n> + the documentation described it next to submodule..url\n> + as if both belong to .git/config. This has been fixed.\n\nThese, too.\n\n> - * In a worktree connected to a repository elsewhere, created via \"git\n> + * In a worktree created via \"git\n> worktree\", \"git checkout\" attempts to protect users from confusion\n> by refusing to check out a branch that is already checked out in\n> another worktree. However, this also prevented checking out a\n> - branch, which is designated as the primary branch of a bare\n> + branch which is designated as the primary branch of a bare\n> reopsitory, in a worktree that is connected to the bare\n> repository. The check has been corrected to allow it.\n\nThis 'reopsitory' may already have been fixed ;-)\n\n ... goes and looks ...\n\nOops, no it hasn't. I'll patch it up while queuing this.\n\n> - * A hot-fix for a test added by a recent topic that went to both\n> + * Hot-fixed a test added by a recent topic that went to both\n> 'master' and 'maint' already.\n\nOops; an entry like this shouldn't have been in the release notes in\nthe first place, because those who are seeing the released versions\nwould have never seen such breakages. Will try to remember removing\nit.\n\nThanks, I missed this one completely even though you sent it out\nlast week and didn't have a chance to read it over before starting\ntoday's integration cycle.\n"},{"id":"306539","messageId":"20161129095725.13280-1-tklauser@distanz.ch","threadId":"44540","inReplyTo":"xmqqinrdlr3o.fsf@gitster.mtv.corp.google.com","subject":"[PATCH] RelNotes: typo fix in 2.11.0 notes","fromName":"Tobias Klauser","fromEmail":"tklauser@distanz.ch","sentAt":"2016-11-29T09:57:25Z","receivedAt":"2016-11-29T09:57:37Z","isPatch":true,"sender":{"key":"tklauser@distanz.ch","avatar":"https://avatars.githubusercontent.com/u/539708?v=4"},"body":"s/paht/path/ in the \"Backwards compatibility notes\" section of the\n2.11.0 release notes.\n\nSigned-off-by: Tobias Klauser \n---\n Documentation/RelNotes/2.11.0.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt\nindex b7b7dd361ef0..4c8a9be60f52 100644\n--- a/Documentation/RelNotes/2.11.0.txt\n+++ b/Documentation/RelNotes/2.11.0.txt\n@@ -5,7 +5,7 @@ Backward compatibility notes.\n \n * An empty string used as a pathspec element has always meant\n 'everything matches', but it is too easy to write a script that\n- finds a path to remove in $path and run 'git rm \"$paht\"' by\n+ finds a path to remove in $path and run 'git rm \"$path\"' by\n mistake (when the user meant to give \"$path\"), which ends up\n removing everything. This release starts warning about the\n use of an empty string that is used for 'everything matches' and\n-- \n2.11.0.rc3.5.g7cdf2ab.dirty\n\n\n"},{"id":"306551","messageId":"xmqqbmwygmmd.fsf@gitster.mtv.corp.google.com","threadId":"44540","inReplyTo":"20161129095725.13280-1-tklauser@distanz.ch","subject":"Re: [PATCH] RelNotes: typo fix in 2.11.0 notes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-29T18:35:38Z","receivedAt":"2016-11-29T18:36:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tobias Klauser writes:\n\n> s/paht/path/ in the \"Backwards compatibility notes\" section of the\n> 2.11.0 release notes.\n>\n> Signed-off-by: Tobias Klauser \n> ---\n\nThis looks somewhat familiar. Perhaps\n\n https://public-inbox.org/git/1477668782.1869.4.camel@seestieto.com/\n\n\n\n> Documentation/RelNotes/2.11.0.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt\n> index b7b7dd361ef0..4c8a9be60f52 100644\n> --- a/Documentation/RelNotes/2.11.0.txt\n> +++ b/Documentation/RelNotes/2.11.0.txt\n> @@ -5,7 +5,7 @@ Backward compatibility notes.\n> \n> * An empty string used as a pathspec element has always meant\n> 'everything matches', but it is too easy to write a script that\n> - finds a path to remove in $path and run 'git rm \"$paht\"' by\n> + finds a path to remove in $path and run 'git rm \"$path\"' by\n> mistake (when the user meant to give \"$path\"), which ends up\n> removing everything. This release starts warning about the\n> use of an empty string that is used for 'everything matches' and\n"},{"id":"306555","messageId":"20161129185017.GA22467@distanz.ch","threadId":"44540","inReplyTo":"xmqqbmwygmmd.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] RelNotes: typo fix in 2.11.0 notes","fromName":"Tobias Klauser","fromEmail":"tklauser@distanz.ch","sentAt":"2016-11-29T18:50:20Z","receivedAt":"2016-11-29T18:50:31Z","isPatch":true,"sender":{"key":"tklauser@distanz.ch","avatar":"https://avatars.githubusercontent.com/u/539708?v=4"},"body":"On 2016-11-29 at 19:35:38 +0100, Junio C Hamano wrote:\n> Tobias Klauser writes:\n> \n> > s/paht/path/ in the \"Backwards compatibility notes\" section of the\n> > 2.11.0 release notes.\n> >\n> > Signed-off-by: Tobias Klauser \n> > ---\n> \n> This looks somewhat familiar. Perhaps\n> \n> https://public-inbox.org/git/1477668782.1869.4.camel@seestieto.com/\n\nOops, certainly didn't read carefiul enough. Sorry for the noise and\nthanks for the reference.\n\n> > Documentation/RelNotes/2.11.0.txt | 2 +-\n> > 1 file changed, 1 insertion(+), 1 deletion(-)\n> >\n> > diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt\n> > index b7b7dd361ef0..4c8a9be60f52 100644\n> > --- a/Documentation/RelNotes/2.11.0.txt\n> > +++ b/Documentation/RelNotes/2.11.0.txt\n> > @@ -5,7 +5,7 @@ Backward compatibility notes.\n> > \n> > * An empty string used as a pathspec element has always meant\n> > 'everything matches', but it is too easy to write a script that\n> > - finds a path to remove in $path and run 'git rm \"$paht\"' by\n> > + finds a path to remove in $path and run 'git rm \"$path\"' by\n> > mistake (when the user meant to give \"$path\"), which ends up\n> > removing everything. This release starts warning about the\n> > use of an empty string that is used for 'everything matches' and\n> \n"}]}