Git

I'm proud to announce WinGit: an attempt to bring Git powers to 64-bit Windows. WinGit is currently used only by my coworkers and isn't considered production-ready-rock-solid. Use at your own risk. Homepage & build instructions ... [More] ----------------------------- https://github.com/slonopotamus/wingit Binaries -------- MSI packages: https://github.com/slonopotamus/wingit/releases After installation, git.exe is ready to be used from cmd.exe or TortoiseGit. No kind of "Git Bash" or own explorer integration is provided. Issues ------ Of course WinGit has issues: https://github.com/slonopotamus/wingit/issues?state=open Most notable are: git documentation is not packaged, no Tcl/Tk (thus, no gitk), no SVN, no Explorer integration. Sources ------------------ All sources are available on GitHub: https://github.com/slonopotamus/wingit I know that build.sh is UGLY, especially openssl part. Relationship with msysgit ========================= Unlike msysgit, WinGit is a pure-Windows binary build with MSVC. Like msysgit, WinGit also uses msys environment (sh/perl/etc) both during build-time and runtime. WinGit adds a few patches to Git itself on top of msysgit ones. Patches are required due to insufficient testing of MSVC builds (caused by total absence of any MSVC-built Git distributions). All WinGit patches are sent upstream, just didn't get to master yet. -- 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.9.1 is now available at the usual places. The release tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the v1.9.1 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 v1.9.1 Release Notes ======================== Fixes since v1.9.0 ------------------ * "git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * "git difftool" misbehaved when the repository is bound to the working tree with the ".git file" mechanism, where a textual file ".git" tells us where it is. * "git push" did not pay attention to branch.*.pushremote if it is defined earlier than remote.pushdefault; the order of these two variables in the configuration file should not matter, but it did by mistake. * Codepaths that parse timestamps in commit objects have been tightened. * "git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. * "git reset" needs to refresh the index when working in a working tree (it can also be used to match the index to the HEAD in an otherwise bare repository), but it failed to set up the working tree properly, causing GIT_WORK_TREE to be ignored. * "git check-attr" when working on a repository with a working tree did not work well when the working tree was specified via the --work-tree (and obviously with --git-dir) option. * "merge-recursive" was broken in 1.7.7 era and stopped working in an empty (temporary) working tree, when there are renames involved. This has been corrected. * "git rev-parse" was loose in rejecting command line arguments that do not make sense, e.g. "--default" without the required value for that option. * include.path variable (or any variable that expects a path that can use ~username expansion) in the configuration file is not a boolean, but the code failed to check it. * "git diff --quiet -- pathspec1 pathspec2" sometimes did not return correct status value. * Attempting to deepen a shallow repository by fetching over smart HTTP transport failed in the protocol exchange, when no-done extension was used. The fetching side waited for the list of shallow boundary commits after the sending end stopped talking to it. * Allow "git cmd path/", when the 'path' is where a submodule is bound to the top-level working tree, to match 'path', despite the extra and unnecessary trailing slash (such a slash is often given by command line completion). ---------------------------------------------------------------- Changes since v1.9.0 are as follows: Brad King (4): t3030-merge-recursive: test known breakage with empty work tree read-cache.c: refactor --ignore-missing implementation read-cache.c: extend make_cache_entry refresh flag with options merge-recursive.c: tolerate missing files while refreshing index David Aguilar (1): difftool: support repositories with .git-files David Sharp (1): rev-parse: check i before using argv[i] against argc Jeff King (12): expand_user_path: do not look at NULL path handle_path_include: don't look at NULL value tests: auto-set LIB_HTTPD_PORT from test name t4212: test bogus timestamps with git-log fsck: report integer overflow in author timestamps date: check date overflow against time_t log: handle integer overflow in timestamps log: do not segfault on gmtime errors remote: handle pushremote config in any order show_ident_date: fix tz range check clean: respect pathspecs with "-d" clean: simplify dir/not-dir logic Junio C Hamano (4): t0003: do not chdir the whole test process check-attr: move to the top of working tree when in non-bare repository t7800: add a difftool test for .git-files Git 1.9.1 Nguyễn Thái Ngọc Duy (17): test: rename http fetch and push test files pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done' protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt protocol-capabilities.txt: document no-done fetch-pack: fix deepen shallow over smart http with no-done cap t5537: move http tests out to t5539 reset: optionally setup worktree and refresh index on --mixed pathspec: convert some match_pathspec_depth() to ce_path_match() pathspec: convert some match_pathspec_depth() to dir_path_match() pathspec: rename match_pathspec_depth() to match_pathspec() dir.c: prepare match_pathspec_item for taking more flags match_pathspec: match pathspec "foo/" against directory "foo" pathspec: pass directory indicator to match_pathspec_item() clean: replace match_pathspec() with dir_path_match() clean: use cache_name_is_other() diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later diff: do not quit early on stat-dirty files Sandy Carter (1): i18n: proposed command missing leading dash Thomas Rast (1): diff: do not reuse_worktree_file for submodules -- 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 v1.9.0 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: e60667fc16e5a5f1cde46616b0458cc802707743 ... [More] git-1.9.0.tar.gz 65eb3f411f4699695c7081a7c716cabb9ce23d75 git-htmldocs-1.9.0.tar.gz cff590c92b4d1c8a143c078473140b653cc5d56a git-manpages-1.9.0.tar.gz The following public repositories all have a copy of the v1.9.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 Also, http://www.kernel.org/pub/software/scm/git/ has copies of the release tarballs. Git v1.9.0 Release Notes ======================== Backward compatibility notes ---------------------------- "git submodule foreach $cmd $args" used to treat "$cmd $args" the same way "ssh" did, concatenating them into a single string and letting the shell unquote. Careless users who forget to sufficiently quote $args get their argument split at $IFS whitespaces by the shell, and got unexpected results due to this. Starting from this release, the command line is passed directly to the shell, if it has an argument. Read-only support for experimental loose-object format, in which users could optionally choose to write their loose objects for a short while between v1.4.3 and v1.5.3 era, has been dropped. The meanings of the "--tags" option to "git fetch" has changed; the command fetches tags _in addition to_ what is fetched by the same command line without the option. The way "git push $there $what" interprets the $what part given on the command line, when it does not have a colon that explicitly tells us what ref at the $there repository is to be updated, has been enhanced. A handful of ancient commands that have long been deprecated are finally gone (repo-config, tar-tree, lost-found, and peek-remote). Backward compatibility notes (for Git 2.0.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, which 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. The default prefix for "git svn" will change in Git 2.0. For a long time, "git svn" created its remote-tracking branches directly under refs/remotes, but it will place them under refs/remotes/origin/ unless it is told otherwise with its --prefix option. Updates since v1.8.5 -------------------- Foreign interfaces, subsystems and ports. * The HTTP transport, when talking GSS-Negotiate, uses "100 Continue" response to avoid having to rewind and resend a large payload, which may not be always doable. * Various bugfixes to remote-bzr and remote-hg (in contrib/). * The build procedure is aware of MirBSD now. * Various "git p4", "git svn" and "gitk" updates. UI, Workflows & Features * Fetching from a shallowly-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This release attempts to allow object transfer out of a shallowly-cloned repository in a more controlled way (i.e. the receiver becomes a shallow repository with a truncated history). * Just like we give a reasonable default for "less" via the LESS environment variable, we now specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * Two-level configuration variable names in "branch.*" and "remote.*" hierarchies, whose variables are predominantly three-level, were not completed by hitting a in bash and zsh completions. * Fetching a 'frotz' branch with "git fetch", while a 'frotz/nitfol' remote-tracking branch from an earlier fetch was still there, would error out, primarily because the command was not told that it is allowed to lose any information on our side. "git fetch --prune" now can be used to remove 'frotz/nitfol' to make room for fetching and storing the 'frotz' remote-tracking branch. * "diff.orderfile=" configuration variable can be used to pretend as if the "-O" option were given from the command line of "git diff", etc. * The negative pathspec syntax allows "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * "git difftool" shows how many different paths there are in total, and how many of them have been shown so far, to indicate progress. * "git push origin master" used to push our 'master' branch to update the 'master' branch at the 'origin' repository. This has been enhanced to use the same ref mapping "git push origin" would use to determine what ref at the 'origin' to be updated with our 'master'. For example, with this configuration [remote "origin"] push = refs/heads/*:refs/review/* that would cause "git push origin" to push out our local branches to corresponding refs under refs/review/ hierarchy at 'origin', "git push origin master" would update 'refs/review/master' over there. Alternatively, if push.default is set to 'upstream' and our 'master' is set to integrate with 'topic' from the 'origin' branch, running "git push origin" while on our 'master' would update their 'topic' branch, and running "git push origin master" while on any of our branches does the same. * "gitweb" learned to treat ref hierarchies other than refs/heads as if they are additional branch namespaces (e.g. refs/changes/ in Gerrit). * "git for-each-ref --format=..." learned a few formatting directives; e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)". * The command string given to "git submodule foreach" is passed directly to the shell, without being eval'ed. This is a backward incompatible change that may break existing users. * "git log" and friends learned the "--exclude=" option, to allow people to say "list history of all branches except those that match this pattern" with "git log --exclude='*/*' --branches". * "git rev-parse --parseopt" learned a new "--stuck-long" option to help scripts parse options with an optional parameter. * The "--tags" option to "git fetch" no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. Performance, Internal Implementation, etc. * When parsing a 40-hex string into the object name, the string is checked to see if it can be interpreted as a ref so that a warning can be given for ambiguity. The code kicked in even when the core.warnambiguousrefs is set to false to squelch this warning, in which case the cycles spent to look at the ref namespace were an expensive no-op, as the result was discarded without being used. * The naming convention of the packfiles has been updated; it used to be based on the enumeration of names of the objects that are contained in the pack, but now it also depends on how the packed result is represented---packing the same set of objects using different settings (or delta order) would produce a pack with different name. * "git diff --no-index" mode used to unnecessarily attempt to read the index when there is one. * The deprecated parse-options macro OPT_BOOLEAN has been removed; use OPT_BOOL or OPT_COUNTUP in new code. * A few duplicate implementations of prefix/suffix string comparison functions have been unified to starts_with() and ends_with(). * The new PERLLIB_EXTRA makefile variable can be used to specify additional directories Perl modules (e.g. the ones necessary to run git-svn) are installed on the platform when building. * "git merge-base" learned the "--fork-point" mode, that implements the same logic used in "git pull --rebase" to find a suitable fork point out of the reflog entries for the remote-tracking branch the work has been based on. "git rebase" has the same logic that can be triggered with the "--fork-point" option. * A third-party "receive-pack" (the responder to "git push") can advertise the "no-thin" capability to tell "git push" not to use the thin-pack optimization. Our receive-pack has always been capable of accepting and fattening a thin-pack, and will continue not to ask "git push" to use a non-thin pack. Also contains various documentation updates and code clean-ups. Fixes since v1.8.5 ------------------ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too aggressive and failed to match some paths when multiple pathspecs were involved. * "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. * An earlier update in v1.8.4.x to "git rev-list --objects" with negative ref had a performance regression. (merge 200abe7 jk/mark-edges-uninteresting later to maint). * A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path (e.g. Fedora rawhide). * A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. * "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * documentations to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". * "git diff A B submod" and "git diff A B submod/" ought to have done the same for a submodule "submod", but didn't. * "git clone $origin foo\bar\baz" on Windows failed to create the leading directories (i.e. a moral-equivalent of "mkdir -p"). * "submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. (merge efa8fd7 fp/submodule-checkout-mode later to maint). * The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. * The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. * There is no reason to have a hardcoded upper limit for the number of parents of an octopus merge, created via the graft mechanism, but there was. * The basic test used to leave unnecessary trash directories in the t/ directory. (merge 738a8be jk/test-framework-updates later to maint). * "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * A "gc" process running as a different user should be able to stop a new "gc" process from starting, but it didn't. * An earlier "clean-up" introduced an unnecessary memory leak. * "git add -A" (no other arguments) in a totally empty working tree used to emit an error. * "git log --decorate" did not handle a tag pointed by another tag nicely. * When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many are available and we do not even attempt to use up all available file descriptors ourselves, it is nicer to fall back to a reasonable low value rather than dying. * read_sha1_file(), that is the workhorse to read the contents given an object name, honoured object replacements, but there was no corresponding mechanism to sha1_object_info() that was used to obtain the metainfo (e.g. type & size) about the object. This led callers to weird inconsistencies. (merge 663a856 cc/replace-object-info later to maint). * "git cat-file --batch=", an admittedly useless command, did not behave very well. * "git rev-parse -- " did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. * A workaround to an old bug in glibc prior to glibc 2.17 has been retired; this would remove a side effect of the workaround that corrupts system error messages in non-C locales. * SSL-related options were not passed correctly to underlying socket layer in "git send-email". * "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. * "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. * Remote repository URLs expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. * "git cat-file --batch-check=ok" did not check the existence of the named object. * "git am --abort" sometimes complained about not being able to write a tree with an 0{40} object in it. * Two processes creating loose objects at the same time could have failed unnecessarily when the name of their new objects started with the same byte value, due to a race condition. -- 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.5.5 is now available at the usual places. Hopefully this will be the last update to the 1.8.5.x series. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their ... [More] SHA-1 checksums are: 7bb4ea883b1f8f6f7f927035f85e8e27b57e0194 git-1.8.5.5.tar.gz 39dd7979c8757d2dc4bc3aaa82741ba93557d566 git-htmldocs-1.8.5.5.tar.gz a4a2aef1440d4751f37c65359da57c9bd51a7beb git-manpages-1.8.5.5.tar.gz The following public repositories all have a copy of the v1.8.5.5 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.5.5 Release Notes ========================== Fixes since v1.8.5.4 -------------------- * The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too aggressive and failed to match some paths when multiple pathspecs were involved. * "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. * A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path (e.g. Fedora rawhide). * A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. * "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. Also contains typofixes, documentation updates and trivial code clean-ups. ---------------------------------------------------------------- Changes since v1.8.5.4 are as follows: Andy Spencer (1): tree_entry_interesting: match against all pathspecs Jeff King (9): fetch-pack: do not filter out one-level refs interpret_branch_name: factor out upstream handling interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: always respect "namelen" parameter interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: find all possible @-marks repack: fix typo in max-pack-size option repack: make parsed string options const-correct repack: propagate pack-objects options as strings Junio C Hamano (5): merge-base: separate "--independent" codepath into its own helper merge-base --octopus: reduce the result from get_octopus_merge_bases() revision: mark contents of an uninteresting tree uninteresting revision: propagate flag bits from tags to pointees Git 1.8.5.5 Ruben Kerkhof (1): send-email: /etc/ssl/certs/ directory may not be usable as ca_path -- 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.9.0-rc3 is now available for testing at the usual places. Hopefully this will be the last one before the final, scheduled to happen sometime late next week. The release tarballs are found at: ... [More] http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: ed28a6dd2610f9f6052ce52f2eb6ab1db070a637 git-1.9.0.rc3.tar.gz 7512d3f0e2572face34416c2b9fda2385d490c82 git-htmldocs-1.9.0.rc3.tar.gz aac8cb1379f2d5e416db31a40ffb86deec902acc git-manpages-1.9.0.rc3.tar.gz The following public repositories all have a copy of the v1.9.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 v1.9 Release Notes (draft) ====================== Backward compatibility notes ---------------------------- "git submodule foreach $cmd $args" used to treat "$cmd $args" the same way "ssh" did, concatenating them into a single string and letting the shell unquote. Careless users who forget to sufficiently quote $args gets their argument split at $IFS whitespaces by the shell, and got unexpected results due to this. Starting from this release, the command line is passed directly to the shell, if it has an argument. Read-only support for experimental loose-object format, in which users could optionally choose to write in their loose objects for a short while between v1.4.3 to v1.5.3 era, has been dropped. The meanings of "--tags" option to "git fetch" has changed; the command fetches tags _in addition to_ what are fetched by the same command line without the option. The way "git push $there $what" interprets $what part given on the command line, when it does not have a colon that explicitly tells us what ref at the $there repository is to be updated, has been enhanced. A handful of ancient commands that have long been deprecated are finally gone (repo-config, tar-tree, lost-found, and peek-remote). 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, which 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. The default prefix for "git svn" will change in Git 2.0. For a long time, "git svn" created its remote-tracking branches directly under refs/remotes, but it will place them under refs/remotes/origin/ unless it is told otherwise with its --prefix option. Updates since v1.8.5 -------------------- Foreign interfaces, subsystems and ports. * The HTTP transport, when talking GSS-Negotiate, uses "100 Continue" response to avoid having to rewind and resend a large payload, which may not be always doable. * Various bugfixes to remote-bzr and remote-hg (in contrib/). * The build procedure is aware of MirBSD now. * Various "git p4", "git svn" and "gitk" updates. UI, Workflows & Features * Fetching from a shallowly-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This release attempts to allow object transfer out of a shallowly-cloned repository in a more controlled way (i.e. the receiver become a shallow repository with a truncated history). * Just like we give a reasonable default for "less" via the LESS environment variable, we now specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * Two-level configuration variable names in "branch.*" and "remote.*" hierarchies, whose variables are predominantly three-level, were not completed by hitting a in bash and zsh completions. * Fetching 'frotz' branch with "git fetch", while 'frotz/nitfol' remote-tracking branch from an earlier fetch was still there, would error out, primarily because the command was not told that it is allowed to lose any information on our side. "git fetch --prune" now can be used to remove 'frotz/nitfol' to make room to fetch and store 'frotz' remote-tracking branch. * "diff.orderfile=" configuration variable can be used to pretend as if the "-O" option were given from the command line of "git diff", etc. * The negative pathspec syntax allows "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * "git difftool" shows how many different paths there are in total, and how many of them have been shown so far, to indicate progress. * "git push origin master" used to push our 'master' branch to update the 'master' branch at the 'origin' repository. This has been enhanced to use the same ref mapping "git push origin" would use to determine what ref at the 'origin' to be updated with our 'master'. For example, with this configuration [remote "origin"] push = refs/heads/*:refs/review/* that would cause "git push origin" to push out our local branches to corresponding refs under refs/review/ hierarchy at 'origin', "git push origin master" would update 'refs/review/master' over there. Alternatively, if push.default is set to 'upstream' and our 'master' is set to integrate with 'topic' from the 'origin' branch, running "git push origin" while on our 'master' would update their 'topic' branch, and running "git push origin master" while on any of our branches does the same. * "gitweb" learned to treat ref hierarchies other than refs/heads as if they are additional branch namespaces (e.g. refs/changes/ in Gerrit). * "git for-each-ref --format=..." learned a few formatting directives; e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)". * The command string given to "git submodule foreach" is passed directly to the shell, without being eval'ed. This is a backward incompatible change that may break existing users. * "git log" and friends learned the "--exclude=" option, to allow people to say "list history of all branches except those that match this pattern" with "git log --exclude='*/*' --branches". * "git rev-parse --parseopt" learned a new "--stuck-long" option to help scripts parse options with an optional parameter. * The "--tags" option to "git fetch" no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. Performance, Internal Implementation, etc. * When parsing a 40-hex string into the object name, the string is checked to see if it can be interpreted as a ref so that a warning can be given for ambiguity. The code kicked in even when the core.warnambiguousrefs is set to false to squelch this warning, in which case the cycles spent to look at the ref namespace were an expensive no-op, as the result was discarded without being used. * The naming convention of the packfiles has been updated; it used to be based on the enumeration of names of the objects that are contained in the pack, but now it also depends on how the packed result is represented---packing the same set of objects using different settings (or delta order) would produce a pack with different name. * "git diff --no-index" mode used to unnecessarily attempt to read the index when there is one. * The deprecated parse-options macro OPT_BOOLEAN has been removed; use OPT_BOOL or OPT_COUNTUP in new code. * A few duplicate implementations of prefix/suffix string comparison functions have been unified to starts_with() and ends_with(). * The new PERLLIB_EXTRA makefile variable can be used to specify additional directories Perl modules (e.g. the ones necessary to run git-svn) are installed on the platform when building. * "git merge-base" learned the "--fork-point" mode, that implements the same logic used in "git pull --rebase" to find a suitable fork point out of the reflog entries for the remote-tracking branch the work has been based on. "git rebase" has the same logic that can be triggered with the "--fork-point" option. * A third-party "receive-pack" (the responder to "git push") can advertise the "no-thin" capability to tell "git push" not to use the thin-pack optimization. Our receive-pack has always been capable of accepting and fattening a thin-pack, and will continue not to ask "git push" to use a non-thin pack. Also contains various documentation updates and code clean-ups. Fixes since v1.8.5 ------------------ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too agrresive and failed to match some paths when multiple pathspecs were involved. (merge e4ddb05 as/tree-walk-fix-aggressive-short-cut later to maint). * "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. (merge b861e23 sb/repack-in-c later to maint). * An earlier update in v1.8.4.x to "git rev-list --objects" with negative ref had performance regression. (merge 200abe7 jk/mark-edges-uninteresting later to maint). * A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists, but it cannot used as SSL_ca_path (e.g. Fedora rawhide). (merge 01645b7 rk/send-email-ssl-cert later to maint). * A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. (merge 9892d5d jk/interpret-branch-name-fix later to maint). * "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. (merge 4c22408 jk/allow-fetch-onelevel-refname later to maint). * "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. (merge a743528 jc/revision-range-unpeel later to maint). * documentations to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". (merge 08f19cf jc/maint-pull-docfix later to maint). * "git diff A B submod" and "git diff A B submod/" ought to have done the same for a submodule "submod", but didn't. * "git clone $origin foo\bar\baz" on Windows failed to create the leading directories (i.e. a moral-equivalent of "mkdir -p"). * "submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. (merge efa8fd7 fp/submodule-checkout-mode later to maint). * The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. (merge 2a07e43 ow/stash-with-ifs later to maint). * The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. (merge 82246b7 nd/daemon-informative-errors-typofix later to maint). * There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. (merge e228c17 js/lift-parent-count-limit later to maint). * The basic test used to leave unnecessary trash directories in the t/ directory. (merge 738a8be jk/test-framework-updates later to maint). * "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. (merge 8f29299 bm/merge-base-octopus-dedup later to maint). * A "gc" process running as a different user should be able to stop a new "gc" process from starting, but it didn't. (merge ed7eda8 km/gc-eperm later to maint). * An earlier "clean-up" introduced an unnecessary memory leak. (merge e1c1a32 jk/credential-plug-leak later to maint). * "git add -A" (no other arguments) in a totally empty working tree used to emit an error. (merge 64ed07c nd/add-empty-fix later to maint). * "git log --decorate" did not handle a tag pointed by another tag nicely. (merge 5e1361c bc/log-decoration later to maint). * When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. (merge 491a8de jh/rlimit-nofile-fallback later to maint). * read_sha1_file(), that is the workhorse to read the contents given an object name, honoured object replacements, but there was no corresponding mechanism to sha1_object_info() that was used to obtain the metainfo (e.g. type & size) about the object. This led callers to weird inconsistencies. (merge 663a856 cc/replace-object-info later to maint). * "git cat-file --batch=", an admittedly useless command, did not behave very well. (merge 6554dfa jk/cat-file-regression-fix later to maint). * "git rev-parse -- " did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. (merge 62f162f jk/rev-parse-double-dashes later to maint). * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. (merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint). * A workaround to an old bug in glibc prior to glibc 2.17 has been retired; this would remove a side effect of the workaround that corrupts system error messages in non-C locales. * SSL-related options were not passed correctly to underlying socket layer in "git send-email". (merge 5508f3e tr/send-email-ssl later to maint). * "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. (merge 1a72cfd jl/commit-v-strip-marker later to maint). * "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. (merge 5594bca nd/transport-positive-depth-only later to maint). * Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. (merge a2036d7 tb/clone-ssh-with-colon-for-port later to maint). * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. (merge 887c6c1 nd/magic-pathspec later to maint). * "git cat-file --batch-check=ok" did not check the existence of the named object. (merge 4ef8d1d sb/sha1-loose-object-info-check-existence later to maint). * "git am --abort" sometimes complained about not being able to write a tree with an 0{40} object in it. (merge 77b43ca jk/two-way-merge-corner-case-fix later to maint). * Two processes creating loose objects at the same time could have failed unnecessarily when the name of their new objects started with the same byte value, due to a race condition. (merge b2476a6 jh/loose-object-dirs-creation-race later to maint). ---------------------------------------------------------------- Changes since v1.9-rc2 are as follows: Adrian Johnson (1): userdiff: update Ada patterns Junio C Hamano (3): Git 1.8.5.4 howto/maintain-git.txt: new version numbering scheme Git 1.9.0-rc3 Nguyễn Thái Ngọc Duy (1): git-tag.txt: for --contains is optional Torsten Bögershausen (1): repack.c: rename and unlink pack file if it exists Øystein Walle (1): Documentation: fix typos in man pages -- 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.5.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: cbf14318ee9652232489982bb2da15d2e5ebb580 ... [More] git-1.8.5.4.tar.gz 6cfb7f23d2a3493d5b7657cc4558ff791294beb0 git-htmldocs-1.8.5.4.tar.gz 4ee26cf0d2db87b0be21192c4433359b6f38b217 git-manpages-1.8.5.4.tar.gz The following public repositories all have a copy of the v1.8.5.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.5.4 Release Notes ========================== Fixes since v1.8.5.4 -------------------- * "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. * Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. * SSL-related options were not passed correctly to underlying socket layer in "git send-email". * "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. * When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. * "git log --decorate" did not handle a tag pointed by another tag nicely. * "git add -A" (no other arguments) in a totally empty working tree used to emit an error. * There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. * The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. * The documentation to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". Also contains typofixes, documentation updates and trivial code clean-ups. ---------------------------------------------------------------- Changes since v1.8.5.3 are as follows: Jens Lehmann (1): commit -v: strip diffs and submodule shortlogs from the commit message Johannes Schindelin (1): Remove the line length limit for graft files Johannes Sixt (2): git_connect: remove artificial limit of a remote command git_connect: factor out discovery of the protocol and its parts Junio C Hamano (4): get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure Documentation: exclude irrelevant options from "git pull" Documentation: "git pull" does not have the "-m" option Git 1.8.5.4 Nguyễn Thái Ngọc Duy (2): clone,fetch: catch non positive --depth option value add: don't complain when adding empty project root Roman Kagan (1): git-svn: workaround for a bug in svn serf backend Thomas Rast (3): send-email: pass Debug to Net::SMTP::SSL::new send-email: --smtp-ssl-cert-path takes an argument send-email: set SSL options through IO::Socket::SSL::set_client_defaults Torsten Bögershausen (8): t5601: remove clear_ssh, refactor setup_ssh_wrapper t5601: add tests for ssh git fetch-pack: add --diag-url t5500: add test cases for diag-url git fetch: support host:/~repo git_connect(): refactor the port handling for ssh connect.c: refactor url parsing git_connect(): use common return point brian m. carlson (1): log: properly handle decorations with chained tags Øystein Walle (1): stash: handle specifying stashes with $IFS -- 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.9-rc2 is now available for testing at the usual places. I've heard rumours that various third-party tools do not like the two-digit version numbers (e.g. "Git 2.0") and started barfing left and right when the users install ... [More] v1.9-rc1. While it is tempting to laugh at them for their sloppy assumption, I am also practical and do not mind calling the upcoming release v1.9.0 to help them. If we go that route (and I am inclined to go that route at this moment), the versioning scheme will be - The next release candidate will be v1.9.0-rc3, not v1.9-rc3; - The first maintenance release for v1.9.0 will be v1.9.1 (and Nth one be v1.9.N); and - The feature release after v1.9.0 will be either v1.10.0 or v2.0.0, depending on how big the feature jump we are looking at. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: c21bb5f8a138a5af9d330ce7289f5c533d49e2a2 git-1.9.rc2.tar.gz dec30e4b187c84c08c02d53aa5d5d4d3fae9bbda git-htmldocs-1.9.rc2.tar.gz eeee207e1e91357eed351b5b7cd4a7d2cc8985cd git-manpages-1.9.rc2.tar.gz The following public repositories all have a copy of the v1.9-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.9 Release Notes (draft) ====================== Backward compatibility notes ---------------------------- "git submodule foreach $cmd $args" used to treat "$cmd $args" the same way "ssh" did, concatenating them into a single string and letting the shell unquote. Careless users who forget to sufficiently quote $args gets their argument split at $IFS whitespaces by the shell, and got unexpected results due to this. Starting from this release, the command line is passed directly to the shell, if it has an argument. Read-only support for experimental loose-object format, in which users could optionally choose to write in their loose objects for a short while between v1.4.3 to v1.5.3 era, has been dropped. The meanings of "--tags" option to "git fetch" has changed; the command fetches tags _in addition to_ what are fetched by the same command line without the option. The way "git push $there $what" interprets $what part given on the command line, when it does not have a colon that explicitly tells us what ref at the $there repository is to be updated, has been enhanced. A handful of ancient commands that have long been deprecated are finally gone (repo-config, tar-tree, lost-found, and peek-remote). 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, which 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. The default prefix for "git svn" will change in Git 2.0. For a long time, "git svn" created its remote-tracking branches directly under refs/remotes, but it will place them under refs/remotes/origin/ unless it is told otherwise with its --prefix option. Updates since v1.8.5 -------------------- Foreign interfaces, subsystems and ports. * The HTTP transport, when talking GSS-Negotiate, uses "100 Continue" response to avoid having to rewind and resend a large payload, which may not be always doable. * Various bugfixes to remote-bzr and remote-hg (in contrib/). * The build procedure is aware of MirBSD now. * Various "git p4", "git svn" and "gitk" updates. UI, Workflows & Features * Fetching from a shallowly-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This release attempts to allow object transfer out of a shallowly-cloned repository in a more controlled way (i.e. the receiver become a shallow repository with a truncated history). * Just like we give a reasonable default for "less" via the LESS environment variable, we now specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * Two-level configuration variable names in "branch.*" and "remote.*" hierarchies, whose variables are predominantly three-level, were not completed by hitting a in bash and zsh completions. * Fetching 'frotz' branch with "git fetch", while 'frotz/nitfol' remote-tracking branch from an earlier fetch was still there, would error out, primarily because the command was not told that it is allowed to lose any information on our side. "git fetch --prune" now can be used to remove 'frotz/nitfol' to make room to fetch and store 'frotz' remote-tracking branch. * "diff.orderfile=" configuration variable can be used to pretend as if the "-O" option were given from the command line of "git diff", etc. * The negative pathspec syntax allows "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * "git difftool" shows how many different paths there are in total, and how many of them have been shown so far, to indicate progress. * "git push origin master" used to push our 'master' branch to update the 'master' branch at the 'origin' repository. This has been enhanced to use the same ref mapping "git push origin" would use to determine what ref at the 'origin' to be updated with our 'master'. For example, with this configuration [remote "origin"] push = refs/heads/*:refs/review/* that would cause "git push origin" to push out our local branches to corresponding refs under refs/review/ hierarchy at 'origin', "git push origin master" would update 'refs/review/master' over there. Alternatively, if push.default is set to 'upstream' and our 'master' is set to integrate with 'topic' from the 'origin' branch, running "git push origin" while on our 'master' would update their 'topic' branch, and running "git push origin master" while on any of our branches does the same. * "gitweb" learned to treat ref hierarchies other than refs/heads as if they are additional branch namespaces (e.g. refs/changes/ in Gerrit). * "git for-each-ref --format=..." learned a few formatting directives; e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)". * The command string given to "git submodule foreach" is passed directly to the shell, without being eval'ed. This is a backward incompatible change that may break existing users. * "git log" and friends learned the "--exclude=" option, to allow people to say "list history of all branches except those that match this pattern" with "git log --exclude='*/*' --branches". * "git rev-parse --parseopt" learned a new "--stuck-long" option to help scripts parse options with an optional parameter. * The "--tags" option to "git fetch" no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. Performance, Internal Implementation, etc. * When parsing a 40-hex string into the object name, the string is checked to see if it can be interpreted as a ref so that a warning can be given for ambiguity. The code kicked in even when the core.warnambiguousrefs is set to false to squelch this warning, in which case the cycles spent to look at the ref namespace were an expensive no-op, as the result was discarded without being used. * The naming convention of the packfiles has been updated; it used to be based on the enumeration of names of the objects that are contained in the pack, but now it also depends on how the packed result is represented---packing the same set of objects using different settings (or delta order) would produce a pack with different name. * "git diff --no-index" mode used to unnecessarily attempt to read the index when there is one. * The deprecated parse-options macro OPT_BOOLEAN has been removed; use OPT_BOOL or OPT_COUNTUP in new code. * A few duplicate implementations of prefix/suffix string comparison functions have been unified to starts_with() and ends_with(). * The new PERLLIB_EXTRA makefile variable can be used to specify additional directories Perl modules (e.g. the ones necessary to run git-svn) are installed on the platform when building. * "git merge-base" learned the "--fork-point" mode, that implements the same logic used in "git pull --rebase" to find a suitable fork point out of the reflog entries for the remote-tracking branch the work has been based on. "git rebase" has the same logic that can be triggered with the "--fork-point" option. * A third-party "receive-pack" (the responder to "git push") can advertise the "no-thin" capability to tell "git push" not to use the thin-pack optimization. Our receive-pack has always been capable of accepting and fattening a thin-pack, and will continue not to ask "git push" to use a non-thin pack. Also contains various documentation updates and code clean-ups. Fixes since v1.8.5 ------------------ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too agrresive and failed to match some paths when multiple pathspecs were involved. (merge e4ddb05 as/tree-walk-fix-aggressive-short-cut later to maint). * "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. (merge b861e23 sb/repack-in-c later to maint). * An earlier update in v1.8.4.x to "git rev-list --objects" with negative ref had performance regression. (merge 200abe7 jk/mark-edges-uninteresting later to maint). * A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists, but it cannot used as SSL_ca_path (e.g. Fedora rawhide). (merge 01645b7 rk/send-email-ssl-cert later to maint). * A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. (merge 9892d5d jk/interpret-branch-name-fix later to maint). * "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. (merge 4c22408 jk/allow-fetch-onelevel-refname later to maint). * "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. (merge a743528 jc/revision-range-unpeel later to maint). * documentations to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". (merge 08f19cf jc/maint-pull-docfix later to maint). * "git diff A B submod" and "git diff A B submod/" ought to have done the same for a submodule "submod", but didn't. * "git clone $origin foo\bar\baz" on Windows failed to create the leading directories (i.e. a moral-equivalent of "mkdir -p"). * "submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. (merge efa8fd7 fp/submodule-checkout-mode later to maint). * The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. (merge 2a07e43 ow/stash-with-ifs later to maint). * The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. (merge 82246b7 nd/daemon-informative-errors-typofix later to maint). * There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. (merge e228c17 js/lift-parent-count-limit later to maint). * The basic test used to leave unnecessary trash directories in the t/ directory. (merge 738a8be jk/test-framework-updates later to maint). * "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. (merge 8f29299 bm/merge-base-octopus-dedup later to maint). * A "gc" process running as a different user should be able to stop a new "gc" process from starting, but it didn't. (merge ed7eda8 km/gc-eperm later to maint). * An earlier "clean-up" introduced an unnecessary memory leak. (merge e1c1a32 jk/credential-plug-leak later to maint). * "git add -A" (no other arguments) in a totally empty working tree used to emit an error. (merge 64ed07c nd/add-empty-fix later to maint). * "git log --decorate" did not handle a tag pointed by another tag nicely. (merge 5e1361c bc/log-decoration later to maint). * When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. (merge 491a8de jh/rlimit-nofile-fallback later to maint). * read_sha1_file(), that is the workhorse to read the contents given an object name, honoured object replacements, but there was no corresponding mechanism to sha1_object_info() that was used to obtain the metainfo (e.g. type & size) about the object. This led callers to weird inconsistencies. (merge 663a856 cc/replace-object-info later to maint). * "git cat-file --batch=", an admittedly useless command, did not behave very well. (merge 6554dfa jk/cat-file-regression-fix later to maint). * "git rev-parse -- " did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. (merge 62f162f jk/rev-parse-double-dashes later to maint). * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. (merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint). * A workaround to an old bug in glibc prior to glibc 2.17 has been retired; this would remove a side effect of the workaround that corrupts system error messages in non-C locales. * SSL-related options were not passed correctly to underlying socket layer in "git send-email". (merge 5508f3e tr/send-email-ssl later to maint). * "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. (merge 1a72cfd jl/commit-v-strip-marker later to maint). * "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. (merge 5594bca nd/transport-positive-depth-only later to maint). * Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. (merge a2036d7 tb/clone-ssh-with-colon-for-port later to maint). * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. (merge 887c6c1 nd/magic-pathspec later to maint). * "git cat-file --batch-check=ok" did not check the existence of the named object. (merge 4ef8d1d sb/sha1-loose-object-info-check-existence later to maint). * "git am --abort" sometimes complained about not being able to write a tree with an 0{40} object in it. (merge 77b43ca jk/two-way-merge-corner-case-fix later to maint). * Two processes creating loose objects at the same time could have failed unnecessarily when the name of their new objects started with the same byte value, due to a race condition. (merge b2476a6 jh/loose-object-dirs-creation-race later to maint). ---------------------------------------------------------------- Changes since v1.9-rc2 are as follows: -- 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 first release candidate for this cycle, Git v1.9-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] acc2343b4a0a0ed1920036fde1b1bf2109feb969 git-1.9.rc1.tar.gz 37bc0f5ef8f777a980304d58df003515364a54d0 git-htmldocs-1.9.rc1.tar.gz c378ff4aca0737c9773181f4e97d36a8d8413e9a git-manpages-1.9.rc1.tar.gz The following public repositories all have a copy of the v1.9-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.9 Release Notes (draft) ====================== Backward compatibility notes ---------------------------- "git submodule foreach $cmd $args" used to treat "$cmd $args" the same way "ssh" did, concatenating them into a single string and letting the shell unquote. Careless users who forget to sufficiently quote $args gets their argument split at $IFS whitespaces by the shell, and got unexpected results due to this. Starting from this release, the command line is passed directly to the shell, if it has an argument. Read-only support for experimental loose-object format, in which users could optionally choose to write in their loose objects for a short while between v1.4.3 to v1.5.3 era, has been dropped. The meanings of "--tags" option to "git fetch" has changed; the command fetches tags _in addition to_ what are fetched by the same command line without the option. The way "git push $there $what" interprets $what part given on the command line, when it does not have a colon that explicitly tells us what ref at the $there repository is to be updated, has been enhanced. A handful of ancient commands that have long been deprecated are finally gone (repo-config, tar-tree, lost-found, and peek-remote). 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, which 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. The default prefix for "git svn" will change in Git 2.0. For a long time, "git svn" created its remote-tracking branches directly under refs/remotes, but it will place them under refs/remotes/origin/ unless it is told otherwise with its --prefix option. Updates since v1.8.5 -------------------- Foreign interfaces, subsystems and ports. * The HTTP transport, when talking GSS-Negotiate, uses "100 Continue" response to avoid having to rewind and resend a large payload, which may not be always doable. * Various bugfixes to remote-bzr and remote-hg (in contrib/). * The build procedure is aware of MirBSD now. * Various "git p4", "git svn" and "gitk" updates. UI, Workflows & Features * Fetching from a shallowly-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This release attempts to allow object transfer out of a shallowly-cloned repository in a more controlled way (i.e. the receiver become a shallow repository with a truncated history). * Just like we give a reasonable default for "less" via the LESS environment variable, we now specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * Two-level configuration variable names in "branch.*" and "remote.*" hierarchies, whose variables are predominantly three-level, were not completed by hitting a in bash and zsh completions. * Fetching 'frotz' branch with "git fetch", while 'frotz/nitfol' remote-tracking branch from an earlier fetch was still there, would error out, primarily because the command was not told that it is allowed to lose any information on our side. "git fetch --prune" now can be used to remove 'frotz/nitfol' to make room to fetch and store 'frotz' remote-tracking branch. * "diff.orderfile=" configuration variable can be used to pretend as if the "-O" option were given from the command line of "git diff", etc. * The negative pathspec syntax allows "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * "git difftool" shows how many different paths there are in total, and how many of them have been shown so far, to indicate progress. * "git push origin master" used to push our 'master' branch to update the 'master' branch at the 'origin' repository. This has been enhanced to use the same ref mapping "git push origin" would use to determine what ref at the 'origin' to be updated with our 'master'. For example, with this configuration [remote "origin"] push = refs/heads/*:refs/review/* that would cause "git push origin" to push out our local branches to corresponding refs under refs/review/ hierarchy at 'origin', "git push origin master" would update 'refs/review/master' over there. Alternatively, if push.default is set to 'upstream' and our 'master' is set to integrate with 'topic' from the 'origin' branch, running "git push origin" while on our 'master' would update their 'topic' branch, and running "git push origin master" while on any of our branches does the same. * "gitweb" learned to treat ref hierarchies other than refs/heads as if they are additional branch namespaces (e.g. refs/changes/ in Gerrit). * "git for-each-ref --format=..." learned a few formatting directives; e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)". * The command string given to "git submodule foreach" is passed directly to the shell, without being eval'ed. This is a backward incompatible change that may break existing users. * "git log" and friends learned the "--exclude=" option, to allow people to say "list history of all branches except those that match this pattern" with "git log --exclude='*/*' --branches". * "git rev-parse --parseopt" learned a new "--stuck-long" option to help scripts parse options with an optional parameter. * The "--tags" option to "git fetch" no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. Performance, Internal Implementation, etc. * When parsing a 40-hex string into the object name, the string is checked to see if it can be interpreted as a ref so that a warning can be given for ambiguity. The code kicked in even when the core.warnambiguousrefs is set to false to squelch this warning, in which case the cycles spent to look at the ref namespace were an expensive no-op, as the result was discarded without being used. * The naming convention of the packfiles has been updated; it used to be based on the enumeration of names of the objects that are contained in the pack, but now it also depends on how the packed result is represented---packing the same set of objects using different settings (or delta order) would produce a pack with different name. * "git diff --no-index" mode used to unnecessarily attempt to read the index when there is one. * The deprecated parse-options macro OPT_BOOLEAN has been removed; use OPT_BOOL or OPT_COUNTUP in new code. * A few duplicate implementations of prefix/suffix string comparison functions have been unified to starts_with() and ends_with(). * The new PERLLIB_EXTRA makefile variable can be used to specify additional directories Perl modules (e.g. the ones necessary to run git-svn) are installed on the platform when building. * "git merge-base" learned the "--fork-point" mode, that implements the same logic used in "git pull --rebase" to find a suitable fork point out of the reflog entries for the remote-tracking branch the work has been based on. "git rebase" has the same logic that can be triggered with the "--fork-point" option. * A third-party "receive-pack" (the responder to "git push") can advertise the "no-thin" capability to tell "git push" not to use the thin-pack optimization. Our receive-pack has always been capable of accepting and fattening a thin-pack, and will continue not to ask "git push" to use a non-thin pack. Also contains various documentation updates and code clean-ups. Fixes since v1.8.5 ------------------ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too agrresive and failed to match some paths when multiple pathspecs were involved. (merge e4ddb05 as/tree-walk-fix-aggressive-short-cut later to maint). * "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. (merge b861e23 sb/repack-in-c later to maint). * An earlier update in v1.8.4.x to "git rev-list --objects" with negative ref had performance regression. (merge 200abe7 jk/mark-edges-uninteresting later to maint). * A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists, but it cannot used as SSL_ca_path (e.g. Fedora rawhide). (merge 01645b7 rk/send-email-ssl-cert later to maint). * A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. (merge 9892d5d jk/interpret-branch-name-fix later to maint). * "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. (merge 4c22408 jk/allow-fetch-onelevel-refname later to maint). * "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. (merge a743528 jc/revision-range-unpeel later to maint). * documentations to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". (merge 08f19cf jc/maint-pull-docfix later to maint). * "git diff A B submod" and "git diff A B submod/" ought to have done the same for a submodule "submod", but didn't. * "git clone $origin foo\bar\baz" on Windows failed to create the leading directories (i.e. a moral-equivalent of "mkdir -p"). * "submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. (merge efa8fd7 fp/submodule-checkout-mode later to maint). * The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. (merge 2a07e43 ow/stash-with-ifs later to maint). * The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. (merge 82246b7 nd/daemon-informative-errors-typofix later to maint). * There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. (merge e228c17 js/lift-parent-count-limit later to maint). * The basic test used to leave unnecessary trash directories in the t/ directory. (merge 738a8be jk/test-framework-updates later to maint). * "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. (merge 8f29299 bm/merge-base-octopus-dedup later to maint). * A "gc" process running as a different user should be able to stop a new "gc" process from starting, but it didn't. (merge ed7eda8 km/gc-eperm later to maint). * An earlier "clean-up" introduced an unnecessary memory leak. (merge e1c1a32 jk/credential-plug-leak later to maint). * "git add -A" (no other arguments) in a totally empty working tree used to emit an error. (merge 64ed07c nd/add-empty-fix later to maint). * "git log --decorate" did not handle a tag pointed by another tag nicely. (merge 5e1361c bc/log-decoration later to maint). * When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. (merge 491a8de jh/rlimit-nofile-fallback later to maint). * read_sha1_file(), that is the workhorse to read the contents given an object name, honoured object replacements, but there was no corresponding mechanism to sha1_object_info() that was used to obtain the metainfo (e.g. type & size) about the object. This led callers to weird inconsistencies. (merge 663a856 cc/replace-object-info later to maint). * "git cat-file --batch=", an admittedly useless command, did not behave very well. (merge 6554dfa jk/cat-file-regression-fix later to maint). * "git rev-parse -- " did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. (merge 62f162f jk/rev-parse-double-dashes later to maint). * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. (merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint). * A workaround to an old bug in glibc prior to glibc 2.17 has been retired; this would remove a side effect of the workaround that corrupts system error messages in non-C locales. * SSL-related options were not passed correctly to underlying socket layer in "git send-email". (merge 5508f3e tr/send-email-ssl later to maint). * "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. (merge 1a72cfd jl/commit-v-strip-marker later to maint). * "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. (merge 5594bca nd/transport-positive-depth-only later to maint). * Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. (merge a2036d7 tb/clone-ssh-with-colon-for-port later to maint). * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. (merge 887c6c1 nd/magic-pathspec later to maint). * "git cat-file --batch-check=ok" did not check the existence of the named object. (merge 4ef8d1d sb/sha1-loose-object-info-check-existence later to maint). * "git am --abort" sometimes complained about not being able to write a tree with an 0{40} object in it. (merge 77b43ca jk/two-way-merge-corner-case-fix later to maint). * Two processes creating loose objects at the same time could have failed unnecessarily when the name of their new objects started with the same byte value, due to a race condition. (merge b2476a6 jh/loose-object-dirs-creation-race later to maint). ---------------------------------------------------------------- Changes since v1.9-rc0 are as follows: Alexander Shopov (4): git-gui i18n: Initial glossary in Bulgarian git-gui l10n: Add 29 more terms to glossary git-gui i18n: Added Bulgarian translation gitk: Add Bulgarian translation (304t) Andy Spencer (1): tree_entry_interesting: match against all pathspecs Anthony Baire (1): subtree: fix argument validation in add/pull/push Astril Hayato (1): gitk: Comply with XDG base directory specification Erik Faye-Lund (2): prefer xwrite instead of write mingw: remove mingw_write Jeff King (18): fetch-pack: do not filter out one-level refs interpret_branch_name: factor out upstream handling interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: always respect "namelen" parameter interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: find all possible @-marks diff_filespec: reorder dirty_submodule macro definitions diff_filespec: drop funcname_pattern_ident field diff_filespec: drop xfrm_flags field diff_filespec: reorder is_binary field diff_filespec: use only 2 bits for is_binary flag t/perf: time rev-list with UNINTERESTING commits list-objects: only look at cmdline trees with edge_hint repack: fix typo in max-pack-size option repack: make parsed string options const-correct repack: propagate pack-objects options as strings t7501: fix "empty commit" test with NO_PERL t7700: do not use "touch" unnecessarily Johannes Sixt (1): Makefile: Fix compilation of Windows resource file John Keeping (3): completion: complete merge-base options completion: handle --[no-]fork-point options to git-rebase Makefile: remove redundant object in git-http{fetch,push} Jonathan Nieder (3): gitignore doc: add global gitignore to synopsis git-gui: chmod x po2msg, windows/git-gui.sh gitk: chmod x po2msg.sh Junio C Hamano (6): Documentation: exclude irrelevant options from "git pull" Documentation: "git pull" does not have the "-m" option revision: mark contents of an uninteresting tree uninteresting revision: propagate flag bits from tags to pointees Documentation: make it easier to maintain enumerated documents Git 1.9-rc1 Marc Branchaud (1): gitk: Replace "next" and "prev" buttons with down and up arrows Max Kirillov (2): git-gui: fallback right pane to packed widgets with Tk 8.4 gitk: Fix mistype Michael Haggerty (22): safe_create_leading_directories(): fix format of "if" chaining safe_create_leading_directories(): reduce scope of local variable safe_create_leading_directories(): add explicit "slash" pointer safe_create_leading_directories(): rename local variable safe_create_leading_directories(): split on first of multiple slashes safe_create_leading_directories(): always restore slash at end of loop safe_create_leading_directories(): introduce enum for return values cmd_init_db(): when creating directories, handle errors conservatively safe_create_leading_directories(): add new error value SCLD_VANISHED gitattributes: document more clearly where macros are allowed refname_match(): always use the rules in ref_rev_parse_rules lock_ref_sha1_basic(): on SCLD_VANISHED, retry lock_ref_sha1_basic(): if locking fails with ENOENT, retry remove_dir_recurse(): tighten condition for removing unreadable dir remove_dir_recurse(): handle disappearing files and directories rename_ref(): extract function rename_tmp_log() rename_tmp_log(): handle a possible mkdir/rmdir race rename_tmp_log(): limit the number of remote_empty_directories() attempts rename_tmp_log(): on SCLD_VANISHED, retry safe_create_leading_directories(): on Windows, \ can separate path components Add cross-references between docs for for-each-ref and show-ref doc: remote author/documentation sections from more pages Nguyễn Thái Ngọc Duy (1): tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting() Pat Thoyts (1): git-gui 0.19 Paul Mackerras (2): gitk: Update copyright dates gitk: Indent word-wrapped lines in commit display header Pete Wyckoff (11): git p4 test: wildcards are supported git p4 test: ensure p4 symlink parsing works git p4: work around p4 bug that causes empty symlinks git p4 test: explicitly check p4 wildcard delete git p4 test: is_cli_file_writeable succeeds git p4 test: run as user "author" git p4 test: do not pollute /tmp git p4: handle files with wildcards when doing RCS scrubbing git p4: fix an error message when "p4 where" fails git p4 test: examine behavior with locked ( l) files git p4 doc: use two-line style for options with multiple spellings Ruben Kerkhof (1): send-email: /etc/ssl/certs/ directory may not be usable as ca_path Thomas Ackermann (2): create HTML for http-protocol.txt http-protocol.txt: don't use uppercase for variable names in "The Negotiation Algorithm" Thomas Rast (2): Documentation/gitk: document -L option Documentation: @{-N} can refer to a commit lin zuojian (1): git-svn: memoize _rev_list and rebuild -- 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 v1.9-rc0 is now available for testing at the usual places. I tagged this late last week, but forgot to send out the announcement before I left for the weekend, and then I wasn't well yesterday, but anyway. There still ... [More] may be a few minor topics not in this preview but should be in the final release, but otherwise, this should be pretty close to "it". It has been reported that turning git.rc into git.res does not like the new 2-dewey-decimal release numbering scheme; packagers of various distro might find similar issues in their build procedures, in which case they have about 3 weeks to update them until the final release. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 495108620f8547ec8e979549857dae96bfabb0f7 git-1.9.rc0.tar.gz daf964f46acd9ba72ebcdfbd1ef0c668206a0d92 git-htmldocs-1.9.rc0.tar.gz a3b83356f738d1452bcee1d43ac5267a08986292 git-manpages-1.9.rc0.tar.gz The following public repositories all have a copy of the v1.9-rc0 tag and the v1.9-rc0 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.9 Release Notes (draft) ====================== Backward compatibility notes ---------------------------- "git submodule foreach $cmd $args" used to treat "$cmd $args" the same way "ssh" did, concatenating them into a single string and letting the shell unquote. Careless users who forget to sufficiently quote $args gets their argument split at $IFS whitespaces by the shell, and got unexpected results due to this. Starting from this release, the command line is passed directly to the shell, if it has an argument. Read-only support for experimental loose-object format, in which users could optionally choose to write in their loose objects for a short while between v1.4.3 to v1.5.3 era, has been dropped. The meanings of "--tags" option to "git fetch" has changed; the command fetches tags _in addition to_ what are fetched by the same command line without the option. The way "git push $there $what" interprets $what part given on the command line, when it does not have a colon that explicitly tells us what ref at the $there repository is to be updated, has been enhanced. A handful of ancient commands that have long been deprecated are finally gone (repo-config, tar-tree, lost-found, and peek-remote). 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, which 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. The default prefix for "git svn" will change in Git 2.0. For a long time, "git svn" created its remote-tracking branches directly under refs/remotes, but it will place them under refs/remotes/origin/ unless it is told otherwise with its --prefix option. Updates since v1.8.5 -------------------- Foreign interfaces, subsystems and ports. * The HTTP transport, when talking GSS-Negotiate, uses "100 Continue" response to avoid having to rewind and resend a large payload, which may not be always doable. * Various bugfixes to remote-bzr and remote-hg (in contrib/). * The build procedure is aware of MirBSD now. UI, Workflows & Features * Fetching from a shallowly-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This release attempts to allow object transfer out of a shallowly-cloned repository in a more controlled way (i.e. the receiver become a shallow repository with a truncated history). * Just like we give a reasonable default for "less" via the LESS environment variable, we now specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * Two-level configuration variable names in "branch.*" and "remote.*" hierarchies, whose variables are predominantly three-level, were not completed by hitting a in bash and zsh completions. * Fetching 'frotz' branch with "git fetch", while 'frotz/nitfol' remote-tracking branch from an earlier fetch was still there, would error out, primarily because the command was not told that it is allowed to lose any information on our side. "git fetch --prune" now can be used to remove 'frotz/nitfol' to make room to fetch and store 'frotz' remote-tracking branch. * "diff.orderfile=" configuration variable can be used to pretend as if the "-O" option were given from the command line of "git diff", etc. * The negative pathspec syntax allows "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * "git difftool" shows how many different paths there are in total, and how many of them have been shown so far, to indicate progress. * "git push origin master" used to push our 'master' branch to update the 'master' branch at the 'origin' repository. This has been enhanced to use the same ref mapping "git push origin" would use to determine what ref at the 'origin' to be updated with our 'master'. For example, with this configuration [remote "origin"] push = refs/heads/*:refs/review/* that would cause "git push origin" to push out our local branches to corresponding refs under refs/review/ hierarchy at 'origin', "git push origin master" would update 'refs/review/master' over there. Alternatively, if push.default is set to 'upstream' and our 'master' is set to integrate with 'topic' from the 'origin' branch, running "git push origin" while on our 'master' would update their 'topic' branch, and running "git push origin master" while on any of our branches does the same. * "gitweb" learned to treat ref hierarchies other than refs/heads as if they are additional branch namespaces (e.g. refs/changes/ in Gerrit). * "git for-each-ref --format=..." learned a few formatting directives; e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)". * The command string given to "git submodule foreach" is passed directly to the shell, without being eval'ed. This is a backward incompatible change that may break existing users. * "git log" and friends learned the "--exclude=" option, to allow people to say "list history of all branches except those that match this pattern" with "git log --exclude='*/*' --branches". * "git rev-parse --parseopt" learned a new "--stuck-long" option to help scripts parse options with an optional parameter. * The "--tags" option to "git fetch" no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. Performance, Internal Implementation, etc. * When parsing a 40-hex string into the object name, the string is checked to see if it can be interpreted as a ref so that a warning can be given for ambiguity. The code kicked in even when the core.warnambiguousrefs is set to false to squelch this warning, in which case the cycles spent to look at the ref namespace were an expensive no-op, as the result was discarded without being used. * The naming convention of the packfiles has been updated; it used to be based on the enumeration of names of the objects that are contained in the pack, but now it also depends on how the packed result is represented---packing the same set of objects using different settings (or delta order) would produce a pack with different name. * "git diff --no-index" mode used to unnecessarily attempt to read the index when there is one. * The deprecated parse-options macro OPT_BOOLEAN has been removed; use OPT_BOOL or OPT_COUNTUP in new code. * A few duplicate implementations of prefix/suffix string comparison functions have been unified to starts_with() and ends_with(). * The new PERLLIB_EXTRA makefile variable can be used to specify additional directories Perl modules (e.g. the ones necessary to run git-svn) are installed on the platform when building. * "git merge-base" learned the "--fork-point" mode, that implements the same logic used in "git pull --rebase" to find a suitable fork point out of the reflog entries for the remote-tracking branch the work has been based on. "git rebase" has the same logic that can be triggered with the "--fork-point" option. * A third-party "receive-pack" (the responder to "git push") can advertise the "no-thin" capability to tell "git push" not to use the thin-pack optimization. Our receive-pack has always been capable of accepting and fattening a thin-pack, and will continue not to ask "git push" to use a non-thin pack. Also contains various documentation updates and code clean-ups. Fixes since v1.8.5 ------------------ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance track are contained in this release (see the maintenance releases' notes for details). * "submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. (merge efa8fd7 fp/submodule-checkout-mode later to maint). * The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. (merge 2a07e43 ow/stash-with-ifs later to maint). * The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. (merge 82246b7 nd/daemon-informative-errors-typofix later to maint). * There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. (merge e228c17 js/lift-parent-count-limit later to maint). * The basic test used to leave unnecessary trash directories in the t/ directory. (merge 738a8be jk/test-framework-updates later to maint). * "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. (merge 8f29299 bm/merge-base-octopus-dedup later to maint). * A "gc" process running as a different user should be able to stop a new "gc" process from starting, but it didn't. (merge ed7eda8 km/gc-eperm later to maint). * An earlier "clean-up" introduced an unnecessary memory leak. (merge e1c1a32 jk/credential-plug-leak later to maint). * "git add -A" (no other arguments) in a totally empty working tree used to emit an error. (merge 64ed07c nd/add-empty-fix later to maint). * "git log --decorate" did not handle a tag pointed by another tag nicely. (merge 5e1361c bc/log-decoration later to maint). * When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. (merge 491a8de jh/rlimit-nofile-fallback later to maint). * read_sha1_file(), that is the workhorse to read the contents given an object name, honoured object replacements, but there was no corresponding mechanism to sha1_object_info() that was used to obtain the metainfo (e.g. type & size) about the object. This led callers to weird inconsistencies. (merge 663a856 cc/replace-object-info later to maint). * "git cat-file --batch=", an admittedly useless command, did not behave very well. (merge 6554dfa jk/cat-file-regression-fix later to maint). * "git rev-parse -- " did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. (merge 62f162f jk/rev-parse-double-dashes later to maint). * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. (merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint). * A workaround to an old bug in glibc prior to glibc 2.17 has been retired; this would remove a side effect of the workaround that corrupts system error messages in non-C locales. * SSL-related options were not passed correctly to underlying socket layer in "git send-email". (merge 5508f3e tr/send-email-ssl later to maint). * "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. (merge 1a72cfd jl/commit-v-strip-marker later to maint). * "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. (merge 5594bca nd/transport-positive-depth-only later to maint). * Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. (merge a2036d7 tb/clone-ssh-with-colon-for-port later to maint). * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. (merge 887c6c1 nd/magic-pathspec later to maint). * "git cat-file --batch-check=ok" did not check the existence of the named object. (merge 4ef8d1d sb/sha1-loose-object-info-check-existence later to maint). * "git am --abort" sometimes complained about not being able to write a tree with an 0{40} object in it. (merge 77b43ca jk/two-way-merge-corner-case-fix later to maint). * Two processes creating loose objects at the same time could have failed unnecessarily when the name of their new objects started with the same byte value, due to a race condition. (merge b2476a6 jh/loose-object-dirs-creation-race later to maint). ---------------------------------------------------------------- Changes since v1.8.5 are as follows: Anders Kaseorg (1): submodule foreach: skip eval for more than one argument Antoine Pelisse (2): Prevent buffer overflows when path is too long remote-hg: test 'shared_path' in a moved clone Benny Siegert (1): Add MirBSD support to the build system. Brodie Rao (1): sha1_name: don't resolve refs when core.warnambiguousrefs is false Carlos Martín Nieto (1): send-pack: don't send a thin pack to a server which doesn't support it Christian Couder (15): environment: normalize use of prefixcmp() by removing " != 0" builtin/remote: remove postfixcmp() and use suffixcmp() instead strbuf: introduce starts_with() and ends_with() replace {pre,suf}fixcmp() with {starts,ends}_with() rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT replace_object: don't check read_replace_refs twice sha1_file.c: add lookup_replace_object_extended() to pass flags sha1_object_info_extended(): add an "unsigned flags" parameter t6050: show that git cat-file --batch fails with replace objects sha1_file: perform object replacement in sha1_object_info_extended() builtin/replace: teach listing using short, medium or full formats t6050: add tests for listing with --format builtin/replace: unset read_replace_refs Documentation/git-replace: describe --format option replace info: rename 'full' to 'long' and clarify in-code symbols Crestez Dan Leonard (1): git p4: Use git diff-tree instead of format-patch Felipe Contreras (9): test-lib.sh: convert $TEST_DIRECTORY to an absolute path test-bzr.sh, test-hg.sh: allow running from any dir remote-helpers: add extra safety checks remote-hg: fix 'shared path' path remote-hg: add tests for special filenames abspath: trivial style fix t: trivial whitespace cleanups fetch: add missing documentation remote: fix status with branch...rebase=preserve Francesco Pretto (1): git-submodule.sh: 'checkout' is a valid update mode Greg Jacobson (1): push: enhance unspecified push default warning Jason St. John (6): Documentation/git-log: update "--log-size" description Documentation/git-log.txt: mark-up fix and minor rephasing State correct usage of literal examples in man pages in the coding standards Documentation/rev-list-options.txt: fix mark-up Documentation/rev-list-options.txt: fix some grammatical issues and typos Documentation/gitcli.txt: fix double quotes Jeff King (30): log_tree_diff: die when we fail to parse a commit assume parse_commit checks commit->object.parsed assume parse_commit checks for NULL commit use parse_commit_or_die instead of segfaulting use parse_commit_or_die instead of custom message checkout: do not die when leaving broken detached HEAD sha1write: make buffer const-correct use @@PERL@@ in built scripts http: return curl's AUTHAVAIL via slot_results remote-curl: pass curl slot_results back through run_slot unpack-trees: fix "read-tree -u --reset A B" with conflicted index drop support for "experimental" loose objects t5000: simplify gzip prerequisite checks pack-objects: name pack files after trailer hash rev-parse: correctly diagnose revision errors before "--" rev-parse: be more careful with munging arguments cat-file: pass expand_data to print_object_or_die cat-file: handle --batch format with missing type/size pack-objects doc: treat output filename as opaque diff.c: fix some recent whitespace style violations builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX do not pretend sha1write returns errors sha1_object_info_extended: provide delta base sha1s cat-file: provide %(deltabase) batch format Revert "prompt: clean up strbuf usage" use distinct username/password for http auth tests t0000: set TEST_OUTPUT_DIRECTORY for sub-tests t0000: simplify HARNESS_ACTIVE hack t0000: drop "known breakage" test t5531: further "matching" fixups Jens Lehmann (4): submodule update: remove unnecessary orig_flags variable commit -v: strip diffs and submodule shortlogs from the commit message mv: better document side effects when moving a submodule rm: better document side effects when removing a submodule Johan Herland (1): sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs Johannes Schindelin (1): Remove the line length limit for graft files Johannes Sixt (4): document --exclude option git_connect: remove artificial limit of a remote command git_connect: factor out discovery of the protocol and its parts mv: let 'git mv file no-such-dir/' error out on Windows, too John Keeping (8): repo-config: remove deprecated alias for "git config" tar-tree: remove deprecated command lost-found: remove deprecated command peek-remote: remove deprecated alias of ls-remote pull: use merge-base --fork-point when appropriate rebase: use reflog to find common base with upstream rebase: fix fork-point with zero arguments pull: suppress error when no remoteref is found John Murphy (1): git-gui: corrected setup of git worktree under cygwin. John Szakmeister (1): contrib/git-credential-gnome-keyring.c: small stylistic cleanups Jonathan Nieder (16): git-remote-mediawiki: do not remove installed files in "clean" target git-remote-mediawiki: honor DESTDIR in "make install" git-remote-mediawiki build: make 'install' command configurable git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace Makefile: rebuild perl scripts when perl paths change Makefile: add PERLLIB_EXTRA variable that adds to default perl path mark Windows build scripts executable mark perl test scripts executable mark contributed hooks executable contrib: remove git-p4import test: make FILEMODE a lazy prereq test: replace shebangs with descriptions in shell libraries remove #!interpreter line from shell libraries stop installing git-tar-tree link pager: set LV=-c alongside LESS=FRSX diff test: reading a directory as a file need not error out Junio C Hamano (28): revision: introduce --exclude= to tame wildcards merge-base: use OPT_CMDMODE and clarify the command line parsing merge-base: teach "--fork-point" mode rev-list --exclude: tests rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API rev-parse: introduce --exclude= to tame wildcards t1005: reindent t1005: add test for "read-tree --reset -u A B" sha1_loose_object_info(): do not return success on missing object bundle: use argv-array submodule: do not copy unknown update mode from .gitmodules Git 1.8.4.5 Git 1.8.5.1 builtin/push.c: use strbuf instead of manual allocation push: use remote.$name.push as a refmap push: also use "upstream" mapping when pushing a single ref Start 1.9 cycle Update draft release notes to 1.9 prune-packed: use strbuf to avoid having to worry about PATH_MAX Git 1.8.5.2 Update draft release notes to 1.9 get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure merge-base: separate "--independent" codepath into its own helper merge-base --octopus: reduce the result from get_octopus_merge_bases() Update draft release notes to 1.9 Git 1.8.5.3 Update draft release notes to 1.9 Git 1.9-rc0 Karsten Blees (1): gitignore.txt: clarify recursive nature of excluded directories Krzesimir Nowak (4): gitweb: Move check-ref-format code into separate function gitweb: Return 1 on validation success instead of passed input gitweb: Add a feature for adding more branch refs gitweb: Denote non-heads, non-remotes branches Kyle J. McKay (1): gc: notice gc processes run by other users Mads Dørup (1): git-gui: Improve font rendering on retina macbooks Masanari Iida (4): typofixes: fix misspelt comments Documentation/technical/http-protocol.txt: typofixes contrib: typofixes git-gui: correct spelling errors in comments Matthieu Moy (1): mv: let 'git mv file no-such-dir/' error out Max Kirillov (2): git-gui: Add gui.displayuntracked option git-gui: right half window is paned Michael Haggerty (27): t5510: use the correct tag name in test t5510: prepare test refs more straightforwardly t5510: check that "git fetch --prune --tags" does not prune branches api-remote.txt: correct section "struct refspec" get_ref_map(): rename local variables builtin/fetch.c: reorder function definitions get_expanded_map(): add docstring get_expanded_map(): avoid memory leak fetch: only opportunistically update references based on command line fetch --tags: fetch tags *in addition to* other stuff fetch --prune: prune only based on explicit refspecs query_refspecs(): move some constants out of the loop builtin/remote.c: reorder function definitions builtin/remote.c:update(): use struct argv_array fetch, remote: properly convey --no-prune options to subprocesses fetch-options.txt: simplify ifdef/ifndef/endif usage git-fetch.txt: improve description of tag auto-following ref_remove_duplicates(): avoid redundant bisection t5536: new test of refspec conflicts when fetching ref_remove_duplicates(): simplify loop logic ref_remote_duplicates(): extract a function handle_duplicate() handle_duplicate(): mark error message for translation fetch: improve the error messages emitted for conflicting refspecs cmd_repack(): remove redundant local variable "nr_packs" shorten_unambiguous_ref(): introduce a new local variable gen_scanf_fmt(): delete function and use snprintf() instead shorten_unambiguous_ref(): tighten up pointer arithmetic Nguyễn Thái Ngọc Duy (41): wt-status: take the alignment burden off translators diff: restrict pathspec limitations to diff b/f case only glossary-content.txt: fix documentation of "**" patterns gettext.c: detect the vsnprintf bug at runtime clone,fetch: catch non positive --depth option value glossary-content.txt: rephrase magic signature part Support pathspec magic :(exclude) and its short form :! pathspec.c: support adding prefix magic to a pathspec with mnemonic magic parse-options: remove OPT_BOOLEAN transport.h: remove send_pack prototype, already defined in send-pack.h remote.h: replace struct extra_have_objects with struct sha1_array send-pack: forbid pushing from a shallow repository clone: prevent --reference to a shallow repository make the sender advertise shallow commits to the receiver connect.c: teach get_remote_heads to parse "shallow" lines shallow.c: extend setup_*_shallow() to accept extra shallow commits shallow.c: the 8 steps to select new commits for .git/shallow shallow.c: steps 6 and 7 to select new commits for .git/shallow fetch-pack.c: move shallow update code out of fetch_pack() fetch-pack.h: one statement per bitfield declaration clone: support remote shallow repository fetch: support fetching from a shallow repository upload-pack: make sure deepening preserves shallow roots fetch: add --update-shallow to accept refs that update .git/shallow receive-pack: reorder some code in unpack() receive/send-pack: support pushing from a shallow clone add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses connected.c: add new variant that runs with --shallow-file receive-pack: allow pushes that update .git/shallow send-pack: support pushing to a shallow clone remote-curl: pass ref SHA-1 to fetch-pack as well smart-http: support shallow fetch/clone receive-pack: support pushing to a shallow clone via http send-pack: support pushing from a shallow clone via http clone: use git protocol for cloning shallow repo locally prune: clean .git/shallow after pruning objects git-clone.txt: remove shallow clone limitations daemon: be strict at parsing parameters --[no-]informative-errors add: don't complain when adding empty project root commit.c: make "tree" a const pointer in commit_tree*() t5537: fix incorrect expectation in test case 10 Nick Townsend (1): ref-iteration doc: add_submodule_odb() returns 0 for success Nicolas Vigier (2): Use the word 'stuck' instead of 'sticked' rev-parse --parseopt: add the --stuck-long mode Pat Thoyts (3): git-gui: added gui.maxrecentrepo to extend the number of remembered repos git-gui: show the maxrecentrepo config option in the preferences dialog git-gui: add menu item to launch a bash shell on Windows. Paul Mackerras (1): gitk: Tag display improvements Ralf Thielow (1): l10n: de.po: fix translation of 'prefix' Ramkumar Ramachandra (12): t6300 (for-each-ref): clearly demarcate setup t6300 (for-each-ref): don't hardcode SHA-1 hexes for-each-ref: introduce %(HEAD) asterisk marker for-each-ref: introduce %(upstream:track[short]) for-each-ref: introduce %(color:...) for color for-each-ref: avoid color leakage for-each-ref: remove unused variable zsh completion: find matching custom bash completion completion: introduce __gitcomp_nl_append () completion: fix branch.autosetup(merge|rebase) completion: fix remote.pushdefault completion: complete format.coverLetter Ramsay Allan Jones (2): send-pack.c: mark a file-local function static shallow: remove unused code René Scharfe (1): SubmittingPatches: document how to handle multiple patches Richard Hansen (6): test-bzr.sh, test-hg.sh: prepare for change to push.default=simple test-hg.sh: eliminate 'local' bashism test-hg.sh: avoid obsolete 'test' syntax test-hg.sh: fix duplicate content strings in author tests test-hg.sh: help user correlate verbose output with email test remote-bzr, remote-hg: fix email address regular expression Roberto Tyley (1): docs: add filter-branch notes on The BFG Roman Kagan (2): git-svn: workaround for a bug in svn serf backend git-svn: workaround for a bug in svn serf backend Samuel Bronson (3): t4056: add new tests for "git diff -O" diff: let "git diff -O" read orderfile from any file and fail properly diff: add diff.orderfile configuration variable Sebastian Schuberth (3): git.c: consistently use the term "builtin" instead of "internal command" builtin/help.c: call load_command_list() only when it is needed builtin/help.c: speed up is_git_command() by checking for builtin commands first Thomas Ackermann (2): user-manual: improve html and pdf formatting pack-heuristics.txt: mark up the file header properly Thomas Gummerer (4): diff: move no-index detection to builtin/diff.c diff: don't read index when --no-index is given diff: add test for --no-index executed outside repo diff: avoid some nesting Thomas Rast (13): commit-slab: document clear_$slabname() commit-slab: declare functions "static inline" Documentation: revamp git-cherry(1) gitk: Support -G option from the command line gitk: Refactor per-line part of getblobdiffline and its support gitk: Split out diff part in $commitinfo gitk: Support showing the gathered inline diffs gitk: Recognize -L option commit-slab: sizeof() the right type in xrealloc send-email: pass Debug to Net::SMTP::SSL::new send-email: --smtp-ssl-cert-path takes an argument send-email: set SSL options through IO::Socket::SSL::set_client_defaults config: arbitrary number of matches for --unset and --replace-all Tom Miller (2): fetch --prune: always print header url fetch --prune: Run prune before fetching Torsten Bögershausen (9): git-fetch-pack uses URLs like git-fetch t5601: remove clear_ssh, refactor setup_ssh_wrapper t5601: add tests for ssh git fetch-pack: add --diag-url t5500: add test cases for diag-url git fetch: support host:/~repo git_connect(): refactor the port handling for ssh connect.c: refactor url parsing git_connect(): use common return point Vasily Makarov (1): get_octopus_merge_bases(): cleanup redundant variable W. Trevor King (1): Documentation/gitmodules: Only 'update' and 'url' are required Zoltan Klinger (1): difftool: display the number of files in the diff queue in the prompt brian m. carlson (3): remote-curl: fix large pushes with GSSAPI Documentation: document pitfalls with 3-way merge log: properly handle decorations with chained tags jcb91 (1): remote-hg: avoid buggy strftime() Øystein Walle (1): stash: handle specifying stashes with $IFS -- 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.5.3 is now available at the usual places, backporting the fixes that happened on the 'master' front. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 ... [More] checksums are: 767aa30c0f569f9b6e04cb215dfeec0c013c355a git-1.8.5.3.tar.gz 47da8e2b1d23ae501ee2c03414c04f8225079037 git-htmldocs-1.8.5.3.tar.gz e4b66ca3ab1b089af651bf742aa030718e9af978 git-manpages-1.8.5.3.tar.gz The following public repositories all have a copy of the v1.8.5.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.5.3 Release Notes ========================== Fixes since v1.8.5.2 -------------------- * The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. * A "gc" process running as a different user should be able to stop a new "gc" process from starting. * An earlier "clean-up" introduced an unnecessary memory leak to the credential subsystem. * "git mv A B/", when B does not exist as a directory, should error out, but it didn't. * "git rev-parse -- " did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. * "git cat-file --batch=", an admittedly useless command, did not behave very well. Also contains typofixes, documentation updates and trivial code clean-ups. ---------------------------------------------------------------- Changes since v1.8.5.2 are as follows: Jeff King (5): rev-parse: correctly diagnose revision errors before "--" rev-parse: be more careful with munging arguments cat-file: pass expand_data to print_object_or_die cat-file: handle --batch format with missing type/size Revert "prompt: clean up strbuf usage" Johannes Sixt (1): mv: let 'git mv file no-such-dir/' error out on Windows, too Junio C Hamano (1): Git 1.8.5.3 Kyle J. McKay (1): gc: notice gc processes run by other users Matthieu Moy (1): mv: let 'git mv file no-such-dir/' error out Nguyễn Thái Ngọc Duy (1): daemon: be strict at parsing parameters --[no-]informative-errors Ralf Thielow (1): l10n: de.po: fix translation of 'prefix' Ramkumar Ramachandra (1): for-each-ref: remove unused variable Thomas Ackermann (1): pack-heuristics.txt: mark up the file header properly W. Trevor King (1): Documentation/gitmodules: Only 'update' and 'url' are required -- 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]