Git

What is it? ----------- A universal installer for Git on OS X supporting Mac OS X 10.4.8 or later including PowerPC/Intel and both 32 and 64 bit. Isn't there one already? ------------------------ Yes, there is another OS X installer for Git ... [More] available. That one, however, did not meet my needs so I created this one and decided to share it in case anyone else has similar requirements. Features -------- * This installer includes PowerPC/Intel 32/64 bit binaries and runs on 10.4.8 or later. So if you're running PPC 10.5 on a G5 and need a 64- bit Git you're good to go. * The Git translations ARE included and may optionally be chosen based on the System Preferences languages selection(s) instead of the LANG and related environment variables. * Besides the man pages; the html docs, release notes, api, howto etc. docs are also included. * This is a Secure Transport-based Git -- no OpenSSL is used. This means all root certificates (by default) come from the standard OS X keychain location(s). Both git imap-send and git send-email operate using Secure Transport in this build (via libcurl). * git send-email, git imap-send and git instaweb work out-of-the-box with no additional software installation required. * git subtree and git-credential-osxkeychain are included. * A build of the curl command-line utility that uses Secure Transport is also included (may be optionally disabled in the installer) for convenience. * A build of the GnuPG gpg utility (with docs) is included (may be optionally disabled in the installer) for signing/verifying convenience which also supports creating top secret strength RSA keys. * A build of TopGit is included (may be optionally disabled in the installer) for patch management. * Library headers are included (may be optionally disabled in the installer) for ease of building a custom Git against the same libraries the installed Git uses. * Provides a complete solution for using Git on Mac OS X 10.4.x and 10.5.x including full support for https/imaps/ftps/smtps TLS certificates which use the SHA-2 family of hash functions (such as SHA-256). * Fully supports TLS 1.2 when run on a version of OS X with TLS 1.2 support (OS X 10.9 and later). * Currently provides Git version 2.1.4 (with backports of the executable-config-file fix, reflog-reading fix and imap-send-via- libcurl patch). Installers for later versions of Git are planned. Downloads --------- Download links (and hashes) for the 11 MiB installer (a .dmg image) are available at: http://mackyle.github.io/git-osx-installer/ -Kyle -- 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 v2.2.1 is now available at the usual places. This is a security-fix for CVE-2014-9390, which affects users on Windows and Mac OS X but not typical UNIX users. A set of new releases for older maintenance tracks ... [More] (v1.8.5.6, v1.9.5, v2.0.5, and v2.1.4) are published at the same time and they contain the same fix. Various implementations and ports, including Git for Windows, Git OS X installer, JGit & EGit, libgit2 (and Visual Studio which uses it) have been updated at the same time. Even though the issue may not affect Linux users, if you are a hosting service whose users may fetch from your service to Windows or Mac OS X machines, you are strongly encouraged to update to protect such users who use existing versions of Git. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.2.1' 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 Git v2.2.1 Release Notes ======================== Fixes since v2.2 ---------------- * We used to allow committing a path ".Git/config" with Git that is running on a case sensitive filesystem, but an attempt to check out such a path with Git that runs on a case insensitive filesystem would have clobbered ".git/config", which is definitely not what the user would have expected. Git now prevents you from tracking a path with ".Git" (in any case combination) as a path component. * On Windows, certain path components that are different from ".git" are mapped to ".git", e.g. "git~1/config" is treated as if it were ".git/config". HFS+ has a similar issue, where certain unicode codepoints are ignored, e.g. ".g\u200cit/config" is treated as if it were ".git/config". Pathnames with these potential issues are rejected on the affected systems. Git on systems that are not affected by this issue (e.g. Linux) can also be configured to reject them to ensure cross platform interoperability of the hosted projects. * "git fsck" notices a tree object that records such a path that can be confused with ".git", and with receive.fsckObjects configuration set to true, an attempt to "git push" such a tree object will be rejected. Such a path may not be a problem on some filesystems but in order to protect those on HFS+ and on case insensitive filesystems, this check is enabled on all platforms. A big "thanks!" for bringing this issue to us goes to our friends in the Mercurial land, namely, Matt Mackall and Augie Fackler. Also contains typofixes, documentation updates and trivial code clean-ups. ---------------------------------------------------------------- Changes since v2.2.0 are as follows: Hartmut Henkel (1): l10n: de.po: fix typos Jeff King (8): unpack-trees: propagate errors adding entries to the index read-tree: add tests for confusing paths like ".." and ".git" verify_dotfile(): reject .git case-insensitively t1450: refactor ".", "..", and ".git" fsck tests fsck: notice .git case-insensitively utf8: add is_hfs_dotgit() helper read-cache: optionally disallow HFS+ .git variants fsck: complain about HFS+ ".git" aliases in trees Johannes Schindelin (3): path: add is_ntfs_dotgit() helper read-cache: optionally disallow NTFS .git variants fsck: complain about NTFS ".git" aliases in trees Junio C Hamano (6): Start post 2.2 cycle Git 1.8.5.6 Git 1.9.5 Git 2.0.5 Git 2.1.4 Git 2.2.1 -- 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 feature release Git v2.2 is now available at the usual places. Big thanks go to 77 contributors, among which 20 are new people, who made 550 changes in total since Git v2.1 was released. The tarballs are found at: ... [More] https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.2.0' 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 v2.2 Release Notes ====================== Updates since v2.1 ------------------ Ports * Building on older MacOS X systems automatically sets the necessary NO_APPLE_COMMON_CRYPTO build-time option. * Building with NO_PTHREADS has been resurrected. * Compilation options have been updated a bit to better support the z/OS port. UI, Workflows & Features * "git archive" learned to filter what gets archived with a pathspec. * "git config --edit --global" starts from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any global config. This immediately reduces the need to later ask "Have you forgotten to set core.user?", and we can add more to the template as we gain more experience. * "git stash list -p" used to be almost always a no-op because each stash entry is represented as a merge commit. It learned to show the difference between the base commit version and the working tree version, which is in line with what "git stash show" gives. * Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. "fast-export" was taught an "--anonymize" option to replace blob contents, names of people, paths and log messages with bland and simple strings to help them. * "git difftool" learned an option to stop feeding paths to the diff backend when it exits with a non-zero status. * "git grep" learned to paint (or not paint) partial matches on context lines when showing "grep -C" output in color. * "log --date=iso" uses a slight variant of the ISO 8601 format that is more human readable. A new "--date=iso-strict" option gives datetime output that conforms more strictly. * The logic "git prune" uses is more resilient against various corner cases. * A broken reimplementation of Git could write an invalid index that records both stage #0 and higher-stage entries for the same path. We now notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove the higher-stage entries, or if it wanted to unresolve and forgot to remove the stage #0 entry). * The temporary files "git mergetool" uses are renamed to avoid too many dots in them (e.g. a temporary file for "hello.c" used to be named e.g. "hello.BASE.4321.c" but now uses underscore instead, e.g. "hello_BASE_4321.c", to allow us to have multiple variants). * The temporary files "git mergetool" uses can be placed in a newly created temporary directory, instead of the current directory, by setting the mergetool.writeToTemp configuration variable. * "git mergetool" understands "--tool bc" now, as version 4 of BeyondCompare can be driven the same way as its version 3 and it feels awkward to say "--tool bc3" to run version 4. * The "pre-receive" and "post-receive" hooks are no longer required to consume their input fully (not following this requirement used to result in intermittent errors in "git push"). * The pretty-format specifier "%d", which expands to " (tagname)" for a tagged commit, gained a cousin "%D" that just gives the "tagname" without frills. * "git push" learned "--signed" push, that allows a push (i.e. request to update the refs on the other side to point at a new history, together with the transmission of necessary objects) to be signed, so that it can be verified and audited, using the GPG signature of the person who pushed, that the tips of branches at a public repository really point the commits the pusher wanted to, without having to "trust" the server. * "git interpret-trailers" is a new filter to programmatically edit the tail end of the commit log messages, e.g. "Signed-off-by:". * "git help everyday" shows the "Everyday Git in 20 commands or so" document, whose contents have been updated to match more modern Git practice. * On the "git svn" front, work progresses to reduce memory consumption and to improve handling of mergeinfo. Performance, Internal Implementation, Development Support etc. * The API to manipulate the "refs" has been restructured to make it more transactional, with the eventual goal to allow all-or-none atomic updates and migrating the storage to something other than the traditional filesystem based one (e.g. databases). * The lockfile API and its users have been cleaned up. * We no longer attempt to keep track of individual dependencies to the header files in the build procedure, relying instead on automated dependency generation support from modern compilers. * In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites long before negated prerequisites e.g. !MINGW were invented. The former has been converted to the latter to avoid confusion. * Optimized looking up a remote's configuration in a repository with very many remotes defined. * There are cases where you lock and open to write a file, close it to show the updated contents to an external processes, and then have to update the file again while still holding the lock; now the lockfile API has support for such an access pattern. * The API to allocate the structure to keep track of commit decoration has been updated to make it less cumbersome to use. * An in-core caching layer to let us avoid reading the same configuration files several times has been added. A few commands have been converted to use this subsystem. * Various code paths have been cleaned up and simplified by using the "strbuf", "starts_with()", and "skip_prefix()" APIs more. * A few codepaths that died when large blobs that would not fit in core are involved in their operation have been taught to punt instead, by e.g. marking a too-large blob as not to be diffed. * A few more code paths in "commit" and "checkout" have been taught to repopulate the cache-tree in the index, to help speed up later "write-tree" (used in "commit") and "diff-index --cached" (used in "status"). * A common programming mistake to assign the same short option name to two separate options is detected by the parse_options() API to help developers. * The code path to write out the packed-refs file has been optimized, which especially matters in a repository with a large number of refs. * The check to see if a ref $F can be created by making sure no existing ref has $F/ as its prefix has been optimized, which especially matters in a repository with a large number of existing refs. * "git fsck" was taught to check the contents of tag objects a bit more. * "git hash-object" was taught a "--literally" option to help debugging. * When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * The scripts in the test suite can be run with the "-x" option to show a shell-trace of each command they run. * The "run-command" API learned to manage the argv and environment arrays for child process, alleviating the need for the callers to allocate and deallocate them. * Some people use AsciiDoctor, instead of AsciiDoc, to format our documentation set; the documentation has been adjusted to be usable by both, as AsciiDoctor is pickier than AsciiDoc about its input mark-up. Also contains various documentation updates and code clean-ups. Fixes since v2.1 ---------------- Unless otherwise noted, all the fixes since v2.1 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * "git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * "git -c section.var command" and "git -c section.var= command" should pass the configuration value differently (the former should be a boolean true, the latter should be an empty string). * Applying a patch not generated by Git in a subdirectory used to check for whitespace breakage using the attributes of incorrect paths. Also whitespace checks were performed even for paths excluded via the "git apply --exclude=" mechanism. * "git bundle create" with a date-range specification was meant to exclude tags outside the range, but it didn't. * "git add x" where x used to be a directory and is now a symbolic link to a directory misbehaved. * The prompt script checked the $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * Pack-protocol documentation had a minor typo. * "git checkout -m" did not switch to another branch while carrying the local changes forward when a path was deleted from the index. * "git daemon" (with NO_IPV6 build configuration) used to incorrectly use the hostname even when gethostbyname() reported that the given hostname is not found. (merge 107efbe rs/daemon-fixes later to maint). * With sufficiently long refnames, "git fast-import" could have overflowed an on-stack buffer. * After "pack-refs --prune" packed refs at the top-level, it failed to prune them. * Progress output from "git gc --auto" was visible in "git fetch -q". * We used to pass -1000 to poll(2), expecting it to also mean "no timeout", which should be spelled as -1. * "git rebase" documentation was unclear that it is required to specify on what the rebase is to be done when telling it to first check out . (merge 95c6826 so/rebase-doc later to maint). * "git push" over HTTP transport had an artificial limit on the number of refs that can be pushed, imposed by the command line length. (merge 26be19b jk/send-pack-many-refspecs later to maint). * When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. (merge ab791dd jk/index-pack-threading-races later to maint). * An attempt to remove the entire tree in the "git fast-import" input stream caused it to misbehave. (merge 2668d69 mb/fast-import-delete-root later to maint). * Reachability check (used in "git prune" and friends) did not add a detached HEAD as a starting point to traverse objects still in use. (merge c40fdd0 mk/reachable-protect-detached-head later to maint). * "git config --add section.var val" when section.var already has an empty-string value used to lose the empty-string value. (merge c1063be ta/config-add-to-empty-or-true-fix later to maint). * "git fsck" failed to report that it found corrupt objects via its exit status in some cases. (merge 30d1038 jk/fsck-exit-code-fix later to maint). * Use of the "--verbose" option used to break "git branch --merged". (merge 12994dd jk/maint-branch-verbose-merged later to maint). * Some MUAs mangle a line in a message that begins with "From " to ">From " when writing to a mailbox file, and feeding such an input to "git am" used to lose such a line. (merge 85de86a jk/mbox-from-line later to maint). * "rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * A handful of C source files have been updated to include "git-compat-util.h" as the first thing, to conform better to our coding guidelines. (merge 1c4b660 da/include-compat-util-first-in-c later to maint). * The t7004 test, which tried to run Git with small stack space, has been updated to use a bit larger stack to avoid false breakage on some platforms. (merge b9a1907 sk/tag-contains-wo-recursion later to maint). * A few documentation pages had example sections marked up not quite correctly, which passed AsciiDoc but failed with AsciiDoctor. (merge c30c43c bc/asciidoc-pretty-formats-fix later to maint). (merge f8a48af bc/asciidoc later to maint). * "gitweb" used deprecated CGI::startfrom, which was removed from CGI.pm as of 4.04; use CGI::start_from instead. (merge 4750f4b rm/gitweb-start-form later to maint). * Newer versions of 'meld' break the auto-detection we use to see if they are new enough to support the `--output` option. (merge b12d045 da/mergetool-meld later to maint). * "git pack-objects" forgot to disable the codepath to generate the object reachability bitmap when it needs to split the resulting pack. (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint). * The code to use cache-tree trusted the on-disk data too much and fell into an infinite loop upon seeing an incorrectly recorded index file. (merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint). * "git fetch" into a repository where branch B was deleted earlier, back when it had reflog enabled, and then branch B/C is fetched into it without reflog enabled, which is arguably an unlikely corner case, unnecessarily failed. (merge aae828b jk/fetch-reflog-df-conflict later to maint). * "git log --first-parent -L..." used to crash. (merge a8787c5 tm/line-log-first-parent later to maint). -- 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 v2.2.0-rc3 is now available for testing at the usual places. I was planning to do the final one but we found and fixed last-minute bugs in the code in -rc2, so this is to doubly make sure the result is fit for the final one ... [More] , which I am planning to tag mid next week. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.2.0-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 v2.2 Release Notes (draft) ============================== Updates since v2.1 ------------------ Ports * Building on older MacOS X systems automatically sets the necessary NO_APPLE_COMMON_CRYPTO build-time option. * The support to build with NO_PTHREADS has been resurrected. * Compilation options has been updated a bit to support z/OS port better. UI, Workflows & Features * "git archive" learned to filter what gets archived with pathspec. * "git config --edit --global" starts from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any. This immediately reduces the need for a later "Have you forgotten setting core.user?" and we can add more to the template as we gain more experience. * "git stash list -p" used to be almost always a no-op because each stash entry is represented as a merge commit. It learned to show the difference between the base commit version and the working tree version, which is in line with what "git stash show" gives. * Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. "fast-export" was taught an "--anonymize" option to replace blob contents, names of people and paths and log messages with bland and simple strings to help them. * "git difftool" learned an option to stop feeding paths to the diff backend when it exits with a non-zero status. * "git grep" allows to paint (or not paint) partial matches on context lines when showing "grep -C" output in color. * "log --date=iso" uses a slight variant of ISO 8601 format that is made more human readable. A new "--date=iso-strict" option gives datetime output that is more strictly conformant. * The logic "git prune" uses is more resilient against various corner cases. * A broken reimplementation of Git could write an invalid index that records both stage #0 and higher stage entries for the same path. We now notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove higher stage entries, or if it wanted to unresolve and forgot to remove the stage#0 entry). * The temporary files "git mergetool" uses are named to avoid too many dots in them (e.g. a temporary file for "hello.c" used to be named e.g. "hello.BASE.4321.c" but now uses underscore instead, e.g. "hello_BASE_4321.c", to allow us to have multiple variants). * The temporary files "git mergetool" uses can be placed in a newly created temporary directory, instead of the current directory, by setting the mergetool.writeToTemp configuration variable. * "git mergetool" understands "--tool bc" now, as version 4 of BeyondCompare can be driven the same way as its version 3 and it feels awkward to say "--tool bc3" to run version 4. * The "pre-receive" and "post-receive" hooks are no longer required to consume their input fully (not following this requirement used to result in intermittent errors in "git push"). * The pretty-format specifier "%d", which expanded to " (tagname)" for a tagged commit, gained a cousin "%D" that just gives the "tagname" without frills. * "git push" learned "--signed" push, that allows a push (i.e. request to update the refs on the other side to point at a new history, together with the transmission of necessary objects) to be signed, so that it can be verified and audited, using the GPG signature of the person who pushed, that the tips of branches at a public repository really point the commits the pusher wanted to, without having to "trust" the server. * "git interpret-trailers" is a new filter to programmatically edit the tail end of the commit log messages, e.g. "Signed-off-by:". * "git help everyday" shows the "Everyday Git in 20 commands or so" document, whose contents have been updated to match more modern Git practice. * On the "git svn" front, work to reduce memory consumption and to improve handling of mergeinfo progresses. Performance, Internal Implementation, Development Support etc. * The API to manipulate the "refs" has been restructured to make it more transactional, with the eventual goal to allow all-or-none atomic updates and migrating the storage to something other than the traditional filesystem based one (e.g. databases). * The lockfile API and its users have been cleaned up. * We no longer attempt to keep track of individual dependencies to the header files in the build procedure, relying on automated dependency generation support from modern compilers. * In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites long before negated prerequisites e.g. !MINGW were invented. The former has been converted to the latter to avoid confusion. * Looking up remotes configuration in a repository with very many remotes defined has been optimized. * There are cases where you lock and open to write a file, close it to show the updated contents to external processes, and then have to update the file again while still holding the lock; now the lockfile API has support for such an access pattern. * The API to allocate the structure to keep track of commit decoration has been updated to make it less cumbersome to use. * An in-core caching layer to let us avoid reading the same configuration files number of times has been added. A few commands have been converted to use this subsystem. * Various code paths have been cleaned up and simplified by using "strbuf", "starts_with()", and "skip_prefix()" APIs more. * A few codepaths that died when large blobs that would not fit in core are involved in their operation have been taught to punt instead, by e.g. marking too large a blob as not to be diffed. * A few more code paths in "commit" and "checkout" have been taught to repopulate the cache-tree in the index, to help speed up later "write-tree" (used in "commit") and "diff-index --cached" (used in "status"). * A common programming mistake to assign the same short option name to two separate options is detected by parse_options() API to help developers. * The code path to write out the packed-refs file has been optimized, which especially matters in a repository with a large number of refs. * The check to see if a ref $F can be created by making sure no existing ref has $F/ as its prefix has been optimized, which especially matters in a repository with a large number of existing refs. * "git fsck" was taught to check contents of tag objects a bit more. * "git hash-object" was taught a "--literally" option to help debugging. * When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * The scripts in the test suite can be run with "-x" option to show a shell-trace of each command run in them. * The "run-command" API learned to manage the argv and environment arrays for child process, alleviating the need for the callers to allocate and deallocate them. * Some people use AsciiDoctor, instead of AsciiDoc, to format our documentation set; the documentation has been adjusted to be usable by both, as AsciiDoctor is pickier than AsciiDoc in its input mark-up. Also contains various documentation updates and code clean-ups. Fixes since v2.1 ---------------- Unless otherwise noted, all the fixes since v2.1 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * "git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * "git -c section.var command" and "git -c section.var= command" should pass the configuration differently (the former should be a boolean true, the latter should be an empty string). * Applying a patch not generated by Git in a subdirectory used to check the whitespace breakage using the attributes for incorrect paths. Also whitespace checks were performed even for paths excluded via "git apply --exclude=" mechanism. * "git bundle create" with date-range specification were meant to exclude tags outside the range, but it didn't. * "git add x" where x that used to be a directory has become a symbolic link to a directory misbehaved. * The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * Pack-protocol documentation had a minor typo. * "git checkout -m" did not switch to another branch while carrying the local changes forward when a path was deleted from the index. * "git daemon" (with NO_IPV6 build configuration) used to incorrectly use the hostname even when gethostbyname() reported that the given hostname is not found. (merge 107efbe rs/daemon-fixes later to maint). * With sufficiently long refnames, "git fast-import" could have overflown an on-stack buffer. * After "pack-refs --prune" packed refs at the top-level, it failed to prune them. * Progress output from "git gc --auto" was visible in "git fetch -q". * We used to pass -1000 to poll(2), expecting it to also mean "no timeout", which should be spelled as -1. * "git rebase" documentation was unclear that it is required to specify on what the rebase is to be done when telling it to first check out . (merge 95c6826 so/rebase-doc later to maint). * "git push" over HTTP transport had an artificial limit on number of refs that can be pushed imposed by the command line length. (merge 26be19b jk/send-pack-many-refspecs later to maint). * When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. (merge ab791dd jk/index-pack-threading-races later to maint). * An attempt to remove the entire tree in the "git fast-import" input stream caused it to misbehave. (merge 2668d69 mb/fast-import-delete-root later to maint). * Reachability check (used in "git prune" and friends) did not add a detached HEAD as a starting point to traverse objects still in use. (merge c40fdd0 mk/reachable-protect-detached-head later to maint). * "git config --add section.var val" used to lose existing section.var whose value was an empty string. (merge c1063be ta/config-add-to-empty-or-true-fix later to maint). * "git fsck" failed to report that it found corrupt objects via its exit status in some cases. (merge 30d1038 jk/fsck-exit-code-fix later to maint). * Use of "--verbose" option used to break "git branch --merged". (merge 12994dd jk/maint-branch-verbose-merged later to maint). * Some MUAs mangled a line in a message that begins with "From " to ">From " when writing to a mailbox file and feeding such an input to "git am" used to lose such a line. (merge 85de86a jk/mbox-from-line later to maint). * "rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * A handful of C source files have been updated to include "git-compat-util.h" as the first thing, to conform better to our coding guidelines. (merge 1c4b660 da/include-compat-util-first-in-c later to maint). * t7004 test, which tried to run Git with small stack space, has been updated to give a bit larger stack to avoid false breakage on some platforms. (merge b9a1907 sk/tag-contains-wo-recursion later to maint). * A few documentation pages had example sections marked up not quite correctly, which passed AsciiDoc but failed with AsciiDoctor. (merge c30c43c bc/asciidoc-pretty-formats-fix later to maint). (merge f8a48af bc/asciidoc later to maint). * "gitweb" used deprecated CGI::startfrom, which was removed from CGI.pm as of 4.04; use CGI::start_from instead. (merge 4750f4b rm/gitweb-start-form later to maint). * Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. (merge b12d045 da/mergetool-meld later to maint). * "git pack-objects" forgot to disable the codepath to generate object reachability bitmap when it needs to split the resulting pack. (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint). * The code to use cache-tree trusted the on-disk data too much and fell into an infinite loop upon seeing an incorrectly recorded index file. (merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint). * "git fetch" into a repository where branch B was deleted earlier back when it had reflog enabled, and then branch B/C is fetched into it without reflog enabled, which is arguably an unlikely corner case, unnecessarily failed. (merge aae828b jk/fetch-reflog-df-conflict later to maint). * "git log --first-parent -L..." used to crash. (merge a8787c5 tm/line-log-first-parent later to maint). ---------------------------------------------------------------- Changes since v2.2.0-rc2 are as follows: Alex Henrie (1): l10n: Update Catalan translation Christian Couder (2): trailer: ignore comment lines inside the trailers trailer: display a trailer without its trailing newline David Aguilar (1): difftool: honor --trust-exit-code for builtin tools Jiang Xin (3): l10n: git.pot: v2.2.0 round 2 (1 updated) l10n: batch updates for one trivial change l10n: remove a superfluous translation for push.c Junio C Hamano (2): Documentation/git-commit: clarify that --only/--include records the working tree contents Git 2.2.0-rc3 Max Horn (1): doc: add some crossrefs between manual pages Ralf Thielow (4): l10n: de.po: use imperative form for command options l10n: de.po: translate 62 new messages l10n: de.po: translate 2 new messages l10n: de.po: translate 2 messages Slavomir Vlcek (1): SubmittingPatches: final submission is To: maintainer and CC: list Stefan Beller (1): l10n: de.po: Fixup one translation Stefan Naewe (1): gittutorial: fix output of 'git status' Thomas Ackermann (1): gittutorial.txt: remove reference to ancient Git version Torsten Bögershausen (1): t5705: the file:// URL should be absolute -- 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 v2.2.0-rc2 is now available for testing at the usual places. We expect that the final will happen late next week, and it will be different from this tarball only with small documentation update changes. The tarballs are ... [More] found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.2.0-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 v2.2 Release Notes (draft) ============================== Updates since v2.1 ------------------ Ports * Building on older MacOS X systems automatically sets the necessary NO_APPLE_COMMON_CRYPTO build-time option. * The support to build with NO_PTHREADS has been resurrected. * Compilation options has been updated a bit to support z/OS port better. UI, Workflows & Features * "git archive" learned to filter what gets archived with pathspec. * "git config --edit --global" starts from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any. This immediately reduces the need for a later "Have you forgotten setting core.user?" and we can add more to the template as we gain more experience. * "git stash list -p" used to be almost always a no-op because each stash entry is represented as a merge commit. It learned to show the difference between the base commit version and the working tree version, which is in line with what "git show" gives. * Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. "fast-export" was taught an "--anonymize" option to replace blob contents, names of people and paths and log messages with bland and simple strings to help them. * "git difftool" learned an option to stop feeding paths to the diff backend when it exits with a non-zero status. * "git grep" allows to paint (or not paint) partial matches on context lines when showing "grep -C" output in color. * "log --date=iso" uses a slight variant of ISO 8601 format that is made more human readable. A new "--date=iso-strict" option gives datetime output that is more strictly conformant. * The logic "git prune" uses is more resilient against various corner cases. * A broken reimplementation of Git could write an invalid index that records both stage #0 and higher stage entries for the same path. We now notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove higher stage entries, or if it wanted to unresolve and forgot to remove the stage#0 entry). * The temporary files "git mergetool" uses are named to avoid too many dots in them (e.g. a temporary file for "hello.c" used to be named e.g. "hello.BASE.4321.c" but now uses underscore instead, e.g. "hello_BASE_4321.c"). * The temporary files "git mergetools" uses can be placed in a newly created temporary directory, instead of the current directory, by setting the mergetool.writeToTemp configuration variable. * "git mergetool" understands "--tool bc" now, as version 4 of BeyondCompare can be driven the same way as its version 3 and it feels awkward to say "--tool bc3". * The "pre-receive" and "post-receive" hooks are no longer required to consume their input fully (not following this requirement used to result in intermittent errors in "git push"). * The pretty-format specifier "%d", which expanded to " (tagname)" for a tagged commit, gained a cousin "%D" that just gives the "tagname" without frills. * "git push" learned "--signed" push, that allows a push (i.e. request to update the refs on the other side to point at a new history, together with the transmission of necessary objects) to be signed, so that it can be verified and audited, using the GPG signature of the person who pushed, that the tips of branches at a public repository really point the commits the pusher wanted to, without having to "trust" the server. * "git interpret-trailers" is a new filter to programmatically edit the tail end of the commit log messages. * "git help everyday" shows the "Everyday Git in 20 commands or so" document, whose contents have been updated to more modern Git practice. * On the "git svn" front, work to reduce memory consumption and to improve handling of mergeinfo progresses. Performance, Internal Implementation, etc. * The API to manipulate the "refs" has been restructured to make it more transactional, with the eventual goal to allow all-or-none atomic updates and migrating the storage to something other than the traditional filesystem based one (e.g. databases). * The lockfile API and its users have been cleaned up. * We no longer attempt to keep track of individual dependencies to the header files in the build procedure, relying on automated dependency generation support from modern compilers. * In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites long before negated prerequisites e.g. !MINGW were invented. The former has been converted to the latter to avoid confusion. * Looking up remotes configuration in a repository with very many remotes defined has been optimized. * There are cases where you lock and open to write a file, close it to show the updated contents to external processes, and then have to update the file again while still holding the lock, but the lockfile API lacked support for such an access pattern. * The API to allocate the structure to keep track of commit decoration has been updated to make it less cumbersome to use. * An in-core caching layer to let us avoid reading the same configuration files number of times has been added. A few commands have been converted to use this subsystem. * Various code paths have been cleaned up and simplified by using "strbuf", "starts_with()", and "skip_prefix()" APIs more. * A few codepaths that died when large blobs that would not fit in core are involved in their operation have been taught to punt instead, by e.g. marking too large a blob as not to be diffed. * A few more code paths in "commit" and "checkout" have been taught to repopulate the cache-tree in the index, to help speed up later "write-tree" (used in "commit") and "diff-index --cached" (used in "status"). * A common programming mistake to assign the same short option name to two separate options is detected by parse_options() API to help developers. * The code path to write out the packed-refs file has been optimized, which especially matters in a repository with a large number of refs. * The check to see if a ref $F can be created by making sure no existing ref has $F/ as its prefix has been optimized, which especially matters in a repository with a large number of existing refs. * "git fsck" was taught to check contents of tag objects a bit more. * "git hash-object" was taught a "--literally" option to help debugging. * When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * The scripts in the test suite can be run with "-x" option to show a shell-trace of each command run in them. * The "run-command" API learned to manage the argv and environment array for child process, alleviating the need for the callers to allocate and deallocate them. * Some people use AsciiDoctor, instead of AsciiDoc, to format our documentation set; the documentation has been adjusted, as AsciiDoctor is pickier than AsciiDoc in its input mark-up. Also contains various documentation updates and code clean-ups. Fixes since v2.1 ---------------- Unless otherwise noted, all the fixes since v2.1 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * "git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * "git -c section.var command" and "git -c section.var= command" should pass the configuration differently (the former should be a boolean true, the latter should be an empty string). * Applying a patch not generated by Git in a subdirectory used to check the whitespace breakage using the attributes for incorrect paths. Also whitespace checks were performed even for paths excluded via "git apply --exclude=" mechanism. * "git bundle create" with date-range specification were meant to exclude tags outside the range, but it didn't. * "git add x" where x that used to be a directory has become a symbolic link to a directory misbehaved. * The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * Pack-protocol documentation had a minor typo. * "git checkout -m" did not switch to another branch while carrying the local changes forward when a path was deleted from the index. * "git daemon" (with NO_IPV6 build configuration) used to incorrectly use the hostname even when gethostbyname() reported that the given hostname is not found. (merge 107efbe rs/daemon-fixes later to maint). * With sufficiently long refnames, "git fast-import" could have overflown an on-stack buffer. * After "pack-refs --prune" packed refs at the top-level, it failed to prune them. * Progress output from "git gc --auto" was visible in "git fetch -q". * We used to pass -1000 to poll(2), expecting it to also mean "no timeout", which should be spelled as -1. * "git rebase" documentation was unclear that it is required to specify on what the rebase is to be done when telling it to first check out . (merge 95c6826 so/rebase-doc later to maint). * "git push" over HTTP transport had an artificial limit on number of refs that can be pushed imposed by the command line length. (merge 26be19b jk/send-pack-many-refspecs later to maint). * When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. (merge ab791dd jk/index-pack-threading-races later to maint). * An attempt to remove the entire tree in the "git fast-import" input stream caused it to misbehave. (merge 2668d69 mb/fast-import-delete-root later to maint). * Reachability check (used in "git prune" and friends) did not add a detached HEAD as a starting point to traverse objects still in use. (merge c40fdd0 mk/reachable-protect-detached-head later to maint). * "git config --add section.var val" used to lose existing section.var whose value was an empty string. (merge c1063be ta/config-add-to-empty-or-true-fix later to maint). * "git fsck" failed to report that it found corrupt objects via its exit status in some cases. (merge 30d1038 jk/fsck-exit-code-fix later to maint). * Use of "--verbose" option used to break "git branch --merged". (merge 12994dd jk/maint-branch-verbose-merged later to maint). * Some MUAs mangled a line in a message that begins with "From " to ">From " when writing to a mailbox file and feeding such an input to "git am" used to lose such a line. (merge 85de86a jk/mbox-from-line later to maint). * "rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * A handful of C source files have been updated to include "git-compat-util.h" as the first thing, to conform better to our coding guidelines. (merge 1c4b660 da/include-compat-util-first-in-c later to maint). * t7004 test, which tried to run Git with small stack space, has been updated to give a bit larger stack to avoid false breakage on some platforms. (merge b9a1907 sk/tag-contains-wo-recursion later to maint). * A few documentation pages had example sections marked up not quite correctly, which passed AsciiDoc but failed with AsciiDoctor. (merge c30c43c bc/asciidoc-pretty-formats-fix later to maint). (merge f8a48af bc/asciidoc later to maint). * "gitweb" used deprecated CGI::startfrom, which was removed from CGI.pm as of 4.04; use CGI::start_from instead. (merge 4750f4b rm/gitweb-start-form later to maint). * Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. (merge b12d045 da/mergetool-meld later to maint). * "git pack-objects" forgot to disable the codepath to generate object reachability bitmap when it needs to split the resulting pack. (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint). * The code to use cache-tree trusted the on-disk data too much and fell into an infinite loop upon seeing an incorrectly recorded index file. (merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint). * "git fetch" into a repository where branch B was deleted earlier back when it had reflog enabled, and then branch B/C is fetched into it without reflog enabled, which is arguably an unlikely corner case, unnecessarily failed. (merge aae828b jk/fetch-reflog-df-conflict later to maint). * "git log --first-parent -L..." used to crash. (merge a8787c5 tm/line-log-first-parent later to maint). ---------------------------------------------------------------- Changes since v2.2.0-rc1 are as follows: Alexander Shopov (1): l10n: Updated Bulgarian translation of git (2296t,0f,0u) Jean-Noel Avila (1): l10n: fr.po (2296t) update for version 2.2.0 Jeff King (1): t1410: fix breakage on case-insensitive filesystems Jiang Xin (2): l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed) l10n: zh_CN: translations for git v2.2.0-rc0 John Szakmeister (1): diff-highlight: exit when a pipe is broken Junio C Hamano (2): Update draft release notes to 2.2 Git 2.2.0-rc2 Nicolas Dermine (1): config.txt: fix typo Peter Krefting (1): l10n: sv.po: Update Swedish translation (2296t0f0u) René Scharfe (2): trailer: use CHILD_PROCESS_INIT in apply_command() run-command: use void to declare that functions take no parameters Thomas Quinot (1): Documentation/config.txt: fix minor typo Trần Ngọc Quân (1): l10n: vi.po: Update new message strings -- 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 v2.2.0-rc1 is now available for testing at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.2.0-rc1' tag and ... [More] 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 v2.2 Release Notes (draft) ============================== Updates since v2.1 ------------------ Ports * Building on older MacOS X systems automatically sets the necessary NO_APPLE_COMMON_CRYPTO build-time option. * The support to build with NO_PTHREADS has been resurrected. * Compilation options has been updated a bit to support z/OS port better. UI, Workflows & Features * "git archive" learned to filter what gets archived with pathspec. * "git config --edit --global" starts from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any. This immediately reduces the need for a later "Have you forgotten setting core.user?" and we can add more to the template as we gain more experience. * "git stash list -p" used to be almost always a no-op because each stash entry is represented as a merge commit. It learned to show the difference between the base commit version and the working tree version, which is in line with what "git show" gives. * Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. "fast-export" was taught an "--anonymize" option to replace blob contents, names of people and paths and log messages with bland and simple strings to help them. * "git difftool" learned an option to stop feeding paths to the diff backend when it exits with a non-zero status. * "git grep" allows to paint (or not paint) partial matches on context lines when showing "grep -C" output in color. * "log --date=iso" uses a slight variant of ISO 8601 format that is made more human readable. A new "--date=iso-strict" option gives datetime output that is more strictly conformant. * The logic "git prune" uses is more resilient against various corner cases. * A broken reimplementation of Git could write an invalid index that records both stage #0 and higher stage entries for the same path. We now notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove higher stage entries, or if it wanted to unresolve and forgot to remove the stage#0 entry). * The temporary files "git mergetool" uses are named to avoid too many dots in them (e.g. a temporary file for "hello.c" used to be named e.g. "hello.BASE.4321.c" but now uses underscore instead, e.g. "hello_BASE_4321.c"). * The temporary files "git mergetools" uses can be placed in a newly created temporary directory, instead of the current directory, by setting the mergetool.writeToTemp configuration variable. * "git mergetool" understands "--tool bc" now, as version 4 of BeyondCompare can be driven the same way as its version 3 and it feels awkward to say "--tool bc3". * The "pre-receive" and "post-receive" hooks are no longer required to consume their input fully (not following this requirement used to result in intermittent errors in "git push"). * The pretty-format specifier "%d", which expanded to " (tagname)" for a tagged commit, gained a cousin "%D" that just gives the "tagname" without frills. * "git push" learned "--signed" push, that allows a push (i.e. request to update the refs on the other side to point at a new history, together with the transmission of necessary objects) to be signed, so that it can be verified and audited, using the GPG signature of the person who pushed, that the tips of branches at a public repository really point the commits the pusher wanted to, without having to "trust" the server. * "git interpret-trailers" is a new filter to programmatically edit the tail end of the commit log messages. * "git help everyday" shows the "Everyday Git in 20 commands or so" document, whose contents have been updated to more modern Git practice. * On the "git svn" front, work to reduce memory consumption and to improve handling of mergeinfo progresses. Performance, Internal Implementation, etc. * The API to manipulate the "refs" has been restructured to make it more transactional, with the eventual goal to allow all-or-none atomic updates and migrating the storage to something other than the traditional filesystem based one (e.g. databases). * The lockfile API and its users have been cleaned up. * We no longer attempt to keep track of individual dependencies to the header files in the build procedure, relying on automated dependency generation support from modern compilers. * In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites long before negated prerequisites e.g. !MINGW were invented. The former has been converted to the latter to avoid confusion. * Looking up remotes configuration in a repository with very many remotes defined has been optimized. * There are cases where you lock and open to write a file, close it to show the updated contents to external processes, and then have to update the file again while still holding the lock, but the lockfile API lacked support for such an access pattern. * The API to allocate the structure to keep track of commit decoration has been updated to make it less cumbersome to use. * An in-core caching layer to let us avoid reading the same configuration files number of times has been added. A few commands have been converted to use this subsystem. * Various code paths have been cleaned up and simplified by using "strbuf", "starts_with()", and "skip_prefix()" APIs more. * A few codepaths that died when large blobs that would not fit in core are involved in their operation have been taught to punt instead, by e.g. marking too large a blob as not to be diffed. * A few more code paths in "commit" and "checkout" have been taught to repopulate the cache-tree in the index, to help speed up later "write-tree" (used in "commit") and "diff-index --cached" (used in "status"). * A common programming mistake to assign the same short option name to two separate options is detected by parse_options() API to help developers. * The code path to write out the packed-refs file has been optimized, which especially matters in a repository with a large number of refs. * The check to see if a ref $F can be created by making sure no existing ref has $F/ as its prefix has been optimized, which especially matters in a repository with a large number of existing refs. * "git fsck" was taught to check contents of tag objects a bit more. * "git hash-object" was taught a "--literally" option to help debugging. * When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * The scripts in the test suite can be run with "-x" option to show a shell-trace of each command run in them. * The "run-command" API learned to manage the argv and environment array for child process, alleviating the need for the callers to allocate and deallocate them. * Some people use AsciiDoctor, instead of AsciiDoc, to format our documentation set; the documentation has been adjusted, as AsciiDoctor is pickier than AsciiDoc in its input mark-up. Also contains various documentation updates and code clean-ups. Fixes since v2.1 ---------------- Unless otherwise noted, all the fixes since v2.1 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * "git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * "git -c section.var command" and "git -c section.var= command" should pass the configuration differently (the former should be a boolean true, the latter should be an empty string). * Applying a patch not generated by Git in a subdirectory used to check the whitespace breakage using the attributes for incorrect paths. Also whitespace checks were performed even for paths excluded via "git apply --exclude=" mechanism. * "git bundle create" with date-range specification were meant to exclude tags outside the range, but it didn't. * "git add x" where x that used to be a directory has become a symbolic link to a directory misbehaved. * The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * Pack-protocol documentation had a minor typo. * "git checkout -m" did not switch to another branch while carrying the local changes forward when a path was deleted from the index. * "git daemon" (with NO_IPV6 build configuration) used to incorrectly use the hostname even when gethostbyname() reported that the given hostname is not found. (merge 107efbe rs/daemon-fixes later to maint). * With sufficiently long refnames, "git fast-import" could have overflown an on-stack buffer. * After "pack-refs --prune" packed refs at the top-level, it failed to prune them. * Progress output from "git gc --auto" was visible in "git fetch -q". * We used to pass -1000 to poll(2), expecting it to also mean "no timeout", which should be spelled as -1. * "git rebase" documentation was unclear that it is required to specify on what the rebase is to be done when telling it to first check out . (merge 95c6826 so/rebase-doc later to maint). * "git push" over HTTP transport had an artificial limit on number of refs that can be pushed imposed by the command line length. (merge 26be19b jk/send-pack-many-refspecs later to maint). * When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. (merge ab791dd jk/index-pack-threading-races later to maint). * An attempt to remove the entire tree in the "git fast-import" input stream caused it to misbehave. (merge 2668d69 mb/fast-import-delete-root later to maint). * Reachability check (used in "git prune" and friends) did not add a detached HEAD as a starting point to traverse objects still in use. (merge c40fdd0 mk/reachable-protect-detached-head later to maint). * "git config --add section.var val" used to lose existing section.var whose value was an empty string. (merge c1063be ta/config-add-to-empty-or-true-fix later to maint). * "git fsck" failed to report that it found corrupt objects via its exit status in some cases. (merge 30d1038 jk/fsck-exit-code-fix later to maint). * Use of "--verbose" option used to break "git branch --merged". (merge 12994dd jk/maint-branch-verbose-merged later to maint). * Some MUAs mangled a line in a message that begins with "From " to ">From " when writing to a mailbox file and feeding such an input to "git am" used to lose such a line. (merge 85de86a jk/mbox-from-line later to maint). * "rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * A handful of C source files have been updated to include "git-compat-util.h" as the first thing, to conform better to our coding guidelines. (merge 1c4b660 da/include-compat-util-first-in-c later to maint). * t7004 test, which tried to run Git with small stack space, has been updated to give a bit larger stack to avoid false breakage on some platforms. (merge b9a1907 sk/tag-contains-wo-recursion later to maint). * A few documentation pages had example sections marked up not quite correctly, which passed AsciiDoc but failed with AsciiDoctor. (merge c30c43c bc/asciidoc-pretty-formats-fix later to maint). (merge f8a48af bc/asciidoc later to maint). * "gitweb" used deprecated CGI::startfrom, which was removed from CGI.pm as of 4.04; use CGI::start_from instead. (merge 4750f4b rm/gitweb-start-form later to maint). * Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. (merge b12d045 da/mergetool-meld later to maint). * "git pack-objects" forgot to disable the codepath to generate object reachability bitmap when it needs to split the resulting pack. (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint). ---------------------------------------------------------------- Changes since v2.2.0-rc0 are as follows: Ben North (1): gitignore.txt: fix spelling of "backslash" Jeff King (5): cache-tree: avoid infinite loop on zero-entry tree bundle: split out ref writing from bundle_create fetch: load all default config at startup ignore stale directories when checking reflog existence docs/credential-store: s/--store/--file/ Junio C Hamano (3): bundle: split out a helper function to create pack data bundle: split out a helper function to compute and write prerequisites Git 2.2.0-rc1 Matthieu Moy (1): RelNotes/2.2.0.txt: fix minor typos René Scharfe (1): use child_process_init() to initialize struct child_process variables Thomas Ackermann (1): Documentation: typofixes Tzvetan Mikov (1): line-log: fix crash when --first-parent is used -- 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]

An early preview release Git v2.2.0-rc0 is now available for testing at the usual places. Please give it a test. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy ... [More] of the 'v2.2.0-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 v2.2 Release Notes (draft) ============================== Updates since v2.1 ------------------ Ports * Building on older MacOS X systems automatically sets the necessary NO_APPLE_COMMON_CRYPTO build-time option. * The support to build with NO_PTHREADS has been resurrected. * Compilation options has been updated a bit to support z/OS port better. UI, Workflows & Features * "git archive" learned to filter what gets archived with pathspec. * "git config --edit --global" starts from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any. This immediately reduces the need for a later "Have you forgotten setting core.user?" and we can add more to the template as we gain more experience. * "git stash list -p" used to be almost always a no-op because each stash entry is represented as a merge commit. It learned to show the difference between the base commit version and the working tree version, which is in line with what "git show" gives. * Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. "fast-export" was taught an "--anonymize" option to replace blob contents, names of people and paths and log messages with bland and simple strings to help them. * "git difftool" learned an option to stop feeding paths to the diff backend when it exits with a non-zero status. * "git grep" allows to paint (or not paint) partial matches on context lines whenshowing "grep -C" output in color. * "log --date=iso" uses a slight variant of ISO 8601 format that is made more human readable. A new "--date=iso-strict" option gives datetime output that is more strictly conformant. * The logic "git prune" uses is more resilient against various corner cases. * A broken reimplementation of Git could write an invalid index that records both stage #0 and higher stage entries for the same path. We now notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove higher stage entries, or if it wanted to unresolve and forgot to remove the stage#0 entry). * The temporary files "git mergetool" uses are named to avoid too many dots in them (e.g. a temporary file for "hello.c" used to be named e.g. "hello.BASE.4321.c" but now uses underscore instead, e.g. "hello_BASE_4321.c"). * The temporary files "git mergetools" uses can be placed in a newly creted temporary directory, instead of the current directory, by setting the mergetool.writeToTemp configuration variable. * "git mergetool" understands "--tool bc" now, as version 4 of BeyondCompare can be driven the same way as its version 3 and it feels awkward to say "--tool bc3". * The "pre-receive" and "post-receive" hooks are no longer required to consume their input fully (not following this requirement used to result in intermittent errors in "git push"). * The pretty-format specifier "%d", which expanded to " (tagname)" for a tagged commit, gained a cousin "%D" that just gives the "tagname" without frills. * "git push" learned "--signed" push, that allows a push (i.e. request to update the refs on the other side to point at a new history, together with the transmission of necessary objects) to be signed, so that it can be verified and audited, using the GPG signature of the person who pushed, that the tips of branches at a public repository really point the commits the pusher wanted to, without having to "trust" the server. * "git interpret-trailers" is a new filter to programatically edit the tail end of the commit log messages. * "git help everyday" shows the "Everyday Git in 20 commands or so" document, whose contents have been updated to more modern Git practice. * On the "git svn" front, work to reduce memory consumption and to improve handling of mergeinfo progresses. Performance, Internal Implementation, etc. * The API to manipulate the "refs" has been restructured to make it more transactional, with the eventual goal to allow all-or-none atomic updates and migrating the storage to something other than the traditional filesystem based one (e.g. databases). * The lockfile API and its users have been cleaned up. * We no longer attempt to keep track of individual dependencies to the header files in the build procedure, relying on automated dependency generation support from modern compilers. * In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites long before negated prerequisites e.g. !MINGW were invented. The former has been converted to the latter to avoid confusion. * Looking up remotes configuration in a repository with very many remotes defined has been optimized. * There are cases where you lock and open to write a file, close it to show the updated contents to external processes, and then have to update the file again while still holding the lock, but the lockfile API lacked support for such an access pattern. * The API to allocate the structure to keep track of commit decoration has been updated to make it less cumbersome to use. * An in-core caching layer to let us avoid reading the same configuration files number of times has been added. A few commands have been converted to use this subsystem. * Various code paths have been cleaned up and simplified by using "strbuf", "starts_with()", and "skip_prefix()" APIs more. * A few codepaths that died when large blobs that would not fit in core are involved in their operation have been taught to punt instead, by e.g. marking too large a blob as not to be diffed. * A few more code paths in "commit" and "checkout" have been taught to repopulate the cache-tree in the index, to help speed up later "write-tree" (used in "commit") and "diff-index --cached" (used in "status"). * A common programming mistake to assign the same short option name to two separate options is detected by parse_options() API to help developers. * The code path to write out the packed-refs file has been optimized, which especially matters in a repository with a large number of refs. * The check to see if a ref $F can be created by making sure no existing ref has $F/ as its prefix has been optimized, which especially matters in a repository with a large number of existing refs. * "git fsck" was taught to check contents of tag objects a bit more. * "git hash-object" was taught a "--literally" option to help debugging. * When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * The scripts in the test suite can be run with "-x" option to show a shell-trace of each command run in them. * The "run-command" API learned to manage the argv and environment array for child process, alleviating the need for the callers to allocate and deallocate them. * Some people use AsciiDoctor, instead of AsciiDoc, to format our documentation set; the documentation has been adjusted, as AsciiDoctor is pickier than AsciiDoc in its input mark-up. Also contains various documentation updates and code clean-ups. Fixes since v2.1 ---------------- Unless otherwise noted, all the fixes since v2.1 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * "git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * "git -c section.var command" and "git -c section.var= command" should pass the configuration differently (the former should be a boolean true, the latter should be an empty string). * Applying a patch not generated by Git in a subdirectory used to check the whitespace breakage using the attributes for incorrect paths. Also whitespace checks were performed even for paths excluded via "git apply --exclude=" mechanism. * "git bundle create" with date-range specification were meant to exclude tags outside the range, but it didn't. * "git add x" where x that used to be a directory has become a symbolic link to a directory misbehaved. * The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * Pack-protocol documentation had a minor typo. * "git checkout -m" did not switch to another branch while carrying the local changes forward when a path was deleted from the index. * "git daemon" (with NO_IPV6 build configuration) used to incorrectly use the hostname even when gethostbyname() reported that the given hostname is not found. (merge 107efbe rs/daemon-fixes later to maint). * With sufficiently long refnames, "git fast-import" could have overflown an on-stack buffer. * After "pack-refs --prune" packed refs at the top-level, it failed to prune them. * Progress output from "git gc --auto" was visible in "git fetch -q". * We used to pass -1000 to poll(2), expecting it to also mean "no timeout", which should be spelled as -1. * "git rebase" documentation was unclear that it is required to specify on what the rebase is to be done when telling it to first check out . (merge 95c6826 so/rebase-doc later to maint). * "git push" over HTTP transport had an artificial limit on number of refs that can be pushed imposed by the command line length. (merge 26be19b jk/send-pack-many-refspecs later to maint). * When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. (merge ab791dd jk/index-pack-threading-races later to maint). * An attempt to remove the entire tree in the "git fast-import" input stream caused it to misbehave. (merge 2668d69 mb/fast-import-delete-root later to maint). * Reachability check (used in "git prune" and friends) did not add a detached HEAD as a starting point to traverse objects still in use. (merge c40fdd0 mk/reachable-protect-detached-head later to maint). * "git config --add section.var val" used to lose existing section.var whose value was an empty string. (merge c1063be ta/config-add-to-empty-or-true-fix later to maint). * "git fsck" failed to report that it found corrupt objects via its exit status in some cases. (merge 30d1038 jk/fsck-exit-code-fix later to maint). * Use of "--verbose" option used to break "git branch --merged". (merge 12994dd jk/maint-branch-verbose-merged later to maint). * Some MUAs mangled a line in a message that begins with "From " to ">From " when writing to a mailbox file and feeding such an input to "git am" used to lose such a line. (merge 85de86a jk/mbox-from-line later to maint). * "rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * A handful of C source files have been updated to include "git-compat-util.h" as the first thing, to conform better to our coding guidelines. (merge 1c4b660 da/include-compat-util-first-in-c later to maint). * t7004 test, which tried to run Git with small stack space, has been updated to give a bit larger stack to avoid false breakage on some platforms. (merge b9a1907 sk/tag-contains-wo-recursion later to maint). * A few documentation pages had example sections marked up not quite correctly, which passed AsciiDoc but failed with AsciiDoctor. (merge c30c43c bc/asciidoc-pretty-formats-fix later to maint). (merge f8a48af bc/asciidoc later to maint). * "gitweb" used deprecated CGI::startfrom, which was removed from CGI.pm as of 4.04; use CGI::start_from instead. (merge 4750f4b rm/gitweb-start-form later to maint). * Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. (merge b12d045 da/mergetool-meld later to maint). * "git pack-objects" forgot to disable the codepath to generate object recheability bitmap when it needs to split the resulting pack. (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint). -- 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]

After searching around a bit I couldn't find a stand-alone Git hook that would intelligently block binary data pushes so I wrote my own: https://github.com/avar/pre-receive-reject-binaries Main features: * Quota per-commit for how much binary data ... [More] is OK * Ability to optionally allow users to override binary pushes by including a notice in their commit messages * Doesn't disallow removing existing binary data, or renaming existing binary files * Will block commits that include references to existing binary blobs though * Spots cases where a push is pushing commits that add and then remove binary blobs (i.e. counts net additions) * Has hookable support for logging by piping its output to external commands when it runs or when it rejects/unblocks a binary push. I'm using this for logging its output to a logfile, and to send E-Mails when it blocks/is unblocked. * Only requires a stock perl install, should run on any *nix-like OS out of the box * Should be relatively fast compared to some other similar solutions I've seen, i.e. it parses the output of one "git-log --stat" command for the entire push, and doesn't e.g. do a "git show" for each commit being pushed. One general note about git-log output: I was disappointed to see that there was no easily parsable "git log" output that showed you how much binary files increased in size, --numstat will just show "-" for binary files, and it's non-trivial to parse the "--stat" output. It's meant for human consumption and will sometimes include variations in how much whitespace is inserted. -- 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 v2.1.3 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.1.3' tag and the 'maint' ... [More] 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 v2.1.3 Release Notes ======================== * Some MUAs mangled a line in a message that begins with "From " to ">From " when writing to a mailbox file and feeding such an input to "git am" used to lose such a line. * "git daemon" (with NO_IPV6 build configuration) used to incorrectly use the hostname even when gethostbyname() reported that the given hostname is not found. * Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. * "git pack-objects" forgot to disable the codepath to generate object recheability bitmap when it needs to split the resulting pack. * "gitweb" used deprecated CGI::startfrom, which was removed from CGI.pm as of 4.04; use CGI::start_from instead. * "git log" documentation had an example section marked up not quite correctly, which passed AsciiDoc but failed with AsciiDoctor. Also contains some documentation updates. ---------------------------------------------------------------- Changes since v2.1.2 are as follows: David Aguilar (1): mergetools/meld: make usage of `--output` configurable and more robust Eric Sunshine (1): mailinfo: work around -Wstring-plus-int warning Jeff King (2): mailinfo: make ">From" in-body header check more robust pack-objects: turn off bitmaps when we split packs Junio C Hamano (1): Git 2.1.3 René Scharfe (3): daemon: handle gethostbyname() error daemon: fix error message after bind() daemon: remove write-only variable maxfd Roland Mas (1): gitweb: use start_form, not startform that was removed in CGI.pm 4.04 Wieland Hoffmann (1): git-tag.txt: Add a missing hyphen to `-s` brian m. carlson (1): Documentation: fix misrender of pretty-formats in Asciidoctor -- 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, For the past 8 months I've been working on the process and tooling to convert the Kuali Student subversion repository into Git and to support CI on pull requests with auto merge to trunk once the builds were green and the appropriate ... [More] sign-off provided. The Kuali Student project is being restructured so my work on CI was halted but I was able to get the repository converted and placed into Github: https://github.com/kuali-student/archived-from-svn (Contains Revisions r1 through r77740 in 20,631 branches and 95,297 git commits) This work is not being officially supported by the Kuali Foundation in the future but I'm personally interested in seeing other projects use it to convert from Subversion into Git (and find any edge cases it might not be handling correctly right now) Since our conversion was successful I wanted to alert users on both the Git and JGit mailing lists about the Java based conversion program that I wrote to perform the conversion. The code and some cursory instructions on how to use it are located here: https://github.com/kuali-student/git-repository-tools, the current version can be downloaded from maven central: http://search.maven.org/#artifactdetails|org.kuali.student.repository|git-importer|0.0.4|jar It is intended for larger repositories like kuali student with around 100,000 or more revisions with many product streams and questionable at times branch naming strategies; instead of enumerating which branches you want this conversion program will extract everything. [Less]