Git

Hello all, I've kinda stopped sending "announce" emails for all the little features and enhancements that happen to gitolite, but this one seemed big enough and important enough to send one out to this list. Gitolite v2.1 now does mirroring much ... [More] more flexibly and powerfully than the old, rather naive, setup. Most of the impetus for these changes came from a rather large product development group within TCS, the company I work for -- many cities, offices, servers, repos, and developers. Here are the highlights: (1) the "NUMA" thing: Different repos can now be mastered on different servers, depending on which city/office has the most developers for *that* project. This was the single biggest motivator for the new mirroring code; the rest of the cool stuff just happened along. (2) almost as good as "active-active" mirroring: If the "master" server trusts the authentication performed by the "slave" server, you can have the slave internally redirect a "git push" to the correct master. With this, developers don't have to remember which repo is mastered where, use different 'pushurl's, etc. They just do *everything* with their local mirror and let the system deal with it. (You can even change which server is "master" and people don't even need to know it has changed!) (3) partial mirrors and local repos: A server doesn't have to carry *all* the repos in the system -- it can choose to carry only some. In our case it was often because there were no developers for that project in that office, but there could be other reasons. Server load/resource constraints, legal/jurisdictional issues, server in a non-free country and repo has crypto code ;-) etc. Similarly, a server can have repos that it wants to keep purely local -- not to be mirrored at all. (4) laggy mirrors: If daytime bandwidth is an issue, and you're ok with the lag, you can postpone mirroring to night times instead of with every push. The actual mirroring is triggered with a simple command -- you can write your cron jobs around that quite easily. (5) autonomous mirrors: Your mirrors don't all have to be under your control. They can be owned by someone else and you negotiate what repos you'll mirror for each other. For example, an open source project may find a "donor" that is willing to mirror a few highly-trafficked repos and make them available via git:// or http:// ---- We use all these features (except the last one; it's not pertinent to our setup), and things have been humming along for a few weeks now. If you have any questions not answered by the documentation[1], feel free to email me. [1]: http://sitaramc.github.com/gitolite/doc/mirroring.html -- Sitaram -- 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 1.7.7.rc3 is available for testing but not at the usual places. The tarball is found at: http://code.google.com/p/git-core/downloads/list and its SHA-1 checksum is: c6ba05a833cab49dd66dd1e252306e187effbf2b ... [More] git-1.7.7.rc3.tar.gz Also the following public repositories all have a copy of the v1.7.7-rc3 tag and the master branch that the tag points at: 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 I had to make a quick fix for a recent regression directly on master, and I would like to cook it for a few days, so the final has to wait til mid next week. Until then please help testing to find other regressions. ---------------------------------------------------------------- Changes since v1.7.7-rc2 are as follows: Allan Caffee (1): describe: Refresh the index when run with --dirty Jay Soffian (1): git-mergetool: check return value from read Jeff King (1): t4014: clean up format.thread config after each test Junio C Hamano (3): Git 1.7.6.4 merge-recursive: Do not look at working tree during a virtual ancestor merge Git 1.7.7-rc3 -- 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 1.7.6.4 is available but not 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: df91e2c32d6097ab1c9d0edc56dd8cecb4e9b686 ... [More] git-1.7.6.4.tar.gz 6abd985e24b6585284cef7fae2e3046ba9201356 git-htmldocs-1.7.6.4.tar.gz c6f6d92f4005a7eccaf89e851c45768c18f7e65a git-manpages-1.7.6.4.tar.gz Also the following public repositories all have a copy of the v1.7.6.4 tag and the maint branch that the tag points at: 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.7.6.4 Release Notes ========================== Fixes since v1.7.6.3 -------------------- * The error reporting logic of "git am" when the command is fed a file whose mail-storage format is unknown was fixed. * "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly. * "git check-ref-format --print" used to parrot a candidate string that began with a slash (e.g. /refs/heads/master) without stripping it, to make the result a suitably normalized string the caller can append to "$GIT_DIR/". * "git clone" failed to clone locally from a ".git" file that itself is not a directory but is a pointer to one. * "git clone" from a local repository that borrows from another object store using a relative path in its objects/info/alternates file did not adjust the alternates in the resulting repository. * "git describe --dirty" did not refresh the index before checking the state of the working tree files. * "git ls-files ../$path" that is run from a subdirectory reported errors incorrectly when there is no such path that matches the given pathspec. * "git mergetool" could loop forever prompting when nothing can be read from the standard input. Also contains minor fixes and documentation updates. -- 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 1.7.7.rc2 is available but unfortunately not at the usual places. Even so (rather, exactly because it is in unusual places, so we are likely to have smaller number of casual observers who grab and build them), please test it ... [More] to help us make the upcoming release as solid as we could. A release candidate tarball is found at: http://code.google.com/p/git-core/downloads/list and its SHA-1 checksum is: 1e0e035148df279af689131273570a7dde45950b git-1.7.7.rc2.tar.gz Also the following public repositories all have a copy of the v1.7.7-rc2 tag and the master branch that the tag points at: 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 ---------------------------------------------------------------- Changes since v1.7.7-rc1 are as follows: Bryan Jacobs (1): git-svn: teach git-svn to populate svn:mergeinfo Frédéric Heitzmann (1): Disambiguate duplicate t9160* tests Junio C Hamano (2): branch --set-upstream: regression fix Git 1.7.7-rc2 Pang Yan Han (1): format-patch: ignore ui.color -- 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 1.7.7.rc1 is available but unfortunately not at the usual places. Even so (rather, exactly because it is in unusual places, so we are likely to have smaller number of casual observers who grab and build them), please test it ... [More] to help us make the upcoming release as solid as we could. A release candidate tarball is found at: http://code.google.com/p/git-core/downloads/list and its SHA-1 checksum is: 80dfcce410d2f36ffed4c8b48c8c896a45159e41 git-1.7.7.rc1.tar.gz Also the following public repositories all have a copy of the v1.7.7-rc1 tag and the master branch that the tag points at: 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.7.7 Release Notes (draft) ======================== Updates since v1.7.6 -------------------- * The scripting part of the codebase is getting prepared for i18n/l10n. * Interix, Cygwin and Minix ports got updated. * Various updates to git-p4 (in contrib/), fast-import, and git-svn. * Gitweb learned to read from /etc/gitweb-common.conf when it exists, before reading from gitweb_config.perl or from /etc/gitweb.conf (this last one is read only when per-repository gitweb_config.perl does not exist). * Various codepaths that invoked zlib deflate/inflate assumed that these functions can compress or uncompress more than 4GB data in one call on platforms with 64-bit long, which has been corrected. * Git now recognizes loose objects written by other implementations that use a non-standard window size for zlib deflation (e.g. Agit running on Android with 4kb window). We used to reject anything that was not deflated with 32kb window. * Interaction between the use of pager and coloring of the output has been improved, especially when a command that is not built-in was involved. * "git am" learned to pass the "--exclude=" option through to underlying "git apply". * You can now feed many empty lines before feeding an mbox file to "git am". * "git archive" can be told to pass the output to gzip compression and produce "archive.tar.gz". * "git bisect" can be used in a bare repository (provided that the test you perform per each iteration does not need a working tree, of course). * The length of abbreviated object names in "git branch -v" output now honors the core.abbrev configuration variable. * "git check-attr" can take relative paths from the command line. * "git check-attr" learned an "--all" option to list the attributes for a given path. * "git checkout" (both the code to update the files upon checking out a different branch and the code to checkout a specific set of files) learned to stream the data from object store when possible, without having to read the entire contents of a file into memory first. An earlier round of this code that is not in any released version had a large leak but now it has been plugged. * "git clone" can now take a "--config key=value" option to set the repository configuration options that affect the initial checkout. * "git commit ..." now lets you feed relative pathspecs that refer to outside your current subdirectory. * "git diff --stat" learned a --stat-count option to limit the output of a diffstat report. * "git diff" learned a "--histogram" option to use a different diff generation machinery stolen from jgit, which might give better performance. * "git diff" had a weird worst case behaviour that can be triggered when comparing files with potentially many places that could match. * "git fetch", "git push" and friends no longer show connection errors for addresses that couldn't be connected to when at least one address succeeds (this is arguably a regression but a deliberate one). * "git grep" learned "--break" and "--heading" options, to let users mimic the output format of "ack". * "git grep" learned a "-W" option that shows wider context using the same logic used by "git diff" to determine the hunk header. * Invoking the low-level "git http-fetch" without "-a" option (which git itself never did---normal users should not have to worry about this) is now deprecated. * The "--decorate" option to "git log" and its family learned to highlight grafted and replaced commits. * "git rebase master topci" no longer spews usage hints after giving the "fatal: no such branch: topci" error message. * The recursive merge strategy implementation got a fairly large fix for many corner cases that may rarely happen in real world projects (it has been verified that none of the 16000+ merges in the Linux kernel history back to v2.6.12 is affected with the corner case bugs this update fixes). * "git stash" learned an "--include-untracked option". * "git submodule update" used to stop at the first error updating a submodule; it now goes on to update other submodules that can be updated, and reports the ones with errors at the end. * "git push" can be told with the "--recurse-submodules=check" option to refuse pushing of the supermodule, if any of its submodules' commits hasn't been pushed out to their remotes. * "git upload-pack" and "git receive-pack" learned to pretend that only a subset of the refs exist in a repository. This may help a site to put many tiny repositories into one repository (this would not be useful for larger repositories as repacking would be problematic). * "git verify-pack" has been rewritten to use the "index-pack" machinery that is more efficient in reading objects in packfiles. * test scripts for gitweb tried to run even when CGI-related perl modules are not installed; they now exit early when the latter are unavailable. Also contains various documentation updates and minor miscellaneous changes. Fixes since v1.7.6 ------------------ Unless otherwise noted, all fixes in the 1.7.6.X maintenance track are included in this release. * The error reporting logic of "git am" when the command is fed a file whose mail-storage format is unknown was fixed. (merge dff4b0e gb/maint-am-patch-format-error-message later to 'maint'). * "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly. (merge e9d4f74 mg/branch-set-upstream-previous later to 'maint'). * "git branch -m" and "git checkout -b" incorrectly allowed the tip of the branch that is currently checked out updated. (merge 55c4a67 ci/forbid-unwanted-current-branch-update later to 'maint'). * "git check-ref-format --print" used to parrot a candidate string that began with a slash (e.g. /refs/heads/master) without stripping it, to make the result a suitably normalized string the caller can append to "$GIT_DIR/". (merge f3738c1 mh/check-ref-format-print-normalize later to 'maint'). * "git clone" failed to clone locally from a ".git" file that itself is not a directory but is a pointer to one. (merge 9b0ebc7 nd/maint-clone-gitdir later to 'maint'). * "git clone" from a local repository that borrows from another object store using a relative path in its objects/info/alternates file did not adjust the alternates in the resulting repository. (merge e6baf4a1 jc/maint-clone-alternates later to 'maint'). * "git describe --dirty" did not refresh the index before checking the state of the working tree files. (cherry-pick bb57148 ac/describe-dirty-refresh later to 'maint'). * "git ls-files ../$path" that is run from a subdirectory reported errors incorrectly when there is no such path that matches the given pathspec. (merge 0f64bfa cb/maint-ls-files-error-report later to 'maint'). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git 1.7.6.3 is available but unfortunately not at the usual places. The release tarball is found at: http://code.google.com/p/git-core/downloads/list and its SHA-1 checksum is: ... [More] 7264c0b0d97cb6a70447ba3b4b6fa488810d8115 git-1.7.6.3.tar.gz Also the following public repositories all have a copy of the v1.7.6.3 tag and the maint branch that the tag points at: 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.7.6.3 Release Notes ========================== Fixes since v1.7.6.2 -------------------- * "git -c var=value subcmd" misparsed the custom configuration when value contained an equal sign. * "git fetch" had a major performance regression, wasting many needless cycles in a repository where there is no submodules present. This was especially bad, when there were many refs. * "git reflog $refname" did not default to the "show" subcommand as the documentation advertised the command to do. * "git reset" did not leave meaningful log message in the reflog. * "git status --ignored" did not show ignored items when there is no untracked items. * "git tag --contains $commit" was unnecessarily inefficient. Also contains minor fixes and documentation updates. -- 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]

I've tagged the latest maintenance release Git 1.7.6.2 but unfortunately the tarballs are not available at the usual places. The release can be fetched from any of the following repositories, at the tip of 'maint' branch. ... [More] git://repo.or.cz/alt-git.git https://github.com/gitster/git https://code.google.com/p/git-core/ git://git.sourceforge.jp/gitroot/git-core/git.git git://git-core.git.sourceforge.net/gitroot/git-core/git-core This is primarily to fix "git push --quiet" breakage in 1.7.6.1. ---------------------------------------------------------------- Changes since v1.7.6.1 are as follows: Junio C Hamano (3): whitespace: have SP on both sides of an assignment "=" Revert "Merge branch 'cb/maint-quiet-push' into maint" Git 1.7.6.2 Pang Yan Han (1): update-ref: whitespace fix Thomas Rast (1): Documentation: clarify effects of -- arguments -- 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]

Google is once again hosting a 2 day user/developer conference for Git users and developers to get together, share experiences, and hack on interesting features. This event will be held October 24th and 25th at Google's headquarters in Mountain View ... [More] , CA. More details along with sign-up (as space is limited) can be found on the wiki: https://git.wiki.kernel.org/index.php/GitTogether11 -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello I've needed a program to split a repository into multiple repositories, each with part of the history according to file path rules. I already wrote a wrapper around git filter-branch that took care of the path filtering, but this time I ... [More] finally wanted to take care of merge commits that "do nothing", i.e. that have one parent commit with the same tree as the merge commit and another parent that's part of the history of the other parent. (Similar rule for octopus merges if I happen to ever run across one of these.) git-filter-branch doesn't have functionality to remove these by itself, thus a custom commit filter is needed. This turned out to be a bit of an adventure because arrays are really well suited for this, but I've rarely used them in shell scripts, so I tracked down the necessary syntactical vodoo for writing my code in bash, only to find out that git filter-branch is actually calling my code in sh, not bash (hence no arrays). After realizing this, and coping with it by moving my code inside a bash invocation (and making a copy of the library code from git-filter-branch--why isn't this in a separate file, btw, then I could just include it from there?), I thought I should perhaps send you all a notice about it, in case anyone else wanted to split repositories cleanly, too. Or in case someone wanted to point out that I'm doing this in a stupid way or a nice solution exists elsewhere already: please tell me about it! So, here's my wrapper around git-filter-branch that is able to remove paths (including whole directories) and removes 'empty' merges: https://github.com/pflanze/chj-bin/blob/master/cj-git-filter-branch And a wrapper around cj-git-filter-branch that makes creating a partial copy of a repository easy: https://github.com/pflanze/chj-bin/blob/master/cj-git-splitrepo If you want to actually run these, you need some of my libraries: # cd /opt; mkdir chj; cd chj # git clone https://github.com/pflanze/chj-perllib.git perllib # git clone https://github.com/pflanze/chj-bin.git bin # git clone https://github.com/pflanze/Class-Array.git # mkdir /usr/local/lib/site_perl/ # if it doesn't exist already # ln -s /opt/chj/perllib/Chj /usr/local/lib/site_perl/ # ln -s /opt/chj/Class-Array /usr/local/lib/site_perl/Class and add /opt/chj/bin to your PATH (through your .bash_profile or similar) (or you could supposedly use the PERL5LIB env var instead of symlinks). Christian. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello all, We would like to ask you a few questions about your use of the Git version control system. This survey is mainly to understand who is using Git, how and why. The results will be published to the Git wiki on the GitSurvey2011 page ... [More] (https://git.wiki.kernel.org/index.php/GitSurvey2011) and discussed on the git mailing list. The survey would be open from 5 September till 3 October 2011. Please devote a few minutes of your time to fill this simple questionnaire, it will help a lot the git community to understand your needs, what you like of Git, and of course what you don't like of it. The survey can be found here: http://tinyurl.com/GitSurvey2011 https://www.survs.com/survey/VCAGZA8CT5 There is also alternate version which does not require cookies, but it doesn't allow one to go back to response and edit it. https://www.survs.com/survey/MRRGT8OEFV P.S. At request I can open a separate channel in survey, with a separate survey URL, so that responses from particular site or organization could be separated out. Please send me a email with name of channel, and I will return with a separate survey URL to use. -- Git Development Community -- 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]