Git

The latest feature release Git v1.8.4 is now available at the usual places. It contains 870+ changes from ~100 contributors (among which 33 people are new) since v1.8.3. We will have two more releases til the end of this year; the release after ... [More] that could be Git 2.0. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 2a361a2d185b8bc604f7f2ce2f502d0dea9d3279 git-1.8.4.tar.gz f130398eb623c913497ef51a6e61d916fe7e31c8 git-htmldocs-1.8.4.tar.gz 8c67a7bc442d6191bc17633c7f2846c71bda71cf git-manpages-1.8.4.tar.gz The following public repositories all have a copy of the v1.8.4 tag and the master branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Also, http://www.kernel.org/pub/software/scm/git/ has copies of the release tarballs. Git v1.8.4 Release Notes ======================== Backward compatibility notes (for Git 2.0) ------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). In Git 2.0, the default will change to the "simple" semantics that pushes: - only the current branch to the branch with the same name, and only when the current branch is set to integrate with that remote branch, if you are pushing to the same remote as you fetch from; or - only the current branch to the branch with the same name, if you are pushing to a remote that is not where you usually fetch from. Use the user preference configuration variable "push.default" to change this. If you are an old-timer who is used to the "matching" semantics, you can set the variable to "matching" to keep the traditional behaviour. If you want to live in the future early, you can set it to "simple" today without waiting for Git 2.0. When "git add -u" (and "git add -A") is run inside a subdirectory and does not specify which paths to add on the command line, it will operate on the entire tree in Git 2.0 for consistency with "git commit -a" and other commands. There will be no mechanism to make plain "git add -u" behave like "git add -u .". Current users of "git add -u" (without a pathspec) should start training their fingers to explicitly say "git add -u ." before Git 2.0 comes. A warning is issued when these commands are run without a pathspec and when you have local changes outside the current directory, because the behaviour in Git 2.0 will be different from today's version in such a situation. In Git 2.0, "git add " will behave as "git add -A ", so that "git add dir/" will notice paths you removed from the directory and record the removal. Versions before Git 2.0, including this release, will keep ignoring removals, but the users who rely on this behaviour are encouraged to start using "git add --ignore-removal " now before 2.0 is released. Updates since v1.8.3 -------------------- Foreign interfaces, subsystems and ports. * Cygwin port has been updated for more recent Cygwin 1.7. * "git rebase -i" now honors --strategy and -X options. * Git-gui has been updated to its 0.18.0 version. * MediaWiki remote helper (in contrib/) has been updated to use the credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has been updated to kick in not just when talking http/https but also imap(s) and smtp. * Remote transport helper has been updated to report errors and maintain ref hierarchy used to keep track of its own state better. * With "export" remote-helper protocol, (1) a push that tries to update a remote ref whose name is different from the pushing side does not work yet, and (2) the helper may not know how to do --dry-run; these problematic cases are disabled for now. * git-remote-hg/bzr (in contrib/) updates. * git-remote-mw (in contrib/) hints users to check the certificate, when https:// connection failed. * git-remote-mw (in contrib/) adds a command to allow previewing the contents locally before pushing it out, when working with a MediaWiki remote. UI, Workflows & Features * Sample "post-receive-email" hook script got an enhanced replacement "multimail" (in contrib/). * Also in contrib/ is a new "contacts" script that runs "git blame" to find out the people who may be interested in a set of changes. * "git clean" command learned an interactive mode. * The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). The meaning of the option has been changed to always show "HEAD" regardless of what filtering will be applied to any other ref. This is a backward incompatible change and might cause breakages to people's existing scripts. * "git show -s" was less discoverable than it should have been. It now has a natural synonym "git show --no-patch". * "git check-mailmap" is a new command that lets you map usernames and e-mail addresses through the mailmap mechanism, just like many built-in commands do. * "git name-rev" learned to name an annotated tag object back to its tagname; "git name-rev $(git rev-parse v1.0.0)" gives "tags/v1.0.0", for example. * "git cat-file --batch-check=" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * "git rebase [-i]" used to leave just "rebase" as its reflog messages for some operations. They have been reworded to be more informative. * In addition to the choice from "rebase, merge, or checkout-detach", "submodule update" can allow a custom command to be used in to update the working tree of submodules via the "submodule.*.update" configuration variable. * "git submodule update" can optionally clone the submodule repositories shallowly. * "git format-patch" learned "--from[=whom]" option, which sets the "From: " header to the specified person (or the person who runs the command, if "=whom" part is missing) and move the original author information to an in-body From: header as necessary. * The configuration variable "merge.ff" was cleary a tri-state to choose one from "favor fast-forward when possible", "always create a merge even when the history could fast-forward" and "do not create any merge, only update when the history fast-forwards", but the command line parser did not implement the usual convention of "last one wins, and command line overrides the configuration" correctly. * "gitweb" learned to optionally place extra links that point at the levels higher than the Gitweb pages themselves in the breadcrumbs, so that it can be used as part of a larger installation. * "git log --format=" now honors i18n.logoutputencoding configuration variable. * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where you fetch from (i.e. a triangular workflow). * Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * "git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * Various subcommands of "git submodule" refused to run from anywhere other than the top of the working tree of the superproject, but they have been taught to let you run from a subdirectory. * "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. * "git rm" gives a single message followed by list of paths to report multiple paths that cannot be removed. * "git rebase" can be told with ":/look for this string" syntax commits to replay the changes onto and where the work to be replayed begins. * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". * On Cygwin, "cygstart" is now recognised as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * "git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * "git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierarchies share the same name. * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal response was to stash them and re-run). This introduced a corner case breakage to "git am --abort" but it has been fixed. * "check-ignore" (new feature since 1.8.2) has been updated to work more like "check-attr" over bidi-pipes. * "git describe" learned "--first-parent" option to limit its closest tagged commit search to the first-parent chain. * "git merge foo" that might have meant "git merge origin/foo" is diagnosed with a more informative error message. * "git log -L,:" has been added. This may still have leaks and rough edges, though. * We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. "git gc" and "git reflog" have been updated with a new parsing function for expiry dates. * Updates to completion (both bash and zsh) helpers. * The behaviour of the "--chain-reply-to" option of "git send-email" have changed at 1.7.0, and we added a warning/advice message to help users adjust to the new behaviour back then, but we kept it around for too long. The message has finally been removed. * "git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunistically update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. * The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. Performance, Internal Implementation, etc. * On Cygwin, we used to use our own lstat(2) emulation that is allegedly faster than the platform one in codepaths where some of the information it returns did not matter, but it started to bite us in a few codepaths where the trick it uses to cheat does show breakages. This emulation has been removed and we use the native lstat(2) emulation supplied by Cygwin now. * The function attributes extensions are used to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * The code to allow configuration data to be read from in-tree blob objects is in. This may help working in a bare repository and submodule updates. * Fetching between repositories with many refs employed O(n^2) algorithm to match up the common objects, which has been corrected. * The original way to specify remote repository using .git/branches/ used to have a nifty feature. The code to support the feature was still in a function but the caller was changed not to call it 5 years ago, breaking that feature and leaving the supporting code unreachable. The dead code has been removed. * "git pack-refs" that races with new ref creation or deletion have been susceptible to lossage of refs under right conditions, which has been tightened up. * We read loose and packed references in two steps, but after deciding to read a loose ref but before actually opening it to read it, another process racing with us can unlink it, which would cause us to barf. The codepath has been updated to retry when such a race is detected, instead of outright failing. * Uses of the platform fnmatch(3) function (many places in the code, matching pathspec, .gitignore and .gitattributes to name a few) have been replaced with wildmatch, allowing "foo/**/bar" that would match foo/bar, foo/a/bar, foo/a/b/bar, etc. * Memory ownership and lifetime rules for what for-each-ref feeds to its callbacks have been clarified (in short, "you do not own it, so make a copy if you want to keep it"). * The revision traversal logic to improve culling of irrelevant parents while traversing a mergy history has been updated. * Some leaks in unpack-trees (used in merge, cherry-pick and other codepaths) have been plugged. * The codepath to read from marks files in fast-import/export did not have to accept anything but 40-hex representation of the object name. Further, fast-export did not need full in-core object representation to have parsed wen reading from them. These codepaths have been optimized by taking advantage of these access patterns. * Object lookup logic, when the object hashtable starts to become crowded, has been optimized. * When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. * "git clone" uses a lighter-weight implementation when making sure that the history behind refs are complete. * Many warnings from sparse source checker in compat/ area has been squelched. * The code to reading and updating packed-refs file has been updated, correcting corner case bugs. Also contains various documentation updates and code clean-ups. Fixes since v1.8.3 ------------------ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance track are contained in this release (see release notes to them for details). * Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. (merge 35035bb rr/send-email-ssl-verify later to maint). * When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. (merge a11c396 tr/protect-low-3-fds later to maint). * The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. (merge bd23794 jc/mailmap-case-insensitivity later to maint). * In two places we did not check return value (expected to be a file descriptor) correctly. (merge a77f106 tr/fd-gotcha-fixes later to maint). * Logic to auto-detect character encodings in the commit log message did not reject overlong and invalid UTF-8 characters. (merge 81050ac bc/commit-invalid-utf8 later to maint). * Pass port number as a separate argument when "send-email" initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint). * "git diff" refused to even show difference when core.safecrlf is set to true (i.e. error out) and there are offending lines in the working tree files. (merge 5430bb2 jc/maint-diff-core-safecrlf later to maint). * A test that should have failed but didn't revealed a bug that needs to be corrected. (merge 94d75d1 jc/t1512-fix later to maint). * An overlong path to a .git directory may have overflown the temporary path buffer used to create a name for lockfiles. (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were counted as "checkout", and affected later "git checkout -" to the the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint). * The configuration variable column.ui was poorly documented. (merge 5e62cc1 rr/column-doc later to maint). * "git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint). * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11 and will need to be merged down to the maintenance tracks. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in an error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * Call to discard_cache/discard_index (used when we use different contents of the index in-core, in many operations like commit, apply, and merge) used to leak memory that held the array of index entries, which has been plugged. (merge a0fc4db rs/discard-index-discard-array later to maint). * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", we did not say which branch and worse said "branch ''". * "difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * "git push $there HEAD:branch" did not resolve HEAD early enough, so it was easy to flip it around while push is still going on and push out a branch that the user did not originally intended when the command was started. * The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. * zsh prompt script that borrowed from bash prompt script did not work due to slight differences in array variable notation between these two shells. * An entry for "file://" scheme in the enumeration of URL types Git can take in the HTML documentation was made into a clickable link by mistake. * "git push --[no-]verify" was not documented. * Stop installing the git-remote-testpy script that is only used for testing. * "git commit --allow-empty-message -m ''" should not start an editor. * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22" incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). * "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. * "git log --ancestry-path A...B" did not work as expected, as it did not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * "git clone foo/bar:baz" cannot be a request to clone from a remote over git-over-ssh specified in the scp style. This case is now detected and clones from a local repository at "foo/bar:baz". * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. Loosen the check. * "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. * "git fetch" into a shallow repository from a repository that does not know about the shallow boundary commits (e.g. a different fork from the repository the current shallow repository was cloned from) did not work correctly. * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate Git v1.8.4-rc4 is now available for testing at the usual places. The only changes since -rc3 are reversion of two topics that introduced regressions. Hopefully the final at the end of this week and then we will start the next ... [More] cycle, most likely to be for 1.8.5. This is a bit delayed than I planned early last week, but sometimes real life happens. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: f390da8ea032c92c673d4cc6c4d8818379db344d git-1.8.4.rc4.tar.gz 90a9df6b2ada9a0ab9c8711e03d77244e7310c1e git-htmldocs-1.8.4.rc4.tar.gz 4e6ed2c0307ba538257bdc9f233dd574b419f411 git-manpages-1.8.4.rc4.tar.gz The following public repositories all have a copy of the v1.8.4-rc4 tag and the master branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.4 Release Notes (draft) ======================== Backward compatibility notes (for Git 2.0) ------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). In Git 2.0, the default will change to the "simple" semantics that pushes: - only the current branch to the branch with the same name, and only when the current branch is set to integrate with that remote branch, if you are pushing to the same remote as you fetch from; or - only the current branch to the branch with the same name, if you are pushing to a remote that is not where you usually fetch from. Use the user preference configuration variable "push.default" to change this. If you are an old-timer who is used to the "matching" semantics, you can set the variable to "matching" to keep the traditional behaviour. If you want to live in the future early, you can set it to "simple" today without waiting for Git 2.0. When "git add -u" (and "git add -A") is run inside a subdirectory and does not specify which paths to add on the command line, it will operate on the entire tree in Git 2.0 for consistency with "git commit -a" and other commands. There will be no mechanism to make plain "git add -u" behave like "git add -u .". Current users of "git add -u" (without a pathspec) should start training their fingers to explicitly say "git add -u ." before Git 2.0 comes. A warning is issued when these commands are run without a pathspec and when you have local changes outside the current directory, because the behaviour in Git 2.0 will be different from today's version in such a situation. In Git 2.0, "git add " will behave as "git add -A ", so that "git add dir/" will notice paths you removed from the directory and record the removal. Versions before Git 2.0, including this release, will keep ignoring removals, but the users who rely on this behaviour are encouraged to start using "git add --ignore-removal " now before 2.0 is released. Updates since v1.8.3 -------------------- Foreign interfaces, subsystems and ports. * Cygwin port has been updated for more recent Cygwin 1.7. * "git rebase -i" now honors --strategy and -X options. * Git-gui has been updated to its 0.18.0 version. * MediaWiki remote helper (in contrib/) has been updated to use the credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has been updated to kick in not just when talking http/https but also imap(s) and smtp. * Remote transport helper has been updated to report errors and maintain ref hierarchy used to keep track of its own state better. * With "export" remote-helper protocol, (1) a push that tries to update a remote ref whose name is different from the pushing side does not work yet, and (2) the helper may not know how to do --dry-run; these problematic cases are disabled for now. * git-remote-hg/bzr (in contrib/) updates. * git-remote-mw (in contrib/) hints users to check the certificate, when https:// connection failed. * git-remote-mw (in contrib/) adds a command to allow previewing the contents locally before pushing it out, when working with a MediaWiki remote. UI, Workflows & Features * Sample "post-receive-email" hook script got an enhanced replacement "multimail" (in contrib/). * Also in contrib/ is a new "contacts" script that runs "git blame" to find out the people who may be interested in a set of changes. * "git clean" command learned an interactive mode. * The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). The meaning of the option has been changed to always show "HEAD" regardless of what filtering will be applied to any other ref. This is a backward incompatible change and might cause breakages to people's existing scripts. * "git show -s" was less discoverable than it should have been. It now has a natural synonym "git show --no-patch". * "git check-mailmap" is a new command that lets you map usernames and e-mail addresses through the mailmap mechanism, just like many built-in commands do. * "git name-rev" learned to name an annotated tag object back to its tagname; "git name-rev $(git rev-parse v1.0.0)" gives "tags/v1.0.0", for example. * "git cat-file --batch-check=" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * "git rebase [-i]" used to leave just "rebase" as its reflog messages for some operations. They have been reworded to be more informative. * In addition to the choice from "rebase, merge, or checkout-detach", "submodule update" can allow a custom command to be used in to update the working tree of submodules via the "submodule.*.update" configuration variable. * "git submodule update" can optionally clone the submodule repositories shallowly. * "git format-patch" learned "--from[=whom]" option, which sets the "From: " header to the specified person (or the person who runs the command, if "=whom" part is missing) and move the original author information to an in-body From: header as necessary. * The configuration variable "merge.ff" was cleary a tri-state to choose one from "favor fast-forward when possible", "always create a merge even when the history could fast-forward" and "do not create any merge, only update when the history fast-forwards", but the command line parser did not implement the usual convention of "last one wins, and command line overrides the configuration" correctly. * "gitweb" learned to optionally place extra links that point at the levels higher than the Gitweb pages themselves in the breadcrumbs, so that it can be used as part of a larger installation. * "git log --format=" now honors i18n.logoutputencoding configuration variable. * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where you fetch from (i.e. a triangular workflow). * Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * "git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * Various subcommands of "git submodule" refused to run from anywhere other than the top of the working tree of the superproject, but they have been taught to let you run from a subdirectory. * "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. * "git rm" gives a single message followed by list of paths to report multiple paths that cannot be removed. * "git rebase" can be told with ":/look for this string" syntax commits to replay the changes onto and where the work to be replayed begins. * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". * On Cygwin, "cygstart" is now recognised as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * "git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * "git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierarchies share the same name. * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal response was to stash them and re-run). This introduced a corner case breakage to "git am --abort" but it has been fixed. * "check-ignore" (new feature since 1.8.2) has been updated to work more like "check-attr" over bidi-pipes. * "git describe" learned "--first-parent" option to limit its closest tagged commit search to the first-parent chain. * "git merge foo" that might have meant "git merge origin/foo" is diagnosed with a more informative error message. * "git log -L,:" has been added. This may still have leaks and rough edges, though. * We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. "git gc" and "git reflog" have been updated with a new parsing function for expiry dates. * Updates to completion (both bash and zsh) helpers. * The behaviour of the "--chain-reply-to" option of "git send-email" have changed at 1.7.0, and we added a warning/advice message to help users adjust to the new behaviour back then, but we kept it around for too long. The message has finally been removed. * "git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunistically update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. * The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. Performance, Internal Implementation, etc. * On Cygwin, we used to use our own lstat(2) emulation that is allegedly faster than the platform one in codepaths where some of the information it returns did not matter, but it started to bite us in a few codepaths where the trick it uses to cheat does show breakages. This emulation has been removed and we use the native lstat(2) emulation supplied by Cygwin now. * The function attributes extensions are used to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * The code to allow configuration data to be read from in-tree blob objects is in. This may help working in a bare repository and submodule updates. * Fetching between repositories with many refs employed O(n^2) algorithm to match up the common objects, which has been corrected. * The original way to specify remote repository using .git/branches/ used to have a nifty feature. The code to support the feature was still in a function but the caller was changed not to call it 5 years ago, breaking that feature and leaving the supporting code unreachable. The dead code has been removed. * "git pack-refs" that races with new ref creation or deletion have been susceptible to lossage of refs under right conditions, which has been tightened up. * We read loose and packed rerferences in two steps, but after deciding to read a loose ref but before actually opening it to read it, another process racing with us can unlink it, which would cause us to barf. The codepath has been updated to retry when such a race is detected, instead of outright failing. * Uses of the platform fnmatch(3) function (many places in the code, matching pathspec, .gitignore and .gitattributes to name a few) have been replaced with wildmatch, allowing "foo/**/bar" that would match foo/bar, foo/a/bar, foo/a/b/bar, etc. * Memory ownership and lifetime rules for what for-each-ref feeds to its callbacks have been clarified (in short, "you do not own it, so make a copy if you want to keep it"). * The revision traversal logic to improve culling of irrelevant parents while traversing a mergy history has been updated. * Some leaks in unpack-trees (used in merge, cherry-pick and other codepaths) have been plugged. * The codepath to read from marks files in fast-import/export did not have to accept anything but 40-hex representation of the object name. Further, fast-export did not need full in-core object representation to have parsed wen reading from them. These codepaths have been optimized by taking advantage of these access patterns. * Object lookup logic, when the object hashtable starts to become crowded, has been optimized. * When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. * "git clone" uses a lighter-weight implementation when making sure that the history behind refs are complete. * Many warnings from sparse source checker in compat/ area has been squelched. * The code to reading and updating packed-refs file has been updated, correcting corner case bugs. Also contains various documentation updates and code clean-ups. Fixes since v1.8.3 ------------------ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance track are contained in this release (see release notes to them for details). * Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. (merge 35035bb rr/send-email-ssl-verify later to maint). * When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. (merge a11c396 tr/protect-low-3-fds later to maint). * The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. (merge bd23794 jc/mailmap-case-insensitivity later to maint). * In two places we did not check return value (expected to be a file descriptor) correctly. (merge a77f106 tr/fd-gotcha-fixes later to maint). * Logic to auto-detect character encodings in the commit log message did not reject overlong and invalid UTF-8 characters. (merge 81050ac bc/commit-invalid-utf8 later to maint). * Pass port number as a separate argument when "send-email" initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint). * "git diff" refused to even show difference when core.safecrlf is set to true (i.e. error out) and there are offending lines in the working tree files. (merge 5430bb2 jc/maint-diff-core-safecrlf later to maint). * A test that should have failed but didn't revealed a bug that needs to be corrected. (merge 94d75d1 jc/t1512-fix later to maint). * An overlong path to a .git directory may have overflown the temporary path buffer used to create a name for lockfiles. (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were counted as "checkout", and affected later "git checkout -" to the the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint). * The configuration variable column.ui was poorly documented. (merge 5e62cc1 rr/column-doc later to maint). * "git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint). * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11 and will need to be merged down to the maintanance tracks. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in an error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * Call to discard_cache/discard_index (used when we use different contents of the index in-core, in many operations like commit, apply, and merge) used to leak memory that held the array of index entries, which has been plugged. (merge a0fc4db rs/discard-index-discard-array later to maint). * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", we did not say which branch and worse said "branch ''". * "difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * "git push $there HEAD:branch" did not resolve HEAD early enough, so it was easy to flip it around while push is still going on and push out a branch that the user did not originally intended when the command was started. * The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. * zsh prompt script that borrowed from bash prompt script did not work due to slight differences in array variable notation between these two shells. * An entry for "file://" scheme in the enumeration of URL types Git can take in the HTML documentation was made into a clickable link by mistake. * "git push --[no-]verify" was not documented. * Stop installing the git-remote-testpy script that is only used for testing. * "git commit --allow-empty-message -m ''" should not start an editor. * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22" incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). * "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. * "git log --ancestry-path A...B" did not work as expected, as it did not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * "git clone foo/bar:baz" cannot be a request to clone from a remote over git-over-ssh specified in the scp style. This case is now detected and clones from a local repository at "foo/bar:baz". * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. Loosen the check. * "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. * "git fetch" into a shallow repository from a repository that does not know about the shallow boundary commits (e.g. a different fork from the repository the current shallow repository was cloned from) did not work correctly. * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. ---------------------------------------------------------------- Changes since v1.8.4-rc3 are as follows: Junio C Hamano (3): Revert "git stash: avoid data loss when "git stash save" kills a directory" Revert "Add new @ shortcut for HEAD" Git 1.8.4-rc4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate Git v1.8.4-rc3 is now available for testing at the usual places. Things have calmed down on the 'master' front; we will still need to revert one commit that killed "git stash" in a large directory with a lot of cruft before the ... [More] final, but other than that, everything else should be pretty much the same as what we will see in the final release. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 4017553f4543c00c392a299b6a67f8ca4ca5e325 git-1.8.4.rc3.tar.gz 1a3a6c6a59df7b60377a0ae86f04b8b0f09e45f4 git-htmldocs-1.8.4.rc3.tar.gz 19281d6fb14e66c5b215bad52e3857418052bfeb git-manpages-1.8.4.rc3.tar.gz The following public repositories all have a copy of the v1.8.4-rc3 tag and the master branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.4 Release Notes (draft) ======================== Backward compatibility notes (for Git 2.0) ------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). In Git 2.0, the default will change to the "simple" semantics that pushes: - only the current branch to the branch with the same name, and only when the current branch is set to integrate with that remote branch, if you are pushing to the same remote as you fetch from; or - only the current branch to the branch with the same name, if you are pushing to a remote that is not where you usually fetch from. Use the user preference configuration variable "push.default" to change this. If you are an old-timer who is used to the "matching" semantics, you can set the variable to "matching" to keep the traditional behaviour. If you want to live in the future early, you can set it to "simple" today without waiting for Git 2.0. When "git add -u" (and "git add -A") is run inside a subdirectory and does not specify which paths to add on the command line, it will operate on the entire tree in Git 2.0 for consistency with "git commit -a" and other commands. There will be no mechanism to make plain "git add -u" behave like "git add -u .". Current users of "git add -u" (without a pathspec) should start training their fingers to explicitly say "git add -u ." before Git 2.0 comes. A warning is issued when these commands are run without a pathspec and when you have local changes outside the current directory, because the behaviour in Git 2.0 will be different from today's version in such a situation. In Git 2.0, "git add " will behave as "git add -A ", so that "git add dir/" will notice paths you removed from the directory and record the removal. Versions before Git 2.0, including this release, will keep ignoring removals, but the users who rely on this behaviour are encouraged to start using "git add --ignore-removal " now before 2.0 is released. Updates since v1.8.3 -------------------- Foreign interfaces, subsystems and ports. * Cygwin port has been updated for more recent Cygwin 1.7. * "git rebase -i" now honors --strategy and -X options. * Git-gui has been updated to its 0.18.0 version. * MediaWiki remote helper (in contrib/) has been updated to use the credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has been updated to kick in not just when talking http/https but also imap(s) and smtp. * Remote transport helper has been updated to report errors and maintain ref hierarchy used to keep track of its own state better. * With "export" remote-helper protocol, (1) a push that tries to update a remote ref whose name is different from the pushing side does not work yet, and (2) the helper may not know how to do --dry-run; these problematic cases are disabled for now. * git-remote-hg/bzr (in contrib/) updates. * git-remote-mw (in contrib/) hints users to check the certificate, when https:// connection failed. * git-remote-mw (in contrib/) adds a command to allow previewing the contents locally before pushing it out, when working with a MediaWiki remote. UI, Workflows & Features * Sample "post-receive-email" hook script got an enhanced replacement "multimail" (in contrib/). * Also in contrib/ is a new "contacts" script that runs "git blame" to find out the people who may be interested in a set of changes. * "git clean" command learned an interactive mode. * The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). The meaning of the option has been changed to always show "HEAD" regardless of what filtering will be applied to any other ref. This is a backward incompatible change and might cause breakages to people's existing scripts. * "git show -s" was less discoverable than it should have been. It now has a natural synonym "git show --no-patch". * "git check-mailmap" is a new command that lets you map usernames and e-mail addresses through the mailmap mechanism, just like many built-in commands do. * "git name-rev" learned to name an annotated tag object back to its tagname; "git name-rev $(git rev-parse v1.0.0)" gives "tags/v1.0.0", for example. * "git cat-file --batch-check=" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * "git rebase [-i]" used to leave just "rebase" as its reflog messages for some operations. They have been reworded to be more informative. * In addition to the choice from "rebase, merge, or checkout-detach", "submodule update" can allow a custom command to be used in to update the working tree of submodules via the "submodule.*.update" configuration variable. * "git submodule update" can optionally clone the submodule repositories shallowly. * "git format-patch" learned "--from[=whom]" option, which sets the "From: " header to the specified person (or the person who runs the command, if "=whom" part is missing) and move the original author information to an in-body From: header as necessary. * The configuration variable "merge.ff" was cleary a tri-state to choose one from "favor fast-forward when possible", "always create a merge even when the history could fast-forward" and "do not create any merge, only update when the history fast-forwards", but the command line parser did not implement the usual convention of "last one wins, and command line overrides the configuration" correctly. * "gitweb" learned to optionally place extra links that point at the levels higher than the Gitweb pages themselves in the breadcrumbs, so that it can be used as part of a larger installation. * "git log --format=" now honors i18n.logoutputencoding configuration variable. * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where you fetch from (i.e. a triangular workflow). * Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * "git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * Various subcommands of "git submodule" refused to run from anywhere other than the top of the working tree of the superproject, but they have been taught to let you run from a subdirectory. * "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. * "git rm" gives a single message followed by list of paths to report multiple paths that cannot be removed. * "git rebase" can be told with ":/look for this string" syntax commits to replay the changes onto and where the work to be replayed begins. * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". * On Cygwin, "cygstart" is now recognised as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * "git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * "git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierarchies share the same name. * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal response was to stash them and re-run). This introduced a corner case breakage to "git am --abort" but it has been fixed. * Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". * "check-ignore" (new feature since 1.8.2) has been updated to work more like "check-attr" over bidi-pipes. * "git describe" learned "--first-parent" option to limit its closest tagged commit search to the first-parent chain. * "git merge foo" that might have meant "git merge origin/foo" is diagnosed with a more informative error message. * "git log -L,:" has been added. This may still have leaks and rough edges, though. * We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. "git gc" and "git reflog" have been updated with a new parsing function for expiry dates. * Updates to completion (both bash and zsh) helpers. * The behaviour of the "--chain-reply-to" option of "git send-email" have changed at 1.7.0, and we added a warning/advice message to help users adjust to the new behaviour back then, but we kept it around for too long. The message has finally been removed. * "git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunistically update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. * The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. Performance, Internal Implementation, etc. * On Cygwin, we used to use our own lstat(2) emulation that is allegedly faster than the platform one in codepaths where some of the information it returns did not matter, but it started to bite us in a few codepaths where the trick it uses to cheat does show breakages. This emulation has been removed and we use the native lstat(2) emulation supplied by Cygwin now. * The function attributes extensions are used to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * The code to allow configuration data to be read from in-tree blob objects is in. This may help working in a bare repository and submodule updates. * Fetching between repositories with many refs employed O(n^2) algorithm to match up the common objects, which has been corrected. * The original way to specify remote repository using .git/branches/ used to have a nifty feature. The code to support the feature was still in a function but the caller was changed not to call it 5 years ago, breaking that feature and leaving the supporting code unreachable. The dead code has been removed. * "git pack-refs" that races with new ref creation or deletion have been susceptible to lossage of refs under right conditions, which has been tightened up. * We read loose and packed rerferences in two steps, but after deciding to read a loose ref but before actually opening it to read it, another process racing with us can unlink it, which would cause us to barf. The codepath has been updated to retry when such a race is detected, instead of outright failing. * Uses of the platform fnmatch(3) function (many places in the code, matching pathspec, .gitignore and .gitattributes to name a few) have been replaced with wildmatch, allowing "foo/**/bar" that would match foo/bar, foo/a/bar, foo/a/b/bar, etc. * Memory ownership and lifetime rules for what for-each-ref feeds to its callbacks have been clarified (in short, "you do not own it, so make a copy if you want to keep it"). * The revision traversal logic to improve culling of irrelevant parents while traversing a mergy history has been updated. * Some leaks in unpack-trees (used in merge, cherry-pick and other codepaths) have been plugged. * The codepath to read from marks files in fast-import/export did not have to accept anything but 40-hex representation of the object name. Further, fast-export did not need full in-core object representation to have parsed wen reading from them. These codepaths have been optimized by taking advantage of these access patterns. * Object lookup logic, when the object hashtable starts to become crowded, has been optimized. * When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. * "git clone" uses a lighter-weight implementation when making sure that the history behind refs are complete. * Many warnings from sparse source checker in compat/ area has been squelched. * The code to reading and updating packed-refs file has been updated, correcting corner case bugs. Also contains various documentation updates and code clean-ups. Fixes since v1.8.3 ------------------ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance track are contained in this release (see release notes to them for details). * Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. (merge 35035bb rr/send-email-ssl-verify later to maint). * When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. (merge a11c396 tr/protect-low-3-fds later to maint). * The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. (merge bd23794 jc/mailmap-case-insensitivity later to maint). * In two places we did not check return value (expected to be a file descriptor) correctly. (merge a77f106 tr/fd-gotcha-fixes later to maint). * Logic to auto-detect character encodings in the commit log message did not reject overlong and invalid UTF-8 characters. (merge 81050ac bc/commit-invalid-utf8 later to maint). * Pass port number as a separate argument when "send-email" initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint). * "git diff" refused to even show difference when core.safecrlf is set to true (i.e. error out) and there are offending lines in the working tree files. (merge 5430bb2 jc/maint-diff-core-safecrlf later to maint). * A test that should have failed but didn't revealed a bug that needs to be corrected. (merge 94d75d1 jc/t1512-fix later to maint). * An overlong path to a .git directory may have overflown the temporary path buffer used to create a name for lockfiles. (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were counted as "checkout", and affected later "git checkout -" to the the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint). * "git stash save", when your local change turns a tracked file into a directory, has to remove files in that directory in order to revert your working tree to a pristine state. This will lose untracked files in such a directory, and the command now requires you to "--force" it. * The configuration variable column.ui was poorly documented. (merge 5e62cc1 rr/column-doc later to maint). * "git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint). * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11 and will need to be merged down to the maintanance tracks. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in an error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * Call to discard_cache/discard_index (used when we use different contents of the index in-core, in many operations like commit, apply, and merge) used to leak memory that held the array of index entries, which has been plugged. (merge a0fc4db rs/discard-index-discard-array later to maint). * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", we did not say which branch and worse said "branch ''". * "difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * "git push $there HEAD:branch" did not resolve HEAD early enough, so it was easy to flip it around while push is still going on and push out a branch that the user did not originally intended when the command was started. * The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. * zsh prompt script that borrowed from bash prompt script did not work due to slight differences in array variable notation between these two shells. * An entry for "file://" scheme in the enumeration of URL types Git can take in the HTML documentation was made into a clickable link by mistake. * "git push --[no-]verify" was not documented. * Stop installing the git-remote-testpy script that is only used for testing. * "git commit --allow-empty-message -m ''" should not start an editor. * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22" incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). * "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. * "git log --ancestry-path A...B" did not work as expected, as it did not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * "git clone foo/bar:baz" cannot be a request to clone from a remote over git-over-ssh specified in the scp style. This case is now detected and clones from a local repository at "foo/bar:baz". * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. Loosen the check. * "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. * "git fetch" into a shallow repository from a repository that does not know about the shallow boundary commits (e.g. a different fork from the repository the current shallow repository was cloned from) did not work correctly. * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. ---------------------------------------------------------------- Changes since v1.8.4-rc2 are as follows: Eric Sunshine (1): parse-options: fix clang opterror() -Wunused-value warning Jean-Noel Avila (2): l10n: fr.po: 821/2112 messages translated l10n: Add reference for french translation team Jiang Xin (2): l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed) l10n: zh_CN.po: translate 5 messages (2135t0f0u) Junio C Hamano (2): .mailmap: update long-lost friends with multiple defunct addresses Git 1.8.4-rc3 Matthieu Moy (1): git-remote-mediawiki: ignore generated git-mw Peter Krefting (1): l10n: Update Swedish translation (2135t0f0u) Phil Hord (1): t/t7407: fix two typos in submodule tests Ralf Thielow (3): l10n: de.po: switch from pure German to German+English l10n: de.po: translate 99 new messages l10n: de.po: translate 5 messages Stefan Beller (2): .mailmap: fixup entries .mailmap: Combine more (name, email) to individual persons Tran Ngoc Quan (1): l10n: vi.po(2135t): v1.8.4 round 2 Wieland Hoffmann (1): l10n: de.po: Fix a typo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello, It's been almost a year since the last release of tig, so here is a much needed update. It brings a lot of cool new features, such as the ability to jump directly from diff to the corresponding line in the changed file, a stash view ... [More] , improvements to the log view, plus a bunch of bug fixes. On behalf of everyone who contributed to this release, please enjoy. What is tig? ------------ Tig is an ncurses-based text-mode interface for git. It functions mainly as a git repository browser, but can also assist in staging changes for commit at chunk level and act as a pager for output from various git commands. - Homepage: http://jonas.nitro.dk/tig/ - Manual: http://jonas.nitro.dk/tig/manual.html - Tarballs: http://jonas.nitro.dk/tig/releases/ - Git URL: git://github.com/jonas/tig.git - Gitweb: http://repo.or.cz/w/tig.git - Q&A: http://stackoverflow.com/questions/tagged/tig Release notes ------------- - Tig now has its own tag on Stack Overflow, where users are invited to ask questions: http://stackoverflow.com/questions/tagged/tig Improvements: - Make tig prompt commands bindable to keys. For example: `bind diff F :set diff-options = --full-diff`. (GH #69, #116) - Add a diff-options setting for specifying default diff options. Example: `set diff-options = --patience`. (GH #116) - Options in diff-options and blame-options matching tig browsing state variables are replaced. - Show diff stats as wide as the terminal. (GH #109) - Show line numbers in the branch view. (GH #135) - Add toggles for showing author email or email user names. (GH #115) - Open editor at the selected line by prefixing the file argument with `+`. Tested in vi, vim, emacs, nano, gedit, geany. Disable by adding `set editor-line-number = no` to ~/.tigrc. (GH #118, #119) - Add toggle-files to control whether to show full commit diff or only the diff concerning the currently selected file, e.g. for blame. - Optionally highlight exceeding characters in long commit titles. The default title max width is 50 characters. Customize using: `set title-overflow = 50` (GH #125) - Add +ESC key bindings. Example: `bind generic ^[v move-page-up` (GH #120) - Create temporary files in TMPDIR, TEMP, or TMP before defaulting to /tmp. - Reenable `tig log` as a subcommand. (GH #146) - Enable tilde expansion in ~/.tigrc "source" commands. (GH #168) - Introduce the stash view, bound to the 'y' keybinding. (GH #169, #174) Bug fixes: - Fix blame and status to work in directories starting with a dot. (GH #172) - Reload current branch name when reloading the status view. (GH #93) - Fix compile errors on old Solaris. (GH #97) - Reload HEAD info when reloading the stage view. (GH #104, #93) - Fix disappearing branch labels after external commands. (GH #148) - Fix diff view display for staged/unstaged changes when using 'd'. - Fix display of status messages when toggling view options. (GH #111) - Fix illegal memory access. (GH #98) - Fix display of all branches label in repos with short branch names. - Fix rendering glitch for branch names. - Do not apply diff styling to untracked files in the stage view. (GH #153) - Fix tree indentation for entries containing combining characters. (GH #170) - Ignore unrepresentable characters when transliterating text for rendering. - Transliterate text to output encoding before trimming it to avoid misalignment. (GH #86) - Introduce a more natural context-sensitive log display. (GH #155) Change summary -------------- The diffstat and log summary for changes made in this release. BUGS | 3 +- Makefile | 32 +- NEWS | 51 ++ SITES | 1 + autogen.sh | 2 +- compat/compat.h | 44 ++ compat/mkstemps.c | 152 +++++ compat/setenv.c | 186 ++++++ config.make.in | 4 + configure.ac | 13 +- contrib/aspell.dict | 3 +- contrib/config.make-Darwin | 1 + contrib/header.h | 12 + contrib/tig-completion.bash | 2 +- contrib/tig.spec.in | 4 + git.h | 4 +- graph.c | 10 +- graph.h | 5 +- io.c | 42 +- io.h | 7 +- manual.txt | 34 +- refs.c | 12 +- refs.h | 5 +- test-graph.c | 24 +- tig.1.txt | 18 +- tig.c | 1124 +++++++++++++++++++++++++---------- tig.h | 32 +- tigrc.5.txt | 69 ++- 28 files changed, 1509 insertions(+), 387 deletions(-) 1 Aaron Franks 1 Beat Bolli 1 Dominik Vogt 2 Drew Northup 3 IWASAKI Yudai 1 Joakim Sernbrant 61 Jonas Fonseca 1 Julian Langschaedel 4 Kumar Appaiah 1 Menghan Zheng 1 Michael Gr [Less]

A release candidate Git v1.8.4-rc2 is now available for testing at the usual places. There are only a handful of small documentation and test updates since -rc1, except one notable change for Cygwin users. We no longer use a custom "fast but ... [More] cheating" lstat(2) emulation and instead use the platform one. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 1477b3def09d3b10a94441881b1aa19eb7f6586f git-1.8.4.rc2.tar.gz 554ae8d0125c93bfdfa508bbe35a2375c82c545a git-htmldocs-1.8.4.rc2.tar.gz 92a36c67f0def3544bcbd09bced2779142433ba5 git-manpages-1.8.4.rc2.tar.gz The following public repositories all have a copy of the v1.8.4-rc2 tag and the master branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.4 Release Notes (draft) ======================== Backward compatibility notes (for Git 2.0) ------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). In Git 2.0, the default will change to the "simple" semantics that pushes: - only the current branch to the branch with the same name, and only when the current branch is set to integrate with that remote branch, if you are pushing to the same remote as you fetch from; or - only the current branch to the branch with the same name, if you are pushing to a remote that is not where you usually fetch from. Use the user preference configuration variable "push.default" to change this. If you are an old-timer who is used to the "matching" semantics, you can set the variable to "matching" to keep the traditional behaviour. If you want to live in the future early, you can set it to "simple" today without waiting for Git 2.0. When "git add -u" (and "git add -A") is run inside a subdirectory and does not specify which paths to add on the command line, it will operate on the entire tree in Git 2.0 for consistency with "git commit -a" and other commands. There will be no mechanism to make plain "git add -u" behave like "git add -u .". Current users of "git add -u" (without a pathspec) should start training their fingers to explicitly say "git add -u ." before Git 2.0 comes. A warning is issued when these commands are run without a pathspec and when you have local changes outside the current directory, because the behaviour in Git 2.0 will be different from today's version in such a situation. In Git 2.0, "git add " will behave as "git add -A ", so that "git add dir/" will notice paths you removed from the directory and record the removal. Versions before Git 2.0, including this release, will keep ignoring removals, but the users who rely on this behaviour are encouraged to start using "git add --ignore-removal " now before 2.0 is released. Updates since v1.8.3 -------------------- Foreign interfaces, subsystems and ports. * Cygwin port has been updated for more recent Cygwin 1.7. * "git rebase -i" now honors --strategy and -X options. * Git-gui has been updated to its 0.18.0 version. * MediaWiki remote helper (in contrib/) has been updated to use the credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has been updated to kick in not just when talking http/https but also imap(s) and smtp. * Remote transport helper has been updated to report errors and maintain ref hierarchy used to keep track of its own state better. * With "export" remote-helper protocol, (1) a push that tries to update a remote ref whose name is different from the pushing side does not work yet, and (2) the helper may not know how to do --dry-run; these problematic cases are disabled for now. * git-remote-hg/bzr (in contrib/) updates. * git-remote-mw (in contrib/) hints users to check the certificate, when https:// connection failed. * git-remote-mw (in contrib/) adds a command to allow previewing the contents locally before pushing it out, when working with a MediaWiki remote. UI, Workflows & Features * Sample "post-receive-email" hook script got an enhanced replacement "multimail" (in contrib/). * Also in contrib/ is a new "contacts" script that runs "git blame" to find out the people who may be interested in a set of changes. * "git clean" command learned an interactive mode. * The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). The meaning of the option has been changed to always show "HEAD" regardless of what filtering will be applied to any other ref. This is a backward incompatible change and might cause breakages to people's existing scripts. * "git show -s" was less discoverable than it should have been. It now has a natural synonym "git show --no-patch". * "git check-mailmap" is a new command that lets you map usernames and e-mail addresses through the mailmap mechanism, just like many built-in commands do. * "git name-rev" learned to name an annotated tag object back to its tagname; "git name-rev $(git rev-parse v1.0.0)" gives "tags/v1.0.0", for example. * "git cat-file --batch-check=" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * "git rebase [-i]" used to leave just "rebase" as its reflog messages for some operations. They have been reworded to be more informative. * In addition to the choice from "rebase, merge, or checkout-detach", "submodule update" can allow a custom command to be used in to update the working tree of submodules via the "submodule.*.update" configuration variable. * "git submodule update" can optionally clone the submodule repositories shallowly. * "git format-patch" learned "--from[=whom]" option, which sets the "From: " header to the specified person (or the person who runs the command, if "=whom" part is missing) and move the original author information to an in-body From: header as necessary. * The configuration variable "merge.ff" was cleary a tri-state to choose one from "favor fast-forward when possible", "always create a merge even when the history could fast-forward" and "do not create any merge, only update when the history fast-forwards", but the command line parser did not implement the usual convention of "last one wins, and command line overrides the configuration" correctly. * "gitweb" learned to optionally place extra links that point at the levels higher than the Gitweb pages themselves in the breadcrumbs, so that it can be used as part of a larger installation. * "git log --format=" now honors i18n.logoutputencoding configuration variable. * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where you fetch from (i.e. a triangular workflow). * Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * "git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * Various subcommands of "git submodule" refused to run from anywhere other than the top of the working tree of the superproject, but they have been taught to let you run from a subdirectory. * "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. * "git rm" gives a single message followed by list of paths to report multiple paths that cannot be removed. * "git rebase" can be told with ":/look for this string" syntax commits to replay the changes onto and where the work to be replayed begins. * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". * On Cygwin, "cygstart" is now recognised as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * "git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * "git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierarchies share the same name. * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal response was to stash them and re-run). This introduced a corner case breakage to "git am --abort" but it has been fixed. * Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". * "check-ignore" (new feature since 1.8.2) has been updated to work more like "check-attr" over bidi-pipes. * "git describe" learned "--first-parent" option to limit its closest tagged commit search to the first-parent chain. * "git merge foo" that might have meant "git merge origin/foo" is diagnosed with a more informative error message. * "git log -L,:" has been added. This may still have leaks and rough edges, though. * We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. "git gc" and "git reflog" have been updated with a new parsing function for expiry dates. * Updates to completion (both bash and zsh) helpers. * The behaviour of the "--chain-reply-to" option of "git send-email" have changed at 1.7.0, and we added a warning/advice message to help users adjust to the new behaviour back then, but we kept it around for too long. The message has finally been removed. * "git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunistically update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. * The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. Performance, Internal Implementation, etc. * On Cygwin, we used to use our own lstat(2) emulation that is allegedly faster than the platform one in codepaths where some of the information it returns did not matter, but it started to bite us in a few codepaths where the trick it uses to cheat does show breakages. This emulation has been removed and we use the native lstat(2) emulation supplied by Cygwin now. * The function attributes extensions are used to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * The code to allow configuration data to be read from in-tree blob objects is in. This may help working in a bare repository and submodule updates. * Fetching between repositories with many refs employed O(n^2) algorithm to match up the common objects, which has been corrected. * The original way to specify remote repository using .git/branches/ used to have a nifty feature. The code to support the feature was still in a function but the caller was changed not to call it 5 years ago, breaking that feature and leaving the supporting code unreachable. The dead code has been removed. * "git pack-refs" that races with new ref creation or deletion have been susceptible to lossage of refs under right conditions, which has been tightened up. * We read loose and packed rerferences in two steps, but after deciding to read a loose ref but before actually opening it to read it, another process racing with us can unlink it, which would cause us to barf. The codepath has been updated to retry when such a race is detected, instead of outright failing. * Uses of the platform fnmatch(3) function (many places in the code, matching pathspec, .gitignore and .gitattributes to name a few) have been replaced with wildmatch, allowing "foo/**/bar" that would match foo/bar, foo/a/bar, foo/a/b/bar, etc. * Memory ownership and lifetime rules for what for-each-ref feeds to its callbacks have been clarified (in short, "you do not own it, so make a copy if you want to keep it"). * The revision traversal logic to improve culling of irrelevant parents while traversing a mergy history has been updated. * Some leaks in unpack-trees (used in merge, cherry-pick and other codepaths) have been plugged. * The codepath to read from marks files in fast-import/export did not have to accept anything but 40-hex representation of the object name. Further, fast-export did not need full in-core object representation to have parsed wen reading from them. These codepaths have been optimized by taking advantage of these access patterns. * Object lookup logic, when the object hashtable starts to become crowded, has been optimized. * When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. * "git clone" uses a lighter-weight implementation when making sure that the history behind refs are complete. * Many warnings from sparse source checker in compat/ area has been squelched. * The code to reading and updating packed-refs file has been updated, correcting corner case bugs. Also contains various documentation updates and code clean-ups. Fixes since v1.8.3 ------------------ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance track are contained in this release (see release notes to them for details). * Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. (merge 35035bb rr/send-email-ssl-verify later to maint). * When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. (merge a11c396 tr/protect-low-3-fds later to maint). * The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. (merge bd23794 jc/mailmap-case-insensitivity later to maint). * In two places we did not check return value (expected to be a file descriptor) correctly. (merge a77f106 tr/fd-gotcha-fixes later to maint). * Logic to auto-detect character encodings in the commit log message did not reject overlong and invalid UTF-8 characters. (merge 81050ac bc/commit-invalid-utf8 later to maint). * Pass port number as a separate argument when "send-email" initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint). * "git diff" refused to even show difference when core.safecrlf is set to true (i.e. error out) and there are offending lines in the working tree files. (merge 5430bb2 jc/maint-diff-core-safecrlf later to maint). * A test that should have failed but didn't revealed a bug that needs to be corrected. (merge 94d75d1 jc/t1512-fix later to maint). * An overlong path to a .git directory may have overflown the temporary path buffer used to create a name for lockfiles. (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were counted as "checkout", and affected later "git checkout -" to the the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint). * "git stash save", when your local change turns a tracked file into a directory, has to remove files in that directory in order to revert your working tree to a pristine state. This will lose untracked files in such a directory, and the command now requires you to "--force" it. * The configuration variable column.ui was poorly documented. (merge 5e62cc1 rr/column-doc later to maint). * "git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint). * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11 and will need to be merged down to the maintanance tracks. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in an error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * Call to discard_cache/discard_index (used when we use different contents of the index in-core, in many operations like commit, apply, and merge) used to leak memory that held the array of index entries, which has been plugged. (merge a0fc4db rs/discard-index-discard-array later to maint). * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", we did not say which branch and worse said "branch ''". * "difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * "git push $there HEAD:branch" did not resolve HEAD early enough, so it was easy to flip it around while push is still going on and push out a branch that the user did not originally intended when the command was started. * The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. * zsh prompt script that borrowed from bash prompt script did not work due to slight differences in array variable notation between these two shells. * An entry for "file://" scheme in the enumeration of URL types Git can take in the HTML documentation was made into a clickable link by mistake. * "git push --[no-]verify" was not documented. * Stop installing the git-remote-testpy script that is only used for testing. * "git commit --allow-empty-message -m ''" should not start an editor. * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22" incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). * "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. * "git log --ancestry-path A...B" did not work as expected, as it did not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * "git clone foo/bar:baz" cannot be a request to clone from a remote over git-over-ssh specified in the scp style. This case is now detected and clones from a local repository at "foo/bar:baz". * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. Loosen the check. * "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. * "git fetch" into a shallow repository from a repository that does not know about the shallow boundary commits (e.g. a different fork from the repository the current shallow repository was cloned from) did not work correctly. * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. ---------------------------------------------------------------- Changes since v1.8.4-rc1 are as follows: Brian M. Carlson (1): Add missing test file for UTF-16. Felix Gruber (1): fix typo in documentation of git-svn Jiang Xin (2): l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed) l10n: zh_CN.po: translate 99 messages (2133t0f0u) Jonathan Nieder (1): log doc: the argument to --encoding is not optional Junio C Hamano (4): Revert "cat-file: split --batch input lines on whitespace" t3900: test rejecting log message with NULs correctly commit: typofix for xxFFF[EF] check Git 1.8.4-rc2 Ramsay Allan Jones (1): cygwin: Remove the Win32 l/stat() implementation René Scharfe (1): t8001, t8002: fix "blame -L :literal" test on NetBSD Stefan Beller (1): .mailmap: Multiple addresses of Michael S. Tsirkin Torstein Hegge (1): Documentation/rev-list-options: add missing word in --*-parents Tran Ngoc Quan (1): l10n: vi.po (2133t) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello all, Our team is proud to announce SubGit 2.0.0 release! New version is available for download at SubGit web site at http://subgit.com/ SubGit lets one to set up a bi-directional Git-SVN mirror, and thus it allows users to choose freely ... [More] between Subversion and Git version control systems. SubGit is a perfect tool for those who's going to migrate from Subversion to Git as well as from Git to SVN. New version introduces the following major features: 1. Support for remote Subversion repositories; 2. One-shot import from Subversion to Git; 3. Flexible branches and tags layout; 4. Significant performance improvements. SubGit is a closed source Java application, which is free for use in Open Source and Academic projects, as well as in any teams with up to 10 committers. Besides, there are no limitations on the time you may evaluate SubGit in commercial or closed source projects. Atlassian Stash users can install SVN Mirror Add-on which is based on SubGit 2.0, so they can manage their Git-SVN mirrors right from Stash UI: https://marketplace.atlassian.com/plugins/org.tmatesoft.subgit.stash-svn-importer For the detailed release notes please refer to http://subgit.com/documentation/release-notes.html Documentation on remote Git-SVN mirror mode: http://subgit.com/book-remote/ Documentation on local Git-SVN mirror mode: http://subgit.com/book/ Documentation on one-shot Git-SVN import: http://subgit.com/book-remote/#import SubGit Issues Tracker: http://issues.tmatesoft.com/issues/SGT Follow us at https://twitter.com/subgit and https://plus.google.com/114128677298030695536 With Best Regards, Semyon Vadishev on behalf of SubGit Team, TMate Software, http://subgit.com/ - Git-SVN Mirror! http://svnkit.com/ - Java [Sub]Versioning Library! http://hg4j.com/ - Java Mercurial Library! http://sqljet.com/ - Java SQLite Library! -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate for Git v1.8.4-rc1 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: ... [More] ab0bb0ed36dd9c0d6425f64021a9c7d7311a2b5c git-1.8.4.rc1.tar.gz 2d3f1f07ed3bde56fac5e823be7d71bf5bf0f743 git-htmldocs-1.8.4.rc1.tar.gz c21f40d9cd2bbf7c28be4d32a1ae1ad98c198d96 git-manpages-1.8.4.rc1.tar.gz The following public repositories all have a copy of the v1.8.4-rc1 tag and the master branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.4 Release Notes (draft) ======================== Backward compatibility notes (for Git 2.0) ------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). In Git 2.0, the default will change to the "simple" semantics that pushes: - only the current branch to the branch with the same name, and only when the current branch is set to integrate with that remote branch, if you are pushing to the same remote as you fetch from; or - only the current branch to the branch with the same name, if you are pushing to a remote that is not where you usually fetch from. Use the user preference configuration variable "push.default" to change this. If you are an old-timer who is used to the "matching" semantics, you can set the variable to "matching" to keep the traditional behaviour. If you want to live in the future early, you can set it to "simple" today without waiting for Git 2.0. When "git add -u" (and "git add -A") is run inside a subdirectory and does not specify which paths to add on the command line, it will operate on the entire tree in Git 2.0 for consistency with "git commit -a" and other commands. There will be no mechanism to make plain "git add -u" behave like "git add -u .". Current users of "git add -u" (without a pathspec) should start training their fingers to explicitly say "git add -u ." before Git 2.0 comes. A warning is issued when these commands are run without a pathspec and when you have local changes outside the current directory, because the behaviour in Git 2.0 will be different from today's version in such a situation. In Git 2.0, "git add " will behave as "git add -A ", so that "git add dir/" will notice paths you removed from the directory and record the removal. Versions before Git 2.0, including this release, will keep ignoring removals, but the users who rely on this behaviour are encouraged to start using "git add --ignore-removal " now before 2.0 is released. Updates since v1.8.3 -------------------- Foreign interfaces, subsystems and ports. * Cygwin port has been updated for more recent Cygwin 1.7. * "git rebase -i" now honors --strategy and -X options. * Git-gui has been updated to its 0.18.0 version. * MediaWiki remote helper (in contrib/) has been updated to use the credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has been updated to kick in not just when talking http/https but also imap(s) and smtp. * Remote transport helper has been updated to report errors and maintain ref hierarchy used to keep track of its own state better. * With "export" remote-helper protocol, (1) a push that tries to update a remote ref whose name is different from the pushing side does not work yet, and (2) the helper may not know how to do --dry-run; these problematic cases are disabled for now. * git-remote-hg/bzr (in contrib/) updates. * git-remote-mw (in contrib/) hints users to check the certificate, when https:// connection failed. * git-remote-mw (in contrib/) adds a command to allow previewing the contents locally before pushing it out, when working with a MediaWiki remote. UI, Workflows & Features * Sample "post-receive-email" hook script got an enhanced replacement "multimail" (in contrib/). * Also in contrib/ is a new "contacts" script that runs "git blame" to find out the people who may be interested in a set of changes. * "git clean" command learned an interactive mode. * The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). The meaning of the option has been changed to always show "HEAD" regardless of what filtering will be applied to any other ref. This is a backward incompatible change and might cause breakages to people's existing scripts. * "git show -s" was less discoverable than it should have been. It now has a natural synonym "git show --no-patch". * "git check-mailmap" is a new command that lets you map usernames and e-mail addresses through the mailmap mechanism, just like many built-in commands do. * "git name-rev" learned to name an annotated tag object back to its tagname; "git name-rev $(git rev-parse v1.0.0)" gives "tags/v1.0.0", for example. * "git cat-file --batch-check=" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * "git rebase [-i]" used to leave just "rebase" as its reflog messages for some operations. They have been reworded to be more informative. * In addition to the choice from "rebase, merge, or checkout-detach", "submodule update" can allow a custom command to be used in to update the working tree of submodules via the "submodule.*.update" configuration variable. * "git submodule update" can optionally clone the submodule repositories shallowly. * "git format-patch" learned "--from[=whom]" option, which sets the "From: " header to the specified person (or the person who runs the command, if "=whom" part is missing) and move the original author information to an in-body From: header as necessary. * The configuration variable "merge.ff" was cleary a tri-state to choose one from "favor fast-forward when possible", "always create a merge even when the history could fast-forward" and "do not create any merge, only update when the history fast-forwards", but the command line parser did not implement the usual convention of "last one wins, and command line overrides the configuration" correctly. * "gitweb" learned to optionally place extra links that point at the levels higher than the Gitweb pages themselves in the breadcrumbs, so that it can be used as part of a larger installation. * "git log --format=" now honors i18n.logoutputencoding configuration variable. * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where you fetch from (i.e. a triangular workflow). * Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * "git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * Various subcommands of "git submodule" refused to run from anywhere other than the top of the working tree of the superproject, but they have been taught to let you run from a subdirectory. * "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. * "git rm" gives a single message followed by list of paths to report multiple paths that cannot be removed. * "git rebase" can be told with ":/look for this string" syntax commits to replay the changes onto and where the work to be replayed begins. * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". * On Cygwin, "cygstart" is now recognised as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * "git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * "git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierarchies share the same name. * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal response was to stash them and re-run). This introduced a corner case breakage to "git am --abort" but it has been fixed. * Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". * "check-ignore" (new feature since 1.8.2) has been updated to work more like "check-attr" over bidi-pipes. * "git describe" learned "--first-parent" option to limit its closest tagged commit search to the first-parent chain. * "git merge foo" that might have meant "git merge origin/foo" is diagnosed with a more informative error message. * "git log -L,:" has been added. This may still have leaks and rough edges, though. * We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. "git gc" and "git reflog" have been updated with a new parsing function for expiry dates. * Updates to completion (both bash and zsh) helpers. * The behaviour of the "--chain-reply-to" option of "git send-email" have changed at 1.7.0, and we added a warning/advice message to help users adjust to the new behaviour back then, but we kept it around for too long. The message has finally been removed. * "git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunistically update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. * The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. Performance, Internal Implementation, etc. * The function attributes extensions are used to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * The code to allow configuration data to be read from in-tree blob objects is in. This may help working in a bare repository and submodule updates. * Fetching between repositories with many refs employed O(n^2) algorithm to match up the common objects, which has been corrected. * The original way to specify remote repository using .git/branches/ used to have a nifty feature. The code to support the feature was still in a function but the caller was changed not to call it 5 years ago, breaking that feature and leaving the supporting code unreachable. The dead code has been removed. * "git pack-refs" that races with new ref creation or deletion have been susceptible to lossage of refs under right conditions, which has been tightened up. * We read loose and packed rerferences in two steps, but after deciding to read a loose ref but before actually opening it to read it, another process racing with us can unlink it, which would cause us to barf. The codepath has been updated to retry when such a race is detected, instead of outright failing. * Uses of the platform fnmatch(3) function (many places in the code, matching pathspec, .gitignore and .gitattributes to name a few) have been replaced with wildmatch, allowing "foo/**/bar" that would match foo/bar, foo/a/bar, foo/a/b/bar, etc. * Memory ownership and lifetime rules for what for-each-ref feeds to its callbacks have been clarified (in short, "you do not own it, so make a copy if you want to keep it"). * The revision traversal logic to improve culling of irrelevant parents while traversing a mergy history has been updated. * Some leaks in unpack-trees (used in merge, cherry-pick and other codepaths) have been plugged. * The codepath to read from marks files in fast-import/export did not have to accept anything but 40-hex representation of the object name. Further, fast-export did not need full in-core object representation to have parsed wen reading from them. These codepaths have been optimized by taking advantage of these access patterns. * Object lookup logic, when the object hashtable starts to become crowded, has been optimized. * When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. * "git clone" uses a lighter-weight implementation when making sure that the history behind refs are complete. * Many warnings from sparse source checker in compat/ area has been squelched. * The code to reading and updating packed-refs file has been updated, correcting corner case bugs. Also contains various documentation updates and code clean-ups. Fixes since v1.8.3 ------------------ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance track are contained in this release (see release notes to them for details). * Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. (merge 35035bb rr/send-email-ssl-verify later to maint). * When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. (merge a11c396 tr/protect-low-3-fds later to maint). * The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. (merge bd23794 jc/mailmap-case-insensitivity later to maint). * In two places we did not check return value (expected to be a file descriptor) correctly. (merge a77f106 tr/fd-gotcha-fixes later to maint). * Logic to auto-detect character encodings in the commit log message did not reject overlong and invalid UTF-8 characters. (merge 81050ac bc/commit-invalid-utf8 later to maint). * Pass port number as a separate argument when "send-email" initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint). * "git diff" refused to even show difference when core.safecrlf is set to true (i.e. error out) and there are offending lines in the working tree files. (merge 5430bb2 jc/maint-diff-core-safecrlf later to maint). * A test that should have failed but didn't revealed a bug that needs to be corrected. (merge 94d75d1 jc/t1512-fix later to maint). * An overlong path to a .git directory may have overflown the temporary path buffer used to create a name for lockfiles. (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were counted as "checkout", and affected later "git checkout -" to the the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint). * "git stash save", when your local change turns a tracked file into a directory, has to remove files in that directory in order to revert your working tree to a pristine state. This will lose untracked files in such a directory, and the command now requires you to "--force" it. * The configuration variable column.ui was poorly documented. (merge 5e62cc1 rr/column-doc later to maint). * "git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint). * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11 and will need to be merged down to the maintanance tracks. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in an error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * Call to discard_cache/discard_index (used when we use different contents of the index in-core, in many operations like commit, apply, and merge) used to leak memory that held the array of index entries, which has been plugged. (merge a0fc4db rs/discard-index-discard-array later to maint). * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", we did not say which branch and worse said "branch ''". * "difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * "git push $there HEAD:branch" did not resolve HEAD early enough, so it was easy to flip it around while push is still going on and push out a branch that the user did not originally intended when the command was started. * The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. * zsh prompt script that borrowed from bash prompt script did not work due to slight differences in array variable notation between these two shells. * An entry for "file://" scheme in the enumeration of URL types Git can take in the HTML documentation was made into a clickable link by mistake. * "git push --[no-]verify" was not documented. * Stop installing the git-remote-testpy script that is only used for testing. * "git commit --allow-empty-message -m ''" should not start an editor. * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22" incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). * "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. * "git log --ancestry-path A...B" did not work as expected, as it did not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * "git clone foo/bar:baz" cannot be a request to clone from a remote over git-over-ssh specified in the scp style. This case is now detected and clones from a local repository at "foo/bar:baz". * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. Loosen the check. * "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. * "git fetch" into a shallow repository from a repository that does not know about the shallow boundary commits (e.g. a different fork from the repository the current shallow repository was cloned from) did not work correctly. * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. ---------------------------------------------------------------- Changes since v1.8.4-rc0 are as follows: Brandon Casey (1): git-completion.bash: replace zsh notation that breaks bash 3.X Daniele Segato (1): docs/git-tag: explain lightweight versus annotated tags Jeff King (6): docs: fix 'report-status' protocol capability thinko docs: note that receive-pack knows side-band-64k capability document 'agent' protocol capability document 'quiet' receive-pack capability commit.h: drop redundant comment commit: tweak empty cherry pick advice for sequencer Jiang Xin (2): Documentation/git-clean: fix description for range git-clean: implement partial matching for selection Junio C Hamano (2): builtin/rm.c: consolidate error reporting for removing submodules Git 1.8.4-rc1 Lukas Fleischer (1): Avoid using `echo -n` anywhere Maurício C Antunes (1): hg-to-git: --allow-empty-message in git commit Michael Haggerty (1): do_one_ref(): save and restore value of current_ref Michal Sojka (1): contrib/subtree: Fix make install target Nguyễn Thái Ngọc Duy (1): document 'allow-tip-sha1-in-want' capability Ondřej Bílka (1): many small typofixes Ralf Thielow (1): git-rebase: fix typo Ramkumar Ramachandra (1): config doc: quote paths, fixing tilde-interpretation Ramsay Allan Jones (1): commit-slab.h: Fix memory allocation and addressing Stefan Beller (1): .mailmap: combine more (email, name) to individual persons Thomas Rast (1): Rename advice.object_name_warning to objectNameWarning -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate preview Git v1.8.4-rc0 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: ... [More] 8e0d93653633fcaffc829f607bd8c1077a855c1d git-1.8.4.rc0.tar.gz 1e2b18ea855b3e06ab2e65be90ec57b135d5f4d5 git-htmldocs-1.8.4.rc0.tar.gz bb48a5c81ecdb9a7ce7dde2ea05a2bd37a093cbc git-manpages-1.8.4.rc0.tar.gz The following public repositories all have a copy of the v1.8.4-rc0 tag and the master branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.4 Release Notes (draft) ======================== Backward compatibility notes (for Git 2.0) ------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). In Git 2.0, the default will change to the "simple" semantics that pushes: - only the current branch to the branch with the same name, and only when the current branch is set to integrate with that remote branch, if you are pushing to the same remote as you fetch from; or - only the current branch to the branch with the same name, if you are pushing to a remote that is not where you usually fetch from. Use the user preference configuration variable "push.default" to change this. If you are an old-timer who is used to the "matching" semantics, you can set the variable to "matching" to keep the traditional behaviour. If you want to live in the future early, you can set it to "simple" today without waiting for Git 2.0. When "git add -u" (and "git add -A") is run inside a subdirectory and does not specify which paths to add on the command line, it will operate on the entire tree in Git 2.0 for consistency with "git commit -a" and other commands. There will be no mechanism to make plain "git add -u" behave like "git add -u .". Current users of "git add -u" (without a pathspec) should start training their fingers to explicitly say "git add -u ." before Git 2.0 comes. A warning is issued when these commands are run without a pathspec and when you have local changes outside the current directory, because the behaviour in Git 2.0 will be different from today's version in such a situation. In Git 2.0, "git add " will behave as "git add -A ", so that "git add dir/" will notice paths you removed from the directory and record the removal. Versions before Git 2.0, including this release, will keep ignoring removals, but the users who rely on this behaviour are encouraged to start using "git add --ignore-removal " now before 2.0 is released. Updates since v1.8.3 -------------------- Foreign interfaces, subsystems and ports. * Cygwin port has been updated for more recent Cygwin 1.7. * "git rebase -i" now honors --strategy and -X options. * Git-gui has been updated to its 0.18.0 version. * MediaWiki remote helper (in contrib/) has been updated to use the credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has been updated to kick in not just when talking http/https but also imap(s) and smtp. * Remote transport helper has been updated to report errors and maintain ref hierarchy used to keep track of its own state better. * With "export" remote-helper protocol, (1) a push that tries to update a remote ref whose name is different from the pushing side does not work yet, and (2) the helper may not know how to do --dry-run; these problematic cases are disabled for now. * git-remote-hg/bzr (in contrib/) updates. * git-remote-mw (in contrib/) hints users to check the certificate, when https:// connection failed. * git-remote-mw (in contrib/) adds a command to allow previewing the contents locally before pushing it out, when working with a MediaWiki remote. UI, Workflows & Features * Sample "post-receive-email" hook script got an enhanced replacement "multimail" (in contrib/). * Also in contrib/ is a new "contacts" script that runs "git blame" to find out the people who may be interested in a set of changes. * "git clean" command learned an interactive mode. * The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). The meaning of the option has been changed to always show "HEAD" regardless of what filtering will be applied to any other ref. This is a backward incompatible change and might cause breakages to people's existing scripts. * "git show -s" was less discoverable than it should have been. It now has a natural synonym "git show --no-patch". * "git check-mailmap" is a new command that lets you map usernames and e-mail addresses through the mailmap mechanism, just like many built-in commands do. * "git name-rev" learned to name an annotated tag object back to its tagname; "git name-rev $(git rev-parse v1.0.0)" gives "tags/v1.0.0", for example. * "git cat-file --batch-check=" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * "git rebase [-i]" used to leave just "rebase" as its reflog messages for some operations. They have been reworded to be more informative. * In addition to the choice from "rebase, merge, or checkout-detach", "submodule update" can allow a custom command to be used in to update the working tree of submodules via the "submodule.*.update" configuration variable. * "git submodule update" can optionally clone the submodule repositories shallowly. * "git format-patch" learned "--from[=whom]" option, which sets the "From: " header to the specified person (or the person who runs the command, if "=whom" part is missing) and move the original author information to an in-body From: header as necessary. * The configuration variable "merge.ff" was cleary a tri-state to choose one from "favor fast-forward when possible", "always create a merge even when the history could fast-forward" and "do not create any merge, only update when the history fast-forwards", but the command line parser did not implement the usual convention of "last one wins, and command line overrides the configuration" correctly. * "gitweb" learned to optionally place extra links that point at the levels higher than the Gitweb pages themselves in the breadcrumbs, so that it can be used as part of a larger installation. * "git log --format=" now honors i18n.logoutputencoding configuration variable. * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where you fetch from (i.e. a triangular workflow). * Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * "git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * Various subcommands of "git submodule" refused to run from anywhere other than the top of the working tree of the superproject, but they have been taught to let you run from a subdirectory. * "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. * "git rm" gives a single message followed by list of paths to report multiple paths that cannot be removed. * "git rebase" can be told with ":/look for this string" syntax commits to replay the changes onto and where the work to be replayed begins. * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". * On Cygwin, "cygstart" is now recognised as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * "git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * "git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierarchies share the same name. * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal response was to stash them and re-run). This introduced a corner case breakage to "git am --abort" but it has been fixed. * Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". * "check-ignore" (new feature since 1.8.2) has been updated to work more like "check-attr" over bidi-pipes. * "git describe" learned "--first-parent" option to limit its closest tagged commit search to the first-parent chain. * "git merge foo" that might have meant "git merge origin/foo" is diagnosed with a more informative error message. * "git log -L,:" has been added. This may still have leaks and rough edges, though. * We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. "git gc" and "git reflog" have been updated with a new parsing function for expiry dates. * Updates to completion (both bash and zsh) helpers. * The behaviour of the "--chain-reply-to" option of "git send-email" have changed at 1.7.0, and we added a warning/advice message to help users adjust to the new behaviour back then, but we kept it around for too long. The message has finally been removed. * "git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunistically update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. * The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. Performance, Internal Implementation, etc. * The function attributes extensions are used to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * The code to allow configuration data to be read from in-tree blob objects is in. This may help working in a bare repository and submodule updates. * Fetching between repositories with many refs employed O(n^2) algorithm to match up the common objects, which has been corrected. * The original way to specify remote repository using .git/branches/ used to have a nifty feature. The code to support the feature was still in a function but the caller was changed not to call it 5 years ago, breaking that feature and leaving the supporting code unreachable. The dead code has been removed. * "git pack-refs" that races with new ref creation or deletion have been susceptible to lossage of refs under right conditions, which has been tightened up. * We read loose and packed rerferences in two steps, but after deciding to read a loose ref but before actually opening it to read it, another process racing with us can unlink it, which would cause us to barf. The codepath has been updated to retry when such a race is detected, instead of outright failing. * Uses of the platform fnmatch(3) function (many places in the code, matching pathspec, .gitignore and .gitattributes to name a few) have been replaced with wildmatch, allowing "foo/**/bar" that would match foo/bar, foo/a/bar, foo/a/b/bar, etc. * Memory ownership and lifetime rules for what for-each-ref feeds to its callbacks have been clarified (in short, "you do not own it, so make a copy if you want to keep it"). * The revision traversal logic to improve culling of irrelevant parents while traversing a mergy history has been updated. * Some leaks in unpack-trees (used in merge, cherry-pick and other codepaths) have been plugged. * The codepath to read from marks files in fast-import/export did not have to accept anything but 40-hex representation of the object name. Further, fast-export did not need full in-core object representation to have parsed wen reading from them. These codepaths have been optimized by taking advantage of these access patterns. * Object lookup logic, when the object hashtable starts to become crowded, has been optimized. * When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. * "git clone" uses a lighter-weight implementation when making sure that the history behind refs are complete. * Many warnings from sparse source checker in compat/ area has been squelched. * The code to reading and updating packed-refs file has been updated, correcting corner case bugs. Also contains various documentation updates and code clean-ups. Fixes since v1.8.3 ------------------ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance track are contained in this release (see release notes to them for details). * Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. (merge 35035bb rr/send-email-ssl-verify later to maint). * When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. (merge a11c396 tr/protect-low-3-fds later to maint). * The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. (merge bd23794 jc/mailmap-case-insensitivity later to maint). * In two places we did not check return value (expected to be a file descriptor) correctly. (merge a77f106 tr/fd-gotcha-fixes later to maint). * Logic to auto-detect character encodings in the commit log message did not reject overlong and invalid UTF-8 characters. (merge 81050ac bc/commit-invalid-utf8 later to maint). * Pass port number as a separate argument when "send-email" initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint). * "git diff" refused to even show difference when core.safecrlf is set to true (i.e. error out) and there are offending lines in the working tree files. (merge 5430bb2 jc/maint-diff-core-safecrlf later to maint). * A test that should have failed but didn't revealed a bug that needs to be corrected. (merge 94d75d1 jc/t1512-fix later to maint). * An overlong path to a .git directory may have overflown the temporary path buffer used to create a name for lockfiles. (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint). * Invocations of "git checkout" used internally by "git rebase" were counted as "checkout", and affected later "git checkout -" to the the user to an unexpected place. (merge 3bed291 rr/rebase-checkout-reflog later to maint). * "git stash save", when your local change turns a tracked file into a directory, has to remove files in that directory in order to revert your working tree to a pristine state. This will lose untracked files in such a directory, and the command now requires you to "--force" it. * The configuration variable column.ui was poorly documented. (merge 5e62cc1 rr/column-doc later to maint). * "git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint). * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11 and will need to be merged down to the maintanance tracks. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in an error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * Call to discard_cache/discard_index (used when we use different contents of the index in-core, in many operations like commit, apply, and merge) used to leak memory that held the array of index entries, which has been plugged. (merge a0fc4db rs/discard-index-discard-array later to maint). * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", we did not say which branch and worse said "branch ''". * "difftool --dir-diff" did not copy back changes made by the end-user in the diff tool backend to the working tree in some cases. * "git push $there HEAD:branch" did not resolve HEAD early enough, so it was easy to flip it around while push is still going on and push out a branch that the user did not originally intended when the command was started. * The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. * zsh prompt script that borrowed from bash prompt script did not work due to slight differences in array variable notation between these two shells. * An entry for "file://" scheme in the enumeration of URL types Git can take in the HTML documentation was made into a clickable link by mistake. * "git push --[no-]verify" was not documented. * Stop installing the git-remote-testpy script that is only used for testing. * "git commit --allow-empty-message -m ''" should not start an editor. * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22" incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). * "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. * "git log --ancestry-path A...B" did not work as expected, as it did not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * "git clone foo/bar:baz" cannot be a request to clone from a remote over git-over-ssh specified in the scp style. This case is now detected and clones from a local repository at "foo/bar:baz". * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. Loosen the check. * "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. * "git fetch" into a shallow repository from a repository that does not know about the shallow boundary commits (e.g. a different fork from the repository the current shallow repository was cloned from) did not work correctly. * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git v1.8.3.4 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: fe633d02f7d964842d7ea804278b75120fc60c11 ... [More] git-1.8.3.4.tar.gz 1f1200515e1e7042bcbd4176ef76c58021cd9a83 git-htmldocs-1.8.3.4.tar.gz 04fe5a752234262d128220f09ea25c0faa447947 git-manpages-1.8.3.4.tar.gz The following public repositories all have a copy of the v1.8.3.4 tag and the maint branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Also, http://www.kernel.org/pub/software/scm/git/ has copies of the release tarballs. Git v1.8.3.4 Release Notes ========================== This update is mostly to propagate documentation fixes and test updates from the master front back to the maintenance track. Fixes since v1.8.3.3 -------------------- * The bisect log listed incorrect commits when bisection ends with only skipped ones. * The test coverage framework was left broken for some time. * The test suite for HTTP transport did not run with Apache 2.4. * "git diff" used to fail when core.safecrlf is set and the working tree contents had mixed CRLF/LF line endings. Committing such a content must be prohibited, but "git diff" should help the user to locate and fix such problems without failing. ---------------------------------------------------------------- Changes since v1.8.3.3 are as follows: Dennis Kaarsemaker (2): tests: allow sha1's as part of the path GIT-VERSION-GEN: support non-standard $GIT_DIR path Fraser Tweedale (2): documentation: add git:// transport security notice diff-options: document default similarity index Jeff King (5): t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 t/lib-httpd/apache.conf: load compat access module in apache 2.4 t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 lib-httpd/apache.conf: check version only after mod_version loads Johannes Sixt (10): test-chmtime: Fix exit code on Windows t3010: modernize style tests: introduce test_ln_s_add tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) t0000: use test_ln_s_add to remove SYMLINKS prerequisite t3030: use test_ln_s_add to remove SYMLINKS prerequisite t3100: use test_ln_s_add to remove SYMLINKS prerequisite t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite t6035: use test_ln_s_add to remove SYMLINKS prerequisite t4011: remove SYMLINKS prerequisite Junio C Hamano (7): fetch-options.txt: prevent a wildcard refspec from getting misformatted diff: demote core.safecrlf=true to core.safecrlf=warn t1512: correct leftover constants from earlier edition get_short_sha1(): correctly disambiguate type-limited abbreviation Start preparing for 1.8.3.4 Update draft release notes to 1.8.3.4 Git 1.8.3.4 Kevin Bracey (1): Documentation: Move "git diff " Matthieu Moy (2): Documentation/git-push.txt: explain better cases where --force is dangerous Documentation/git-merge.txt: weaken warning about uncommited changes Michael Haggerty (1): lockfile: fix buffer overflow in path handling Namhyung Kim (1): config: Add description of --local option Ondřej Bílka (1): update URL to the marc.info mail archive Phil Hord (1): fix "builtin-*" references to be "builtin/*" Ramkumar Ramachandra (2): column doc: rewrite documentation for column.ui name-rev doc: rewrite --stdin paragraph René Scharfe (9): t5000: integrate export-subst tests into regular tests t5000, t5003: create directories for extracted files lazily t5000: factor out check_tar t5000: use check_tar for prefix test t5000: simplify tar-tree tests t5000: test long filenames read-cache: add simple performance test read-cache: free cache in discard_index use logical OR (||) instead of binary OR (|) in logical context Stefan Beller (4): archive-zip:write_zip_entry: Remove second reset of size variable to zero. Documentation: "git reset " takes a tree-ish, not tree-sh http-push.c::add_send_request(): do not initialize transfer_request apply.c::find_name_traditional(): do not initialize len to the line's length Thomas Rast (7): coverage: split build target into compile and test coverage: do not delete .gcno files before building coverage: set DEFAULT_TEST_TARGET to avoid using prove coverage: build coverage-untested-functions by default Test 'commit --only' after 'checkout --orphan' t9902: fix 'test A == B' to use = operator test-lint: detect 'export FOO=bar' Torstein Hegge (1): bisect: Fix log output for multi-parent skip ranges Veres Lajos (1): random typofixes (committed missing a 't', successful missing an 's') Vitor Antunes (1): t9801: git-p4: check ignore files with client spec W. Trevor King (1): user-manual: Update download size for Git and the kernel Yaakov Selkowitz (1): web--browse: support /usr/bin/cygstart on Cygwin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git v1.8.3.3 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 417cb12660446702bffc5c2c83cbb6e7f1e60c79 ... [More] git-1.8.3.3.tar.gz c6104064c1276b2405a281e104fc54ff86f7299d git-htmldocs-1.8.3.3.tar.gz 07361cfd38b8c57207b9a5f8bf0c4456b7229b52 git-manpages-1.8.3.3.tar.gz The following public repositories all have a copy of the v1.8.3.3 tag and the maint branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Also, http://www.kernel.org/pub/software/scm/git/ has copies of the release tarballs. Git v1.8.3.3 Release Notes ========================== Fixes since v1.8.3.2 -------------------- * "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11. * Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * "git pull" into nothing trashed "local changes" that were in the index. * Many "git submodule" operations did not work on a submodule at a path whose name is not in ASCII. * "cherry-pick" had a small leak in its error codepath. * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * The wildmatch engine did not honor WM_CASEFOLD option correctly. * "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * When a reflog notation is used for implicit "current branch", e.g. "git log @{u}", we did not say which branch and worse said "branch ''" in the error messages. * Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. Also contains various minor documentation updates. ---------------------------------------------------------------- Changes since v1.8.3.2 are as follows: Andrew Pimlott (2): lib-rebase: document exec_ in FAKE_LINES t7500: fix flipped actual/expect Anthony Ramine (1): wildmatch: properly fold case everywhere Brandon Casey (1): http.c: don't rewrite the user:passwd string multiple times Charles McGarvey (1): gitweb: fix problem causing erroneous project list Chris Rorvick (1): git.txt: remove stale comment regarding GIT_WORK_TREE Clemens Buchacher (1): fix segfault with git log -c --follow David Aguilar (4): Makefile: fix default regex settings on Darwin Makefile: add support for Apple CommonCrypto facility cache.h: eliminate SHA-1 deprecation warnings on Mac OS X imap-send: eliminate HMAC deprecation warnings on Mac OS X Dmitry Marakasov (1): contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash Felipe Contreras (4): read-cache: fix wrong 'the_index' usage read-cache: trivial style cleanups sequencer: remove useless indentation sequencer: avoid leaking message buffer when refusing to create an empty commit Filipe Cabecinhas (1): compate/clipped-write.c: large write(2) fails on Mac OS X/XNU Fredrik Gustafsson (1): handle multibyte characters in name Jeff King (1): pull: update unborn branch tip after index John Keeping (1): git-config: update doc for --get with multiple values Junio C Hamano (6): deprecate core.statinfo at Git 2.0 boundary t5551: do not use unportable sed '\+' Documentation/diff-index: mention two modes of operation Start preparing for 1.8.3.3 Update draft release notes to 1.8.3.3 Git 1.8.3.3 Michael S. Tsirkin (9): t/send-email.sh: add test for suppress-cc=self send-email: fix suppress-cc=self on cccmd t/send-email: test suppress-cc=self on cccmd send-email: make --suppress-cc=self sanitize input t/send-email: add test with quoted sender t/send-email: test suppress-cc=self with non-ascii test-send-email: test for pre-sanitized self name send-email: add test for duplicate utf8 name send-email: sanitize author when writing From line Ramkumar Ramachandra (6): sha1_name: fix error message for @{u} sha1_name: fix error message for @{}, @{} diffcore-pickaxe: make error messages more consistent diffcore-pickaxe doc: document -S and -G properly check-ignore doc: fix broken link to ls-files page fixup-builtins: retire an old transition helper script René Scharfe (2): t5004: avoid using tar for checking emptiness of archive t5004: resurrect original empty tar archive test Richard Hansen (1): Documentation/merge-options.txt: restore `-e` option SZEDER Gábor (1): test: spell 'ls-files --delete' option correctly in test descriptions Thomas Rast (2): pull: merge into unborn by fast-forwarding from empty tree apply: carefully strdup a possibly-NULL name Torsten Bögershausen (1): t7400: test of UTF-8 submodule names pass under Mac OS Vikrant Varma (2): help: add help_unknown_ref() merge: use help_unknown_ref() -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]