{"thread":{"id":"44404","subject":"[ANNOUNCE] Git v2.11.0-rc0","startedAt":"2016-10-31T21:50:18Z","lastAt":"2016-11-02T21:45:14Z","messageCount":16,"participants":["Junio C Hamano","Simon Ruderich","Patrick Steinhardt","Jeff King","Stefan Beller","Jacob Keller","Michael Haggerty"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"305209","messageId":"xmqq1sywrxxl.fsf@gitster.mtv.corp.google.com","threadId":"44404","inReplyTo":null,"subject":"[ANNOUNCE] Git v2.11.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-10-31T21:49:42Z","receivedAt":"2016-10-31T21:50:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"An early preview release Git v2.11.0-rc0 is now available for\ntesting at the usual places.  It is comprised of 617 non-merge\ncommits since v2.10.0, contributed by 64 people, 14 of which are\nnew faces.\n\nAn updated, slightly slipped from the original, schedule is found at\nhttp://tinyurl.com/gitCal and I am hoping that we can conclude this\ncycle before US Thanksgiving.\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-rc0' 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, Mantas Mikulėnas,\n  Petr Stodulka, Satoshi Yasushima, Stefan Christ, Vegard Nossum,\n  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, Beat Bolli, brian m. carlson,\n  Chris Packham, Christian Couder, David Aguilar, David Turner,\n  Dennis Kaarsemaker, Dimitriy Ryazantcev, Elia Pinto, Eric Wong,\n  Jacob Keller, Jakub Narębski, 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,\n  Kevin Daudt, Kirill Smelkov, Lars Schneider, Linus Torvalds,\n  Matthieu Moy, Michael Haggerty, Michael J Gruber, Mike Ralphson,\n  Nguyễn Thái Ngọc Duy, Olaf Hering, Orgad Shaneh, Pat\n  Thoyts, Philip Oakley, Pranit Bauva, Ralf Thielow, Ray Chen,\n  René Scharfe, Ronnie Sahlberg, Stefan Beller, SZEDER Gábor,\n  Thomas Gummerer, 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 <msg> HEAD <commit>...\"\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 reopsitory 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 --resurse-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 presense 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\" was a short-hand for \"--subject-prefix=RFC PATCH\"\n   to help the participants of such projects.\n\n * \"git add --chmod=+x <pathspec>\" 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 hints that\n   lists the objects that begins 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<orderfile>\" to control the\n   order of paths to present to the end user.\n\n * \"git diff/log --ws-error-highlight=<kind>\" 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 to 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 <word>\" does not follow the usual disambiguation\n   rules when the <word> 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 <ptr,len> 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 <msg> HEAD <parent>...\", 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<HT>\" 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=<n>\" option was hard to use\n   correctly when making the history of an existing shallow clone\n   deeper.  A new option, \"--deepen=<n>\", has been added to make this\n   easier to use.  \"git clone\" also learned \"--shallow-since=<date>\"\n   and \"--shallow-exclude=<tag>\" 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 <paths>\" 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.<name>.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.<name>.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.<name>.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 <add@re.ss> # 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 * 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\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\nBeat Bolli (1):\n      SubmittingPatches: use gitk's \"Copy commit summary\" format\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\nChris Packham (1):\n      completion: support excluding refs\n\nChristian Couder (42):\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=<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\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<orderfile>\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 (2):\n      l10n: ru.po: update Russian translation\n      git-gui: 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-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[=<version>]\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 (109):\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=<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\nJiang Xin (1):\n      l10n: zh_CN: fixed some typos for git 2.10.0\n\nJohannes Schindelin (59):\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<pattern> 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\nJohannes Sixt (5):\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\nJonathan Nieder (1):\n      connect: tighten check for unexpected early hang up\n\nJonathan Tan (14):\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\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 (43):\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\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 (18):\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.<driver>.process option\n      convert: add filter.<driver>.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\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\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 <rev>^! 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 (5):\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\nRay Chen (1):\n      l10n: zh_CN: review for git v2.10.0 l10n\n\nRené Scharfe (34):\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\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.<name>.{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\nVasco Almeida (32):\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\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\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":"305218","messageId":"20161031231620.ewhdy2zwgzlczy5o@ruderich.org","threadId":"44404","inReplyTo":"xmqq1sywrxxl.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Simon Ruderich","fromEmail":"simon@ruderich.org","sentAt":"2016-10-31T23:16:21Z","receivedAt":"2016-10-31T23:16:28Z","isPatch":false,"sender":{"key":"simon@ruderich.org","avatar":"https://avatars.githubusercontent.com/u/390994?v=4"},"body":"On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:\n> [snip]\n\nHello,\n\nI noticed a few minor typos in the changelog.\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 reopsitory and a bit of math around the birthday\n                    ^^^^^^^^^^\n                    repository\n\n>    paradox.  The logic suggests to use 12 hexdigits for the Linux\n>    kernel, and 9 to 10 for Git itself.\n>\n>\n> Updates since v2.10\n> -------------------\n>\n> [snip]\n>\n>  * \"git clone --resurse-submodules --reference $path $URL\" is a way to\n                  ^^^^^^^\n                  recurse\n\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 presense of corresponding\n                                         ^^^^^^^^\n                                         presence\n\n> [snip]\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\nMaybe the name of the command line option should be added here.\n\nRegards\nSimon\n-- \n+ privacy is necessary\n+ using gnupg http://gnupg.org\n+ public key id: 0x92FEFDB7E44C32F9\n"},{"id":"305223","messageId":"20161101090726.GA478@pks-pc","threadId":"44404","inReplyTo":"xmqq1sywrxxl.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2016-11-01T09:07:26Z","receivedAt":"2016-11-01T09:08:01Z","isPatch":false,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"Hi Junio,\n\nOn Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:\n[snip]\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\" was a short-hand for \"--subject-prefix=RFC PATCH\"\n                        ~~~\n>    to help the participants of such projects.\n\nThis should probably be 'A new option \"--rfc\" was introduced as a\nshort-hand for…' or similar.\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 hints that\n>    lists the objects that begins 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\nI think \"This error is now accompanied by a hint that lists the\nobjects beginning with the given prefix.\" would be grammatically\nmore correct.\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 to adjacent\n                                                           ~~\n>    hunks, but the code forgot to do so in some cases.\n\nThis should probably be \"_two_ adjacent hunks\".\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     ~~~~~~~~~~\n>    repository.  The check has been corrected to allow it.\n\nThere's a typo here in \"reopsitory\".\n\n\nRegards\nPatrick Steinhardt\n"},{"id":"305256","messageId":"20161101203637.3jr73wwpfal4brho@sigill.intra.peff.net","threadId":"44404","inReplyTo":"xmqq1sywrxxl.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-01T20:36:37Z","receivedAt":"2016-11-01T20:36:45Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:\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\nI'm not sure we ever resolved all the discussion around options and\ndefaults here.\n\nAs of -rc0, we have both --indent-heuristic and --compaction-heuristic\n(along with matching config), and they are mutually exclusive.\n\nIn [1], Stefan suggested just replacing the compaction heuristic\nentirely with the new one (and you seemed to agree). If we're going to\ndo that, it makes sense to do so before the release, so that we don't\nget stuck supporting --indent-heuristic forever.\n\nWe also discussed making this the default (e.g., in [2]). Did we want to\ndo that before the release? If so, it would have been nice to flip it on\nduring -rc0 to get more exposure, but perhaps -rc1 would not be too\nlate. That's less critical than resolving the indent/compaction thing,\nthough it potentially means we could rip out the config entirely and\njust leave the command-line option (as an escape hatch and debugging\ntool).\n\n-Peff\n\n[1] http://public-inbox.org/git/CAGZ79kaMSkRfkBng_Epq+2T_q--VkKQ6-m=M_jPkzeYcxuDKWA@mail.gmail.com/\n\n[2] http://public-inbox.org/git/CA+P7+xrsz27Hhk12dwDrUEpn0L7R8F5z-XASS2JkoY6sqK7u5A@mail.gmail.com/\n"},{"id":"305258","messageId":"CAGZ79ka2ddH0WDUyWfKhg4mULY-VwYFvZ11E5pQX6tXUqBeUGA@mail.gmail.com","threadId":"44404","inReplyTo":"xmqq1sywrxxl.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2016-11-01T20:43:27Z","receivedAt":"2016-11-01T20:43:46Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":">  * \"git clone --resurse-submodules --reference $path $URL\" is a way to\n\n\"recurse\"\n"},{"id":"305261","messageId":"xmqqlgx2or5p.fsf@gitster.mtv.corp.google.com","threadId":"44404","inReplyTo":"20161101203637.3jr73wwpfal4brho@sigill.intra.peff.net","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-01T20:56:34Z","receivedAt":"2016-11-01T20:56:41Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:\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> I'm not sure we ever resolved all the discussion around options and\n> defaults here.\n>\n> As of -rc0, we have both --indent-heuristic and --compaction-heuristic\n> (along with matching config), and they are mutually exclusive.\n>\n> In [1], Stefan suggested just replacing the compaction heuristic\n> entirely with the new one (and you seemed to agree). If we're going to\n> do that, it makes sense to do so before the release, so that we don't\n> get stuck supporting --indent-heuristic forever.\n\nYou meant \"compaction\" in the last part?  I think it is probably a\ngood idea.\n\nI'd vote for just removing compaction-heuristic while keeping the\nindent-heuristic with experimental label and knobs and keeping it\noff by default for a while.\n\nThanks for bringing it up.\n"},{"id":"305262","messageId":"20161101205916.d74n6lhgp2hexpzr@sigill.intra.peff.net","threadId":"44404","inReplyTo":"xmqqlgx2or5p.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-01T20:59:16Z","receivedAt":"2016-11-01T20:59:24Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote:\n\n> > As of -rc0, we have both --indent-heuristic and --compaction-heuristic\n> > (along with matching config), and they are mutually exclusive.\n> >\n> > In [1], Stefan suggested just replacing the compaction heuristic\n> > entirely with the new one (and you seemed to agree). If we're going to\n> > do that, it makes sense to do so before the release, so that we don't\n> > get stuck supporting --indent-heuristic forever.\n> \n> You meant \"compaction\" in the last part?  I think it is probably a\n> good idea.\n\nI thought the plan mentioned in the mail I linked was to keep the indent\nheuristic, but simply _call_ it the compaction heuristic. IOW, to swap\nout the implementation under the hood for something we know is better.\n\nWe've already released a version with --compaction-heuristic, so we are\nstuck keeping it forever either way.\n\n> I'd vote for just removing compaction-heuristic while keeping the\n> indent-heuristic with experimental label and knobs and keeping it\n> off by default for a while.\n\nSo the matching variant of that plan would be to drop the internals of\ncompaction-heuristic, swap in the new heuristic instead, and then drop\nall of the --indent-heuristic. It remains off by default, but we may\nflip that in a later release.\n\n-Peff\n"},{"id":"305265","messageId":"xmqqh97qoqq2.fsf@gitster.mtv.corp.google.com","threadId":"44404","inReplyTo":"20161101205916.d74n6lhgp2hexpzr@sigill.intra.peff.net","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-01T21:05:57Z","receivedAt":"2016-11-01T21:06:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> We've already released a version with --compaction-heuristic, so we are\n> stuck keeping it forever either way.\n\nWhile I do not necessarily agree with this conclusion (we've already\nreleased it labelled as experimental; can't we freely take it\naway?), that may be of lessor impact.  I like it better.\n\nIf it involves renaming and swapping, however, we may be talking\nabout a change that we cannot deliver with confidence in less than a\nweek before -rc1, which sounds, eh, suboptimal.\n\nFWIW, here is how the removal of compaction without renaming looks\nlike.\n\n Documentation/diff-heuristic-options.txt |  2 --\n builtin/blame.c                          |  3 +--\n diff.c                                   | 23 +++--------------------\n git-add--interactive.perl                |  3 ---\n xdiff/xdiff.h                            |  3 +--\n xdiff/xdiffi.c                           | 15 ---------------\n 6 files changed, 5 insertions(+), 44 deletions(-)\n\ndiff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt\nindex 36cb549df9..d4f3d95505 100644\n--- a/Documentation/diff-heuristic-options.txt\n+++ b/Documentation/diff-heuristic-options.txt\n@@ -1,7 +1,5 @@\n --indent-heuristic::\n --no-indent-heuristic::\n---compaction-heuristic::\n---no-compaction-heuristic::\n \tThese are to help debugging and tuning experimental heuristics\n \t(which are off by default) that shift diff hunk boundaries to\n \tmake patches easier to read.\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 4ddfadb71f..f45416a6c3 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -2597,7 +2597,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \t\t * output:\n \t\t */\n \t\t{ OPTION_LOWLEVEL_CALLBACK, 0, \"indent-heuristic\", NULL, NULL, N_(\"Use an experimental indent-based heuristic to improve diffs\"), PARSE_OPT_NOARG, parse_opt_unknown_cb },\n-\t\t{ OPTION_LOWLEVEL_CALLBACK, 0, \"compaction-heuristic\", NULL, NULL, N_(\"Use an experimental blank-line-based heuristic to improve diffs\"), PARSE_OPT_NOARG, parse_opt_unknown_cb },\n \n \t\tOPT_BIT(0, \"minimal\", &xdl_opts, N_(\"Spend extra cycles to find better match\"), XDF_NEED_MINIMAL),\n \t\tOPT_STRING('S', NULL, &revs_file, N_(\"file\"), N_(\"Use revisions from <file> instead of calling git-rev-list\")),\n@@ -2645,7 +2644,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \t}\n parse_done:\n \tno_whole_file_rename = !DIFF_OPT_TST(&revs.diffopt, FOLLOW_RENAMES);\n-\txdl_opts |= revs.diffopt.xdl_opts & (XDF_COMPACTION_HEURISTIC | XDF_INDENT_HEURISTIC);\n+\txdl_opts |= revs.diffopt.xdl_opts & XDF_INDENT_HEURISTIC;\n \tDIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES);\n \targc = parse_options_end(&ctx);\n \ndiff --git a/diff.c b/diff.c\nindex 8981477c43..741ce8c68d 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -28,7 +28,6 @@\n \n static int diff_detect_rename_default;\n static int diff_indent_heuristic; /* experimental */\n-static int diff_compaction_heuristic; /* experimental */\n static int diff_rename_limit_default = 400;\n static int diff_suppress_blank_empty;\n static int diff_use_color_default = -1;\n@@ -223,16 +222,8 @@ void init_diff_ui_defaults(void)\n \n int git_diff_heuristic_config(const char *var, const char *value, void *cb)\n {\n-\tif (!strcmp(var, \"diff.indentheuristic\")) {\n+\tif (!strcmp(var, \"diff.indentheuristic\"))\n \t\tdiff_indent_heuristic = git_config_bool(var, value);\n-\t\tif (diff_indent_heuristic)\n-\t\t\tdiff_compaction_heuristic = 0;\n-\t}\n-\tif (!strcmp(var, \"diff.compactionheuristic\")) {\n-\t\tdiff_compaction_heuristic = git_config_bool(var, value);\n-\t\tif (diff_compaction_heuristic)\n-\t\t\tdiff_indent_heuristic = 0;\n-\t}\n \treturn 0;\n }\n \n@@ -3380,8 +3371,6 @@ void diff_setup(struct diff_options *options)\n \toptions->xdl_opts |= diff_algorithm;\n \tif (diff_indent_heuristic)\n \t\tDIFF_XDL_SET(options, INDENT_HEURISTIC);\n-\telse if (diff_compaction_heuristic)\n-\t\tDIFF_XDL_SET(options, COMPACTION_HEURISTIC);\n \n \toptions->orderfile = diff_order_file_cfg;\n \n@@ -3876,16 +3865,10 @@ int diff_opt_parse(struct diff_options *options,\n \t\tDIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);\n \telse if (!strcmp(arg, \"--ignore-blank-lines\"))\n \t\tDIFF_XDL_SET(options, IGNORE_BLANK_LINES);\n-\telse if (!strcmp(arg, \"--indent-heuristic\")) {\n+\telse if (!strcmp(arg, \"--indent-heuristic\"))\n \t\tDIFF_XDL_SET(options, INDENT_HEURISTIC);\n-\t\tDIFF_XDL_CLR(options, COMPACTION_HEURISTIC);\n-\t} else if (!strcmp(arg, \"--no-indent-heuristic\"))\n-\t\tDIFF_XDL_CLR(options, INDENT_HEURISTIC);\n-\telse if (!strcmp(arg, \"--compaction-heuristic\")) {\n-\t\tDIFF_XDL_SET(options, COMPACTION_HEURISTIC);\n+\telse if (!strcmp(arg, \"--no-indent-heuristic\"))\n \t\tDIFF_XDL_CLR(options, INDENT_HEURISTIC);\n-\t} else if (!strcmp(arg, \"--no-compaction-heuristic\"))\n-\t\tDIFF_XDL_CLR(options, COMPACTION_HEURISTIC);\n \telse if (!strcmp(arg, \"--patience\"))\n \t\toptions->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);\n \telse if (!strcmp(arg, \"--histogram\"))\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex ee3d812695..5a55d80b9d 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -46,7 +46,6 @@\n \n my $diff_algorithm = $repo->config('diff.algorithm');\n my $diff_indent_heuristic = $repo->config_bool('diff.indentheuristic');\n-my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic');\n my $diff_filter = $repo->config('interactive.difffilter');\n \n my $use_readkey = 0;\n@@ -753,8 +752,6 @@ sub parse_diff {\n \t}\n \tif ($diff_indent_heuristic) {\n \t\tsplice @diff_cmd, 1, 0, \"--indent-heuristic\";\n-\t} elsif ($diff_compaction_heuristic) {\n-\t\tsplice @diff_cmd, 1, 0, \"--compaction-heuristic\";\n \t}\n \tif (defined $patch_mode_revision) {\n \t\tpush @diff_cmd, get_diff_reference($patch_mode_revision);\ndiff --git a/xdiff/xdiff.h b/xdiff/xdiff.h\nindex 8db16d4ae6..b090ad8eac 100644\n--- a/xdiff/xdiff.h\n+++ b/xdiff/xdiff.h\n@@ -41,8 +41,7 @@ extern \"C\" {\n \n #define XDF_IGNORE_BLANK_LINES (1 << 7)\n \n-#define XDF_COMPACTION_HEURISTIC (1 << 8)\n-#define XDF_INDENT_HEURISTIC (1 << 9)\n+#define XDF_INDENT_HEURISTIC (1 << 8)\n \n #define XDL_EMIT_FUNCNAMES (1 << 0)\n #define XDL_EMIT_FUNCCONTEXT (1 << 2)\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 760fbb6db7..f9be87fdfb 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -906,21 +906,6 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n \t\t\t\tif (group_previous(xdfo, &go))\n \t\t\t\t\txdl_bug(\"group sync broken sliding to match\");\n \t\t\t}\n-\t\t} else if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {\n-\t\t\t/*\n-\t\t\t * Compaction heuristic: if it is possible to shift the\n-\t\t\t * group to make its bottom line a blank line, do so.\n-\t\t\t *\n-\t\t\t * As we already shifted the group forward as far as\n-\t\t\t * possible in the earlier loop, we only need to handle\n-\t\t\t * backward shifts, not forward ones.\n-\t\t\t */\n-\t\t\twhile (!is_blank_line(xdf->recs[g.end - 1], flags)) {\n-\t\t\t\tif (group_slide_up(xdf, &g, flags))\n-\t\t\t\t\txdl_bug(\"blank line disappeared\");\n-\t\t\t\tif (group_previous(xdfo, &go))\n-\t\t\t\t\txdl_bug(\"group sync broken sliding to blank line\");\n-\t\t\t}\n \t\t} else if (flags & XDF_INDENT_HEURISTIC) {\n \t\t\t/*\n \t\t\t * Indent heuristic: a group of pure add/delete lines\n"},{"id":"305266","messageId":"CAGZ79ka6un7nHaNk3F8yp3vFSnB-iGapqLcZ-ZC3EvcKE4DMNQ@mail.gmail.com","threadId":"44404","inReplyTo":"20161101205916.d74n6lhgp2hexpzr@sigill.intra.peff.net","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2016-11-01T21:10:06Z","receivedAt":"2016-11-01T21:11:05Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Tue, Nov 1, 2016 at 1:59 PM, Jeff King <peff@peff.net> wrote:\n> On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote:\n>\n>> > As of -rc0, we have both --indent-heuristic and --compaction-heuristic\n>> > (along with matching config), and they are mutually exclusive.\n>> >\n>> > In [1], Stefan suggested just replacing the compaction heuristic\n>> > entirely with the new one (and you seemed to agree). If we're going to\n>> > do that, it makes sense to do so before the release, so that we don't\n>> > get stuck supporting --indent-heuristic forever.\n>>\n>> You meant \"compaction\" in the last part?  I think it is probably a\n>> good idea.\n>\n> I thought the plan mentioned in the mail I linked was to keep the indent\n> heuristic, but simply _call_ it the compaction heuristic. IOW, to swap\n> out the implementation under the hood for something we know is better.\n\nAFAICT Michaels design is better in every aspect than what I did initially,\nso it supersedes the work I did there.  I would support the swap in names.\n\n>\n> We've already released a version with --compaction-heuristic, so we are\n> stuck keeping it forever either way.\n\nIIRC the release notes specifically noted this flag to be experimental and\nmay be removed in future versions.\n\nWhen not doing the swap of the implementation, but rather remove the\nexperimental feature of compaction-heuristic and introducing a *new*\nexperimental --indent-heuristic, this may drive the point across that\nthese names are actually experimental.\n"},{"id":"305269","messageId":"xmqqzilinanp.fsf@gitster.mtv.corp.google.com","threadId":"44404","inReplyTo":"xmqqh97qoqq2.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-01T21:38:18Z","receivedAt":"2016-11-01T21:38:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> If it involves renaming and swapping, however, we may be talking\n> about a change that we cannot deliver with confidence in less than a\n> week before -rc1, which sounds, eh, suboptimal.\n>\n> FWIW, here is how the removal of compaction without renaming looks\n> like.\n\nAnd here is _with_ renaming.  I think \"compaction heuristics\" is a\nmuch better phrase to call \"heuristics used during the diff hunk\ncompaction process\" without specifying how that heuristics work\n(like taking hints in the indentation levels).  If we are to retire\none while keeping the other, compaction-heuristics should be the\nname we give and keep for the surviving one.\n\nI have not much confidence in the conversion result, though.\n\n Documentation/diff-config.txt            |  1 -\n Documentation/diff-heuristic-options.txt |  2 --\n builtin/blame.c                          |  3 +--\n diff.c                                   | 25 ++++-----------------\n git-add--interactive.perl                |  5 +----\n t/t4061-diff-indent.sh                   | 38 ++++++++++++++++----------------\n xdiff/xdiff.h                            |  1 -\n xdiff/xdiffi.c                           | 17 +-------------\n 8 files changed, 26 insertions(+), 66 deletions(-)\n\ndiff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt\nindex 58f4bd6afa..0c79e48d9d 100644\n--- a/Documentation/diff-config.txt\n+++ b/Documentation/diff-config.txt\n@@ -171,7 +171,6 @@ diff.tool::\n \n include::mergetools-diff.txt[]\n \n-diff.indentHeuristic::\n diff.compactionHeuristic::\n \tSet one of these options to `true` to enable one of two\n \texperimental heuristics that shift diff hunk boundaries to\ndiff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt\nindex 36cb549df9..3cb024aa22 100644\n--- a/Documentation/diff-heuristic-options.txt\n+++ b/Documentation/diff-heuristic-options.txt\n@@ -1,5 +1,3 @@\n---indent-heuristic::\n---no-indent-heuristic::\n --compaction-heuristic::\n --no-compaction-heuristic::\n \tThese are to help debugging and tuning experimental heuristics\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 4ddfadb71f..395d4011fb 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -2596,7 +2596,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \t\t * and are only included here to get included in the \"-h\"\n \t\t * output:\n \t\t */\n-\t\t{ OPTION_LOWLEVEL_CALLBACK, 0, \"indent-heuristic\", NULL, NULL, N_(\"Use an experimental indent-based heuristic to improve diffs\"), PARSE_OPT_NOARG, parse_opt_unknown_cb },\n \t\t{ OPTION_LOWLEVEL_CALLBACK, 0, \"compaction-heuristic\", NULL, NULL, N_(\"Use an experimental blank-line-based heuristic to improve diffs\"), PARSE_OPT_NOARG, parse_opt_unknown_cb },\n \n \t\tOPT_BIT(0, \"minimal\", &xdl_opts, N_(\"Spend extra cycles to find better match\"), XDF_NEED_MINIMAL),\n@@ -2645,7 +2644,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \t}\n parse_done:\n \tno_whole_file_rename = !DIFF_OPT_TST(&revs.diffopt, FOLLOW_RENAMES);\n-\txdl_opts |= revs.diffopt.xdl_opts & (XDF_COMPACTION_HEURISTIC | XDF_INDENT_HEURISTIC);\n+\txdl_opts |= revs.diffopt.xdl_opts & XDF_COMPACTION_HEURISTIC;\n \tDIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES);\n \targc = parse_options_end(&ctx);\n \ndiff --git a/diff.c b/diff.c\nindex 8981477c43..f1b01f5b1e 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -27,7 +27,6 @@\n #endif\n \n static int diff_detect_rename_default;\n-static int diff_indent_heuristic; /* experimental */\n static int diff_compaction_heuristic; /* experimental */\n static int diff_rename_limit_default = 400;\n static int diff_suppress_blank_empty;\n@@ -223,16 +222,8 @@ void init_diff_ui_defaults(void)\n \n int git_diff_heuristic_config(const char *var, const char *value, void *cb)\n {\n-\tif (!strcmp(var, \"diff.indentheuristic\")) {\n-\t\tdiff_indent_heuristic = git_config_bool(var, value);\n-\t\tif (diff_indent_heuristic)\n-\t\t\tdiff_compaction_heuristic = 0;\n-\t}\n-\tif (!strcmp(var, \"diff.compactionheuristic\")) {\n+\tif (!strcmp(var, \"diff.compactionheuristic\"))\n \t\tdiff_compaction_heuristic = git_config_bool(var, value);\n-\t\tif (diff_compaction_heuristic)\n-\t\t\tdiff_indent_heuristic = 0;\n-\t}\n \treturn 0;\n }\n \n@@ -3378,9 +3369,7 @@ void diff_setup(struct diff_options *options)\n \toptions->use_color = diff_use_color_default;\n \toptions->detect_rename = diff_detect_rename_default;\n \toptions->xdl_opts |= diff_algorithm;\n-\tif (diff_indent_heuristic)\n-\t\tDIFF_XDL_SET(options, INDENT_HEURISTIC);\n-\telse if (diff_compaction_heuristic)\n+\tif (diff_compaction_heuristic)\n \t\tDIFF_XDL_SET(options, COMPACTION_HEURISTIC);\n \n \toptions->orderfile = diff_order_file_cfg;\n@@ -3876,15 +3865,9 @@ int diff_opt_parse(struct diff_options *options,\n \t\tDIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);\n \telse if (!strcmp(arg, \"--ignore-blank-lines\"))\n \t\tDIFF_XDL_SET(options, IGNORE_BLANK_LINES);\n-\telse if (!strcmp(arg, \"--indent-heuristic\")) {\n-\t\tDIFF_XDL_SET(options, INDENT_HEURISTIC);\n-\t\tDIFF_XDL_CLR(options, COMPACTION_HEURISTIC);\n-\t} else if (!strcmp(arg, \"--no-indent-heuristic\"))\n-\t\tDIFF_XDL_CLR(options, INDENT_HEURISTIC);\n-\telse if (!strcmp(arg, \"--compaction-heuristic\")) {\n+\telse if (!strcmp(arg, \"--compaction-heuristic\"))\n \t\tDIFF_XDL_SET(options, COMPACTION_HEURISTIC);\n-\t\tDIFF_XDL_CLR(options, INDENT_HEURISTIC);\n-\t} else if (!strcmp(arg, \"--no-compaction-heuristic\"))\n+\telse if (!strcmp(arg, \"--no-compaction-heuristic\"))\n \t\tDIFF_XDL_CLR(options, COMPACTION_HEURISTIC);\n \telse if (!strcmp(arg, \"--patience\"))\n \t\toptions->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex ee3d812695..642cce1ac6 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -45,7 +45,6 @@\n my $normal_color = $repo->get_color(\"\", \"reset\");\n \n my $diff_algorithm = $repo->config('diff.algorithm');\n-my $diff_indent_heuristic = $repo->config_bool('diff.indentheuristic');\n my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic');\n my $diff_filter = $repo->config('interactive.difffilter');\n \n@@ -751,9 +750,7 @@ sub parse_diff {\n \tif (defined $diff_algorithm) {\n \t\tsplice @diff_cmd, 1, 0, \"--diff-algorithm=${diff_algorithm}\";\n \t}\n-\tif ($diff_indent_heuristic) {\n-\t\tsplice @diff_cmd, 1, 0, \"--indent-heuristic\";\n-\t} elsif ($diff_compaction_heuristic) {\n+\tif ($diff_compaction_heuristic) {\n \t\tsplice @diff_cmd, 1, 0, \"--compaction-heuristic\";\n \t}\n \tif (defined $patch_mode_revision) {\ndiff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh\nindex 556450609b..30f809d0d3 100755\n--- a/t/t4061-diff-indent.sh\n+++ b/t/t4061-diff-indent.sh\n@@ -1,6 +1,6 @@\n #!/bin/sh\n \n-test_description='Test diff indent heuristic.\n+test_description='Test diff compaction heuristic.\n \n '\n . ./test-lib.sh\n@@ -157,28 +157,28 @@ test_expect_success 'diff: ugly spaces' '\n \tcompare_diff spaces-expect out\n '\n \n-test_expect_success 'diff: nice spaces with --indent-heuristic' '\n-\tgit diff --indent-heuristic old new -- spaces.txt >out-compacted &&\n+test_expect_success 'diff: nice spaces with --compaction-heuristic' '\n+\tgit diff --compaction-heuristic old new -- spaces.txt >out-compacted &&\n \tcompare_diff spaces-compacted-expect out-compacted\n '\n \n-test_expect_success 'diff: nice spaces with diff.indentHeuristic' '\n-\tgit -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&\n+test_expect_success 'diff: nice spaces with diff.compactionHeuristic' '\n+\tgit -c diff.compactionHeuristic=true diff old new -- spaces.txt >out-compacted2 &&\n \tcompare_diff spaces-compacted-expect out-compacted2\n '\n \n-test_expect_success 'diff: --no-indent-heuristic overrides config' '\n-\tgit -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&\n+test_expect_success 'diff: --no-compaction-heuristic overrides config' '\n+\tgit -c diff.compactionHeuristic=true diff --no-compaction-heuristic old new -- spaces.txt >out2 &&\n \tcompare_diff spaces-expect out2\n '\n \n-test_expect_success 'diff: --indent-heuristic with --patience' '\n-\tgit diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&\n+test_expect_success 'diff: --compaction-heuristic with --patience' '\n+\tgit diff --compaction-heuristic --patience old new -- spaces.txt >out-compacted3 &&\n \tcompare_diff spaces-compacted-expect out-compacted3\n '\n \n-test_expect_success 'diff: --indent-heuristic with --histogram' '\n-\tgit diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 &&\n+test_expect_success 'diff: --compaction-heuristic with --histogram' '\n+\tgit diff --compaction-heuristic --histogram old new -- spaces.txt >out-compacted4 &&\n \tcompare_diff spaces-compacted-expect out-compacted4\n '\n \n@@ -187,8 +187,8 @@ test_expect_success 'diff: ugly functions' '\n \tcompare_diff functions-expect out\n '\n \n-test_expect_success 'diff: nice functions with --indent-heuristic' '\n-\tgit diff --indent-heuristic old new -- functions.c >out-compacted &&\n+test_expect_success 'diff: nice functions with --compaction-heuristic' '\n+\tgit diff --compaction-heuristic old new -- functions.c >out-compacted &&\n \tcompare_diff functions-compacted-expect out-compacted\n '\n \n@@ -197,18 +197,18 @@ test_expect_success 'blame: ugly spaces' '\n \tcompare_blame spaces-expect out-blame\n '\n \n-test_expect_success 'blame: nice spaces with --indent-heuristic' '\n-\tgit blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&\n+test_expect_success 'blame: nice spaces with --compaction-heuristic' '\n+\tgit blame --compaction-heuristic old..new -- spaces.txt >out-blame-compacted &&\n \tcompare_blame spaces-compacted-expect out-blame-compacted\n '\n \n-test_expect_success 'blame: nice spaces with diff.indentHeuristic' '\n-\tgit -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&\n+test_expect_success 'blame: nice spaces with diff.compactionHeuristic' '\n+\tgit -c diff.compactionHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&\n \tcompare_blame spaces-compacted-expect out-blame-compacted2\n '\n \n-test_expect_success 'blame: --no-indent-heuristic overrides config' '\n-\tgit -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame2 &&\n+test_expect_success 'blame: --no-compaction-heuristic overrides config' '\n+\tgit -c diff.compactionHeuristic=true blame --no-compaction-heuristic old..new -- spaces.txt >out-blame2 &&\n \tgit blame old..new -- spaces.txt >out-blame &&\n \tcompare_blame spaces-expect out-blame2\n '\ndiff --git a/xdiff/xdiff.h b/xdiff/xdiff.h\nindex 8db16d4ae6..7423f77fc8 100644\n--- a/xdiff/xdiff.h\n+++ b/xdiff/xdiff.h\n@@ -42,7 +42,6 @@ extern \"C\" {\n #define XDF_IGNORE_BLANK_LINES (1 << 7)\n \n #define XDF_COMPACTION_HEURISTIC (1 << 8)\n-#define XDF_INDENT_HEURISTIC (1 << 9)\n \n #define XDL_EMIT_FUNCNAMES (1 << 0)\n #define XDL_EMIT_FUNCCONTEXT (1 << 2)\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 760fbb6db7..6cb96219cb 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -906,22 +906,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n \t\t\t\tif (group_previous(xdfo, &go))\n \t\t\t\t\txdl_bug(\"group sync broken sliding to match\");\n \t\t\t}\n-\t\t} else if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {\n-\t\t\t/*\n-\t\t\t * Compaction heuristic: if it is possible to shift the\n-\t\t\t * group to make its bottom line a blank line, do so.\n-\t\t\t *\n-\t\t\t * As we already shifted the group forward as far as\n-\t\t\t * possible in the earlier loop, we only need to handle\n-\t\t\t * backward shifts, not forward ones.\n-\t\t\t */\n-\t\t\twhile (!is_blank_line(xdf->recs[g.end - 1], flags)) {\n-\t\t\t\tif (group_slide_up(xdf, &g, flags))\n-\t\t\t\t\txdl_bug(\"blank line disappeared\");\n-\t\t\t\tif (group_previous(xdfo, &go))\n-\t\t\t\t\txdl_bug(\"group sync broken sliding to blank line\");\n-\t\t\t}\n-\t\t} else if (flags & XDF_INDENT_HEURISTIC) {\n+\t\t} else if (flags & XDF_COMPACTION_HEURISTIC) {\n \t\t\t/*\n \t\t\t * Indent heuristic: a group of pure add/delete lines\n \t\t\t * implies two splits, one between the end of the \"before\"\n"},{"id":"305270","messageId":"CAGZ79kZHajTxFRbOftH==UAXhbH7RSA_jYWO-aQXhW2aSRdUFA@mail.gmail.com","threadId":"44404","inReplyTo":"xmqqzilinanp.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2016-11-01T21:41:35Z","receivedAt":"2016-11-01T21:41:42Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Tue, Nov 1, 2016 at 2:38 PM, Junio C Hamano <gitster@pobox.com> wrote:\n\n\n>\n> -diff.indentHeuristic::\n>  diff.compactionHeuristic::\n>         Set one of these options to `true` to enable one of two\n>         experimental heuristics that shift diff hunk boundaries to\n\nWe would need to reword this as well, as there will be only one heuristic left?\n\n\n> --- a/xdiff/xdiffi.c\n> +++ b/xdiff/xdiffi.c\n> @@ -906,22 +906,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n>                                 if (group_previous(xdfo, &go))\n>                                         xdl_bug(\"group sync broken sliding to match\");\n>                         }\n> -               } else if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {\n> -                       /*\n> -                        * Compaction heuristic: if it is possible to shift the\n> -                        * group to make its bottom line a blank line, do so.\n> -                        *\n> -                        * As we already shifted the group forward as far as\n> -                        * possible in the earlier loop, we only need to handle\n> -                        * backward shifts, not forward ones.\n> -                        */\n> -                       while (!is_blank_line(xdf->recs[g.end - 1], flags)) {\n> -                               if (group_slide_up(xdf, &g, flags))\n> -                                       xdl_bug(\"blank line disappeared\");\n> -                               if (group_previous(xdfo, &go))\n> -                                       xdl_bug(\"group sync broken sliding to blank line\");\n> -                       }\n> -               } else if (flags & XDF_INDENT_HEURISTIC) {\n> +               } else if (flags & XDF_COMPACTION_HEURISTIC) {\n>                         /*\n>                          * Indent heuristic: a group of pure add/delete lines\n\nThis comment may need adjustment as well (though we could go without)\n\n>                          * implies two splits, one between the end of the \"before\"\n"},{"id":"305271","messageId":"xmqqvaw6nac0.fsf@gitster.mtv.corp.google.com","threadId":"44404","inReplyTo":"xmqqzilinanp.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-01T21:45:19Z","receivedAt":"2016-11-01T21:45:26Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> And here is _with_ renaming.  I think \"compaction heuristics\" is a\n> much better phrase to call \"heuristics used during the diff hunk\n> compaction process\" without specifying how that heuristics work\n> (like taking hints in the indentation levels).  If we are to retire\n> one while keeping the other, compaction-heuristics should be the\n> name we give and keep for the surviving one.\n>\n> I have not much confidence in the conversion result, though.\n\nI'll queue it on 'pu' for now, before I go offline for a few days,\nwith the following log message:\n\n    diff: retire the original experimental \"compaction\" heuristics\n    \n    This retires the experimental \"compaction\" heuristics but with a\n    twist.  It removes the mention of \"indent\" heuristics, which was a\n    competing experiment, from everywhere, guts the core logic of the\n    original \"compaction\" heuristics out and replaces it with the logic\n    used by the \"indent\" heuristics.\n    \n    The externally visible effect of this change is that people who have\n    been experimenting by setting diff.compactionHeuristic configuration\n    or giving the command line option --compaction-heuristic will start\n    getting the behaviour based on the improved heuristics that used to\n    be called \"indent\" heuristics.\n    \n    Suggested-by: Jeff King <peff@peff.net>\n    Signed-off-by: Junio C Hamano <gitster@pobox.com>\n"},{"id":"305272","messageId":"20161101215052.3yallsyvqvx6wcu2@sigill.intra.peff.net","threadId":"44404","inReplyTo":"xmqqvaw6nac0.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-01T21:50:52Z","receivedAt":"2016-11-01T21:50:59Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 01, 2016 at 02:45:19PM -0700, Junio C Hamano wrote:\n\n> Junio C Hamano <gitster@pobox.com> writes:\n> \n> > And here is _with_ renaming.  I think \"compaction heuristics\" is a\n> > much better phrase to call \"heuristics used during the diff hunk\n> > compaction process\" without specifying how that heuristics work\n> > (like taking hints in the indentation levels).  If we are to retire\n> > one while keeping the other, compaction-heuristics should be the\n> > name we give and keep for the surviving one.\n> >\n> > I have not much confidence in the conversion result, though.\n> \n> I'll queue it on 'pu' for now, before I go offline for a few days,\n> with the following log message:\n\nThanks. I think this is good, with the exception of the \"One of these\"\nbits that remains in diff-config.txt.\n\nI think Michael is OK with this approach based on previous discussions,\nbut we should get his Ack, too.\n\n-Peff\n"},{"id":"305273","messageId":"xmqqr36un9d2.fsf@gitster.mtv.corp.google.com","threadId":"44404","inReplyTo":"CAGZ79kZHajTxFRbOftH==UAXhbH7RSA_jYWO-aQXhW2aSRdUFA@mail.gmail.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-01T22:06:17Z","receivedAt":"2016-11-01T22:06:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n>> -diff.indentHeuristic::\n>>  diff.compactionHeuristic::\n>>         Set one of these options to `true` to enable one of two\n>>         experimental heuristics that shift diff hunk boundaries to\n>\n> We would need to reword this as well, as there will be only one heuristic left?\n>> +               } else if (flags & XDF_COMPACTION_HEURISTIC) {\n>>                         /*\n>>                          * Indent heuristic: a group of pure add/delete lines\n>\n> This comment may need adjustment as well (though we could go without)\n\nThanks.  I've queued this as \"SQUASH???\" on top.\n\ndiff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt\nindex 0c79e48d9d..39fff3aef9 100644\n--- a/Documentation/diff-config.txt\n+++ b/Documentation/diff-config.txt\n@@ -172,9 +172,8 @@ diff.tool::\n include::mergetools-diff.txt[]\n \n diff.compactionHeuristic::\n-\tSet one of these options to `true` to enable one of two\n-\texperimental heuristics that shift diff hunk boundaries to\n-\tmake patches easier to read.\n+\tSet this option to `true` to enable experimental heuristics\n+\tthat shift diff hunk boundaries to make patches easier to read.\n \n diff.algorithm::\n \tChoose a diff algorithm.  The variants are as follows:\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 6cb96219cb..31ff519232 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -908,7 +908,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n \t\t\t}\n \t\t} else if (flags & XDF_COMPACTION_HEURISTIC) {\n \t\t\t/*\n-\t\t\t * Indent heuristic: a group of pure add/delete lines\n+\t\t\t * Heuristic based on the indentation level.\n+\t\t\t *\n+\t\t\t * A group of pure add/delete lines\n \t\t\t * implies two splits, one between the end of the \"before\"\n \t\t\t * context and the start of the group, and another between\n \t\t\t * the end of the group and the beginning of the \"after\"\n\n"},{"id":"305278","messageId":"CA+P7+xq0YG5RTg8MSofd4h3AYMxe1OqtSeZeyXUvP_fZEypiSQ@mail.gmail.com","threadId":"44404","inReplyTo":"CAGZ79ka6un7nHaNk3F8yp3vFSnB-iGapqLcZ-ZC3EvcKE4DMNQ@mail.gmail.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Jacob Keller","fromEmail":"jacob.keller@gmail.com","sentAt":"2016-11-02T01:21:46Z","receivedAt":"2016-11-02T01:22:12Z","isPatch":false,"sender":{"key":"jacob.keller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"On Tue, Nov 1, 2016 at 2:10 PM, Stefan Beller <sbeller@google.com> wrote:\n> On Tue, Nov 1, 2016 at 1:59 PM, Jeff King <peff@peff.net> wrote:\n>> On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote:\n>>\n>>> > As of -rc0, we have both --indent-heuristic and --compaction-heuristic\n>>> > (along with matching config), and they are mutually exclusive.\n>>> >\n>>> > In [1], Stefan suggested just replacing the compaction heuristic\n>>> > entirely with the new one (and you seemed to agree). If we're going to\n>>> > do that, it makes sense to do so before the release, so that we don't\n>>> > get stuck supporting --indent-heuristic forever.\n>>>\n>>> You meant \"compaction\" in the last part?  I think it is probably a\n>>> good idea.\n>>\n>> I thought the plan mentioned in the mail I linked was to keep the indent\n>> heuristic, but simply _call_ it the compaction heuristic. IOW, to swap\n>> out the implementation under the hood for something we know is better.\n>\n> AFAICT Michaels design is better in every aspect than what I did initially,\n> so it supersedes the work I did there.  I would support the swap in names.\n>\n\nAgreed, it's much better than the original idea, and results in better\ndiffs in every single case we could find.\n\n>>\n>> We've already released a version with --compaction-heuristic, so we are\n>> stuck keeping it forever either way.\n>\n> IIRC the release notes specifically noted this flag to be experimental and\n> may be removed in future versions.\n\nI agree, I think that we specifically spelled out that this might go\naway, and so I don't think we're stuck supporting it forever. We don't\neven really need a deprecation time frame either.\n\n>\n> When not doing the swap of the implementation, but rather remove the\n> experimental feature of compaction-heuristic and introducing a *new*\n> experimental --indent-heuristic, this may drive the point across that\n> these names are actually experimental.\n\nI think we should swap names as \"compaction heuristic\" is more generic.\n\nThanks,\nJake\n"},{"id":"305320","messageId":"8dbbd28b-af60-5e66-ae27-d7cddca233dc@alum.mit.edu","threadId":"44404","inReplyTo":"xmqqzilinanp.fsf@gitster.mtv.corp.google.com","subject":"Re: [ANNOUNCE] Git v2.11.0-rc0","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2016-11-02T21:44:57Z","receivedAt":"2016-11-02T21:45:14Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"On 11/01/2016 10:38 PM, Junio C Hamano wrote:\n> Junio C Hamano <gitster@pobox.com> writes:\n> \n>> If it involves renaming and swapping, however, we may be talking\n>> about a change that we cannot deliver with confidence in less than a\n>> week before -rc1, which sounds, eh, suboptimal.\n>>\n>> FWIW, here is how the removal of compaction without renaming looks\n>> like.\n> \n> And here is _with_ renaming.  I think \"compaction heuristics\" is a\n> much better phrase to call \"heuristics used during the diff hunk\n> compaction process\" without specifying how that heuristics work\n> (like taking hints in the indentation levels).  If we are to retire\n> one while keeping the other, compaction-heuristics should be the\n> name we give and keep for the surviving one.\n\nPersonally, I'm not a fan of the name \"compaction heuristics\".\n\nThe name *seems* to make sense because it affects the behavior of a\nfunction called `xdl_change_compact()`. But that means nothing to end\nusers. The option doesn't affect how the diff is \"compacted\" in the\nusual sense of the word; the slider optimization usually doesn't change\nthe number of lines in the diff at all [1].\n\nMoreover, if we ever want to add another heuristic (for example, imagine\na language-aware algorithm that is based on parsing the file), we would\nwant a different name for that option, at least temporarily. From that\npoint of view, it makes a little bit of sense for the name of the option\nto hint at the particular heuristic being used.\n\nThat being said, I don't think it is a big deal either way, and I can\nlive with either name. I rather hope that this option will become the\ndefault soon, and hopefully after that hardly anybody will need to learn\nits name.\n\nRegarding making it the default: given that it is presumably too late in\nthis release cycle to make this option the default behavior, I suggest\nthat it be made the default early in the next release cycle so that it\ngets a lot of testing, and people have enough time to voice any objections.\n\nRegarding your patches themselves, once the old compaction heuristic is\nremoved (with or without renaming), you can also get rid of the\n`blank_lines` local variable in `xdl_change_compact()`, and also the\nfunction `is_blank_line()` in the same source file.\n\nMichael\n\n[1] The only exceptions are when it causes context lines for adjacent\ndiff hunks to join/split, or makes the context lines for a diff hunk\nextend past the beginning/end of the file. But these are uninteresting\nside-effects; it doesn't *try* to do or avoid either of these things.\n\n"}]}