{"thread":{"id":"29457","subject":"[ANNOUNCE] Git 1.7.9","startedAt":"2012-01-27T21:31:09Z","lastAt":"2012-02-03T21:49:07Z","messageCount":11,"participants":["Junio C Hamano","Felipe Contreras","Matthieu Moy","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"183201","messageId":"7vipjwzvc2.fsf@alter.siamese.dyndns.org","threadId":"29457","inReplyTo":null,"subject":"[ANNOUNCE] Git 1.7.9","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-27T21:31:09Z","receivedAt":"2012-01-27T21:31:09Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The latest feature release Git 1.7.9 is now available at the usual\nplaces.\n\nThe release tarballs are found at:\n\n    http://code.google.com/p/git-core/downloads/list\n\nand their SHA-1 checksums are:\n\ned51ef5ef250daaa6e98515cf2641820cd268d4c  git-1.7.9.tar.gz\nc7b1fa20dc501beb2cb5091dd24dbfd2a0013a0c  git-htmldocs-1.7.9.tar.gz\n1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a  git-manpages-1.7.9.tar.gz\n\nAlso the following public repositories all have a copy of the v1.7.9\ntag and the master branch that the tag points at:\n\n  url = git://repo.or.cz/alt-git.git\n  url = https://code.google.com/p/git-core/\n  url = git://git.sourceforge.jp/gitroot/git-core/git.git\n  url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core\n  url = https://github.com/gitster/git\n\nHave fun.\n\n\nGit v1.7.9 Release Notes\n========================\n\nUpdates since v1.7.8\n--------------------\n\n * gitk updates accumulated since early 2011.\n\n * git-gui updated to 0.16.0.\n\n * git-p4 (in contrib/) updates.\n\n * Git uses gettext to translate its most common interface messages\n   into the user's language if translations are available and the\n   locale is appropriately set. Distributors can drop new PO files\n   in po/ to add new translations.\n\n * The code to handle username/password for HTTP transactions used in\n   \"git push\" & \"git fetch\" learned to talk \"credential API\" to\n   external programs to cache or store them, to allow integration with\n   platform native keychain mechanisms.\n\n * The input prompts in the terminal use our own getpass() replacement\n   when possible. HTTP transactions used to ask for the username without\n   echoing back what was typed, but with this change you will see it as\n   you type.\n\n * The internals of \"revert/cherry-pick\" have been tweaked to prepare\n   building more generic \"sequencer\" on top of the implementation that\n   drives them.\n\n * \"git rev-parse FETCH_HEAD\" after \"git fetch\" without specifying\n   what to fetch from the command line will now show the commit that\n   would be merged if the command were \"git pull\".\n\n * \"git add\" learned to stream large files directly into a packfile\n   instead of writing them into individual loose object files.\n\n * \"git checkout -B <current branch> <elsewhere>\" is a more intuitive\n   way to spell \"git reset --keep <elsewhere>\".\n\n * \"git checkout\" and \"git merge\" learned \"--no-overwrite-ignore\" option\n   to tell Git that untracked and ignored files are not expendable.\n\n * \"git commit --amend\" learned \"--no-edit\" option to say that the\n   user is amending the tree being recorded, without updating the\n   commit log message.\n\n * \"git commit\" and \"git reset\" re-learned the optimization to prime\n   the cache-tree information in the index, which makes it faster to\n   write a tree object out after the index entries are updated.\n\n * \"git commit\" detects and rejects an attempt to stuff NUL byte in\n   the commit log message.\n\n * \"git commit\" learned \"-S\" to GPG-sign the commit; this can be shown\n   with the \"--show-signature\" option to \"git log\".\n\n * fsck and prune are relatively lengthy operations that still go\n   silent while making the end-user wait. They learned to give progress\n   output like other slow operations.\n\n * The set of built-in function-header patterns for various languages\n   knows MATLAB.\n\n * \"git log --format='<format>'\" learned new %g[nNeE] specifiers to\n   show information from the reflog entries when walking the reflog\n   (i.e. with \"-g\").\n\n * \"git pull\" can be used to fetch and merge an annotated/signed tag,\n   instead of the tip of a topic branch. The GPG signature from the\n   signed tag is recorded in the resulting merge commit for later\n   auditing.\n\n * \"git log\" learned \"--show-signature\" option to show the signed tag\n   that was merged that is embedded in the merge commit. It also can\n   show the signature made on the commit with \"git commit -S\".\n\n * \"git branch --edit-description\" can be used to add descriptive text\n   to explain what a topic branch is about.\n\n * \"git fmt-merge-msg\" learned to take the branch description into\n   account when preparing a merge summary that \"git merge\" records\n   when merging a local branch.\n\n * \"git request-pull\" has been updated to convey more information\n   useful for integrators to decide if a topic is worth merging and\n   what is pulled is indeed what the requestor asked to pull,\n   including:\n\n   - the tip of the branch being requested to be merged;\n   - the branch description describing what the topic is about;\n   - the contents of the annotated tag, when requesting to pull a tag.\n\n * \"git pull\" learned to notice 'pull.rebase' configuration variable,\n   which serves as a global fallback for setting 'branch.<name>.rebase'\n   configuration variable per branch.\n\n * \"git tag\" learned \"--cleanup\" option to control how the whitespaces\n   and empty lines in tag message are cleaned up.\n\n * \"gitweb\" learned to show side-by-side diff.\n\nAlso contains minor documentation updates and code clean-ups.\n\n\nFixes since v1.7.8\n------------------\n\nUnless otherwise noted, all the fixes since v1.7.8 in the maintenance\nreleases are contained in this release (see release notes to them for\ndetails).\n"},{"id":"183204","messageId":"7vehukzuv4.fsf@alter.siamese.dyndns.org","threadId":"29457","inReplyTo":"7vipjwzvc2.fsf@alter.siamese.dyndns.org","subject":"A note from the maintainer","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-27T21:41:19Z","receivedAt":"2012-01-27T21:41:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Welcome to git development community.\n\nThis message is written by the maintainer and talks about how Git\nproject is managed, and how you can work with it.\n\n* Mailing list and the community\n\nThe development is primarily done on the Git mailing list. Help\nrequests, feature proposals, bug reports and patches should be sent to\nthe list address <git@vger.kernel.org>.  You don't have to be\nsubscribed to send messages.  The convention on the list is to keep\neverybody involved on Cc:, so it is unnecessary to say \"Please Cc: me,\nI am not subscribed\".\n\nBefore sending patches, please read Documentation/SubmittingPatches\nand Documentation/CodingGuidelines to familiarize yourself with the\nproject convention.\n\nIf you sent a patch and you did not hear any response from anybody for\nseveral days, it could be that your patch was totally uninteresting,\nbut it also is possible that it was simply lost in the noise.  Please\ndo not hesitate to send a reminder message in such a case.  Messages\ngetting lost in the noise is a sign that people involved don't have\nenough mental/time bandwidth to process them right at the moment, and\nit often helps to wait until the list traffic becomes calmer before\nsending such a reminder.\n\nThe list archive is available at a few public sites:\n\n        http://news.gmane.org/gmane.comp.version-control.git/\n        http://marc.theaimsgroup.com/?l=git\n        http://www.spinics.net/lists/git/\n\nSome people seem to prefer to read it over NNTP:\n\n        nntp://news.gmane.org/gmane.comp.version-control.git\n\nWhen you point at a message in a mailing list archive, using\ngmane is often the easiest to follow by readers, like this:\n\n        http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217\n\nas it also allows people who subscribe to the mailing list as gmane\nnewsgroup to \"jump to\" the article.\n\nSome members of the development community can sometimes also be found\non the #git IRC channel on Freenode.  Its log is available at:\n\n        http://colabti.org/irclogger/irclogger_log/git\n\n* Reporting bugs\n\nWhen you think git does not behave as you expect, please do not stop\nyour bug report with just \"git does not work\".  \"I used git in this\nway, but it did not work\" is not much better, neither is \"I used git\nin this way, and X happend, which is broken\".  It often is that git is\ncorrect to cause X happen in such a case, and it is your expectation\nthat is broken. People would not know what other result Y you expected\nto see instead of X, if you left it unsaid.\n\nPlease remember to always state\n\n - what you wanted to achieve;\n\n - what you did (the version of git and the command sequence to reproduce\n   the behavior);\n\n - what you saw happen (X above);\n\n - what you expected to see (Y above); and\n\n - how the last two are different.\n\nSee http://www.chiark.greenend.org.uk/~sgtatham/bugs.html for further\nhints.\n\n* Repositories, branches and documentation.\n\nMy public git.git repositories are at:\n\n        git://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://github.com/git/git/\n\thttps://code.google.com/p/git-core/\n\tgit://git.sourceforge.jp/gitroot/git-core/git.git/\n\tgit://git-core.git.sourceforge.net/gitroot/git-core/git-core/\n\nA few gitweb interfaces are found at:\n\n        http://git.kernel.org/?p=git/git.git\n        http://repo.or.cz/w/alt-git.git\n\nPreformatted documentation from the tip of the \"master\" branch can be\nfound in:\n\n        git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/\n        git://repo.or.cz/git-{htmldocs,manpages}.git/\n        https://code.google.com/p/git-{htmldocs,manpages}.git/\n        https://github.com/gitster/git-{htmldocs,manpages}.git/\n\nThere are four branches in git.git repository that track the source tree\nof git: \"master\", \"maint\", \"next\", and \"pu\".\n\nThe \"master\" branch is meant to contain what are very well tested and\nready to be used in a production setting.  Every now and then, a \"feature\nrelease\" is cut from the tip of this branch and they typically are named\nwith three dotted decimal digits.  The last such release was 1.7.9 done on\nJan 27, 2012. You can expect that the tip of the \"master\" branch is always\nmore stable than any of the released versions.\n\nWhenever a feature release is made, \"maint\" branch is forked off from\n\"master\" at that point.  Obvious, safe and urgent fixes after a feature\nrelease are applied to this branch and maintenance releases are cut from\nit.  The maintenance releases are named with four dotted decimal, named\nafter the feature release they are updates to; the last such release was\n1.7.8.4.  New features never go to this branch.  This branch is also\nmerged into \"master\" to propagate the fixes forward.\n\nA new development does not usually happen on \"master\". When you send a\nseries of patches, after review on the mailing list, a separate topic\nbranch is forked from the tip of \"master\" and your patches are queued\nthere, and kept out of \"master\" while people test it out. The quality of\ntopic branches are judged primarily by the mailing list discussions.\n\nTopic branches that are in good shape are merged to the \"next\" branch. In\ngeneral, the \"next\" branch always contains the tip of \"master\".  It might\nnot be quite rock-solid, but is expected to work more or less without major\nbreakage. The \"next\" branch is where new and exciting things take place. A\ntopic that is in \"next\" is expected to be polished to perfection before it\nis merged to \"master\".\n\nThe \"pu\" (proposed updates) branch bundles all the remaining topic\nbranches. The topics on the branch are not complete, well tested, nor well\ndocumented and need further work. When a topic that was in \"pu\" proves to\nbe in testable shape, it is merged to \"next\".\n\nYou can run \"git log --first-parent master..pu\" to see what topics are\ncurrently in flight.  Sometimes, an idea that looked promising turns out\nto be not so good and the topic can be dropped from \"pu\" in such a case.\n\nThe two branches \"master\" and \"maint\" are never rewound, and \"next\"\nusually will not be either.  After a feature release is made from\n\"master\", however, \"next\" will be rebuilt from the tip of \"master\"\nusing the topics that didn't make the cut in the feature release.\n\nNote that being in \"next\" is not a guarantee to appear in the next\nrelease, nor even in any future release.  There were cases that topics\nneeded reverting a few commits in them before graduating to \"master\",\nor a topic that already was in \"next\" was reverted from \"next\" because\nfatal flaws were found in it after it was merged.\n\n\n* Other people's trees, trusted lieutenants and credits.\n\nDocumentation/SubmittingPatches outlines to whom your proposed changes\nshould be sent.  As described in contrib/README, I would delegate fixes\nand enhancements in contrib/ area to the primary contributors of them.\n\nAlthough the following are included in git.git repository, they have their\nown authoritative repository and maintainers:\n\n - git-gui/ comes from git-gui project, maintained by Pat Thoyts:\n\n        git://repo.or.cz/git-gui.git\n\n - gitk-git/ comes from Paul Mackerras's gitk project:\n\n        git://git.kernel.org/pub/scm/gitk/gitk.git\n\nI would like to thank everybody who helped to raise git into the current\nshape.  Especially I would like to thank the git list regulars whose help\nI have relied on and expect to continue relying on heavily:\n\n - Linus Torvalds, Shawn Pearce, Johannes Schindelin, Nicolas Pitre,\n   René Scharfe, Jeff King, Jonathan Nieder, Johan Herland, Johannes\n   Sixt, Sverre Rabbelier, Michael J Gruber, Nguyễn Thái Ngọc Duy,\n   Ævar Arnfjörð Bjarmason and Thomas Rast on general design and\n   implementation issues and reviews on the mailing list.\n\n - Shawn and Nicolas Pitre on pack issues.\n\n - Martin Langhoff, Frank Lichtenheld and Ævar Arnfjörð Bjarmason on\n   cvsserver and cvsimport.\n\n - Paul Mackerras on gitk.\n\n - Eric Wong, David D. Kilzer and Sam Vilain on git-svn.\n\n - Simon Hausmann and Pete Wyckoff on git-p4.\n\n - Jakub Narebski, John Hawley, Petr Baudis, Luben Tuikov, Giuseppe Bilotta on\n   gitweb.\n\n - J. Bruce Fields, Jonathan Nieder, Michael J Gruber and Thomas Rast on\n   documentation (and countless others for proofreading and fixing).\n\n - Alexandre Julliard on Emacs integration.\n\n - David Aguilar and Charles Bailey for taking good care of git-mergetool\n   (and Theodore Ts'o for creating it in the first place) and git-difftool.\n\n - Johannes Schindelin, Johannes Sixt, Erik Faye-Lund, Pat Thoyts and others\n   for their effort to move things forward on the Windows front.\n\n - People on non-Linux platforms for keeping their eyes on portability;\n   especially, Randal Schwartz, Theodore Ts'o, Jason Riedy, Thomas Glanzmann,\n   Brandon Casey, Jeff King, Alex Riesen and countless others.\n"},{"id":"183205","messageId":"7v7h0czur2.fsf@alter.siamese.dyndns.org","threadId":"29457","inReplyTo":"7vipjwzvc2.fsf@alter.siamese.dyndns.org","subject":"What's cooking in git.git (Jan 2012, #06; Fri, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-27T21:43:45Z","receivedAt":"2012-01-27T21:43:45Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed with '-' are\nonly in 'pu' (proposed updates) while commits prefixed with '+' are in\n'next'.\n\nNow 1.7.9 is out, the development cycle for 1.7.10 will start shortly.\n\nHere are the repositories that have my integration branches:\n\nWith maint, master, next, pu, todo:\n\n        git://git.kernel.org/pub/scm/git/git.git\n        git://repo.or.cz/alt-git.git\n        https://code.google.com/p/git-core/\n        https://github.com/git/git\n\nWith only maint and master:\n\n        git://git.sourceforge.jp/gitroot/git-core/git.git\n        git://git-core.git.sourceforge.net/gitroot/git-core/git-core\n\nWith all the topics and integration branches:\n\n        https://github.com/gitster/git\n\nThe preformatted documentation in HTML and man format are found in:\n\n        git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/\n        git://repo.or.cz/git-{htmldocs,manpages}.git/\n        https://code.google.com/p/git-{htmldocs,manpages}.git/\n        https://github.com/gitster/git-{htmldocs,manpages}.git/\n\n--------------------------------------------------\n[New Topics]\n\n* jl/submodule-re-add (2012-01-24) 1 commit\n  (merged to 'next' on 2012-01-26 at 482553e)\n + submodule add: fix breakage when re-adding a deep submodule\n\nLow-impact fix to an old issue. \nWill merge early in the next cycle.\n\n* jn/svn-fe (2012-01-27) 44 commits\n - vcs-svn/svndiff.c: squelch false \"unused\" warning from gcc\n - Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe\n - vcs-svn: reset first_commit_done in fast_export_init\n - Merge branch 'db/text-delta' into svn-fe\n - vcs-svn: do not initialize report_buffer twice\n - Merge branch 'db/text-delta' into svn-fe\n - vcs-svn: avoid hangs from corrupt deltas\n - vcs-svn: guard against overflow when computing preimage length\n - Merge branch 'db/delta-applier' into db/text-delta\n - vcs-svn: implement text-delta handling\n - Merge branch 'db/delta-applier' into db/text-delta\n - Merge branch 'db/delta-applier' into svn-fe\n - vcs-svn: cap number of bytes read from sliding view\n - test-svn-fe: split off \"test-svn-fe -d\" into a separate function\n - vcs-svn: let deltas use data from preimage\n - vcs-svn: let deltas use data from postimage\n - vcs-svn: verify that deltas consume all inline data\n - vcs-svn: implement copyfrom_data delta instruction\n - vcs-svn: read instructions from deltas\n - vcs-svn: read inline data from deltas\n - vcs-svn: read the preimage when applying deltas\n - vcs-svn: parse svndiff0 window header\n - vcs-svn: skeleton of an svn delta parser\n - vcs-svn: make buffer_read_binary API more convenient\n - vcs-svn: learn to maintain a sliding view of a file\n - Makefile: list one vcs-svn/xdiff object or header per line\n - Merge branch 'db/svn-fe-code-purge' into svn-fe\n - vcs-svn: drop obj_pool\n - vcs-svn: drop treap\n - vcs-svn: drop string_pool\n - vcs-svn: pass paths through to fast-import\n - Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge\n - Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge\n - Merge branch 'db/vcs-svn-incremental' into svn-fe\n - vcs-svn: avoid using ls command twice\n - vcs-svn: use mark from previous import for parent commit\n - vcs-svn: handle filenames with dq correctly\n - vcs-svn: quote paths correctly for ls command\n - vcs-svn: eliminate repo_tree structure\n - vcs-svn: add a comment before each commit\n - vcs-svn: save marks for imported commits\n - vcs-svn: use higher mark numbers for blobs\n - vcs-svn: set up channel to read fast-import cat-blob response\n - Merge commit 'v1.7.5' into svn-fe\n\nWill merge early in the next cycle.\n\n--------------------------------------------------\n[Stalled]\n\n* jc/advise-push-default (2011-12-18) 1 commit\n - push: hint to use push.default=upstream when appropriate\n\nPeff had a good suggestion outlining an updated code structure so that\nsomebody new can try to dip his or her toes in the development. Any\ntakers?\n\nWaiting for a reroll.\n\n* mh/ref-api-rest (2011-12-12) 35 commits\n . repack_without_ref(): call clear_packed_ref_cache()\n . read_packed_refs(): keep track of the directory being worked in\n . is_refname_available(): query only possibly-conflicting references\n . refs: read loose references lazily\n . read_loose_refs(): take a (ref_entry *) as argument\n . struct ref_dir: store a reference to the enclosing ref_cache\n . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)\n . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)\n . add_entry(): take (ref_entry *) instead of (ref_dir *)\n . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)\n . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)\n . add_ref(): take (ref_entry *) instead of (ref_dir *)\n . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)\n . find_ref(): take (ref_entry *) instead of (ref_dir *)\n . is_refname_available(): take (ref_entry *) instead of (ref_dir *)\n . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)\n . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)\n . refs: wrap top-level ref_dirs in ref_entries\n . get_ref_dir(): keep track of the current ref_dir\n . do_for_each_ref(): only iterate over the subtree that was requested\n . refs: sort ref_dirs lazily\n . sort_ref_dir(): do not sort if already sorted\n . refs: store references hierarchically\n . refs.c: rename ref_array -> ref_dir\n . struct ref_entry: nest the value part in a union\n . check_refname_component(): return 0 for zero-length components\n . free_ref_entry(): new function\n . refs.c: reorder definitions more logically\n . is_refname_available(): reimplement using do_for_each_ref_in_array()\n . names_conflict(): simplify implementation\n . names_conflict(): new function, extracted from is_refname_available()\n . repack_without_ref(): reimplement using do_for_each_ref_in_array()\n . do_for_each_ref_in_arrays(): new function\n . do_for_each_ref_in_array(): new function\n . do_for_each_ref(): correctly terminate while processesing extra_refs\n\nI had to remove this temporarily out of 'pu' as I didn't want to deal with\nmerge conflicts with the mh/ref-clone-without-extra-refs topic that\nremoves yet another caller of add_extra_ref() that this series touches.\n\nWill defer till the next cycle.\n\n* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits\n - fixup! 15eaaf4\n - git-svn, perl/Git.pm: extend Git::prompt helper for querying users\n  (merged to 'next' on 2012-01-05 at 954f125)\n + perl/Git.pm: \"prompt\" helper to honor GIT_ASKPASS and SSH_ASKPASS\n\nThe bottom one has been replaced with a rewrite based on comments from\nÆvar. The second one needs more work, both in perl/Git.pm and prompt.c, to\ngive precedence to tty over SSH_ASKPASS when terminal is available.\n\nWill defer till the next cycle.\n\n* nd/commit-ignore-i-t-a (2012-01-16) 2 commits\n - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees\n - cache-tree: update API to take abitrary flags\n\nMay want to consider this as fixing an earlier UI mistake, and not as a\nfeature that devides the userbase.\n\nWill defer till the next cycle.\n\n--------------------------------------------------\n[Cooking]\n\n* jc/split-blob (2012-01-24) 6 commits\n - chunked-object: streaming checkout\n - chunked-object: fallback checkout codepaths\n - bulk-checkin: support chunked-object encoding\n - bulk-checkin: allow the same data to be multiply hashed\n - new representation types in the packstream\n - varint-in-pack: refactor varint encoding/decoding\n\nNot ready.\n\nI finished the streaming checkout codepath, but as explained in 127b177\n(bulk-checkin: support chunked-object encoding, 2011-11-30), these are\nstill early steps of a long and painful journey. At least pack-objects and\nfsck need to learn the new encoding for the series to be usable locally,\nand then index-pack/unpack-objects needs to learn it to be used remotely.\n\nGiven that I heard a lot of noise that people want large files, and that I\nwas asked by somebody at GitTogether'11 privately for an advice on how to\npay developers (not me) to help adding necessary support, I am somewhat\ndissapointed that the original patch series that was sent almost two\nmonths ago still remains here without much comments and updates from the\ndeveloper community. I even made the interface to the logic that decides\nwhere to split chunks easily replaceable, and I deliberately made the\nlogic in the original patch extremely stupid to entice others, especially\nthe \"bup\" fanboys, to come up with a better logic, thinking that giving\npeople an easy target to shoot for, they may be encouraged to help\nout. The plan is not working :-(.\n\n* jl/test-pause (2012-01-17) 1 commit\n  (merged to 'next' on 2012-01-20 at ee56335)\n + test-lib: add the test_pause convenience function\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* mh/ref-clone-without-extra-refs (2012-01-17) 4 commits\n  (merged to 'next' on 2012-01-20 at 2e9645e)\n + write_remote_refs(): create packed (rather than extra) refs\n + add_packed_ref(): new function in the refs API.\n + ref_array: keep track of whether references are sorted\n + pack_refs(): remove redundant check\n\nLooked reasonable; will hopefully help making mh/ref-api-rest simpler and\ncleaner.\n\nWill merge early in the next cycle.\n\n* mm/zsh-completion-regression-fix (2012-01-17) 1 commit\n  (merged to 'next' on 2012-01-23 at 7bc2e0a)\n + bash-completion: don't add quoted space for ZSH (fix regression)\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* ar/i18n-no-gettext (2012-01-27) 4 commits\n  (merged to 'next' on 2012-01-27 at 0ecf258)\n + i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT\n  (merged to 'next' on 2012-01-23 at 694a94e)\n + i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n\n + add a Makefile switch to avoid gettext translation in shell scripts\n + git-sh-i18n: restructure the logic to compute gettext.sh scheme\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* da/maint-mergetool-twoway (2012-01-23) 1 commit\n  (merged to 'next' on 2012-01-23 at f927323)\n + mergetool: Provide an empty file when needed\n\nCaters to GUI merge backends that cannot merge two files without\na base by giving them an empty file as a \"pretend\" common ancestor.\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* jc/maint-log-first-parent-pathspec (2012-01-19) 1 commit\n  (merged to 'next' on 2012-01-20 at fb2b35f)\n + Making pathspec limited log play nicer with --first-parent\n\nA bugfix.\nWill merge early in the next cycle.\n\n* ld/git-p4-branches-and-labels (2012-01-20) 5 commits\n  (merged to 'next' on 2012-01-23 at 9020ec4)\n + git-p4: label import fails with multiple labels at the same changelist\n + git-p4: add test for p4 labels\n + git-p4: importing labels should cope with missing owner\n + git-p4: cope with labels with empty descriptions\n + git-p4: handle p4 branches and labels containing shell chars\n (this branch is used by va/git-p4-branch.)\n\nWill merge early in the next cycle.\n\n* va/git-p4-branch (2012-01-26) 4 commits\n  (merged to 'next' on 2012-01-26 at e67c52a)\n + t9801: do not overuse test_must_fail\n + git-p4: Change p4 command invocation\n + git-p4: Add test case for complex branch import\n + git-p4: Search for parent commit on branch creation\n (this branch uses ld/git-p4-branches-and-labels.)\n\nRerolled and Acked.\nWill merge early in the next cycle.\n\n* sp/smart-http-failure-to-push (2012-01-20) 1 commit\n  (merged to 'next' on 2012-01-20 at a892434)\n + remote-curl: Fix push status report when all branches fail\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* ks/sort-wildcard-in-makefile (2012-01-22) 1 commit\n  (merged to 'next' on 2012-01-23 at e2e0c1d)\n + t/Makefile: Use $(sort ...) explicitly where needed\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* tr/grep-l-with-decoration (2012-01-23) 1 commit\n  (merged to 'next' on 2012-01-23 at 42b8795)\n + grep: fix -l/-L interaction with decoration lines\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* jc/pull-signed-tag (2012-01-23) 1 commit\n  (merged to 'next' on 2012-01-23 at 4257553)\n + merge: use editor by default in interactive sessions\n\nPer Linus's strong suggestion, sugarcoated (aka \"taking blame for the\noriginal UI screw-ups\") so that it is easier for me to swallow and accept\na potentially huge backward incompatibility issue, \"git merge\" is made to\nlaunch an editor to explain the merge in the merge commit by default in\ninteractive sessions.\n\nI've updated the special-case environment variable to MERGE_AUTOEDIT that\nscripts can set to \"no\" when they start. There is no plan to encourage\nhumans to keep using the historical behaviour, hence there is no support\nfor configuration variable (e.g. merge.autoedit) that can be set to 'no'.\nOh, also I updated the documentation a bit.\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit\n  (merged to 'next' on 2012-01-20 at acb5611)\n + Fix incorrect ref namespace check\n\nAvoid getting confused by \"ref/headxxx\" and mistaking it as if it is under\nthe \"refs/heads/\" hierarchy.\nWill merge early in the next cycle.\n\n* jc/advise-i18n (2011-12-22) 1 commit\n  (merged to 'next' on 2012-01-23 at 6447013)\n + i18n of multi-line advice messages\n\nAllow localization of advice messages that tend to be longer and\nmulti-line formatted. For now this is deliberately limited to advise()\ninterface and not vreportf() in general as touching the latter has\ninteractions with error() that has plumbing callers whose prefix \"error: \"\nshould never be translated.\n\nWill merge early in the next cycle.\n\n* rr/sequencer (2012-01-11) 2 commits\n  (merged to 'next' on 2012-01-23 at f349b56)\n + sequencer: factor code out of revert builtin\n + revert: prepare to move replay_action to header\n\nMoving large chunk of code out of cherry-pick/revert for later reuse,\nprimarily to prepare for the next cycle.\n\nWill merge early in the next cycle.\n\n* tr/maint-mailinfo (2012-01-16) 2 commits\n  (merged to 'next' on 2012-01-20 at 278fae1)\n + mailinfo: with -b, keep space after [foo]\n + am: learn passing -b to mailinfo\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* pw/p4-view-updates (2012-01-11) 5 commits\n  (merged to 'next' on 2012-01-20 at 8ca2c7b)\n + git-p4: add tests demonstrating spec overlay ambiguities\n + git-p4: adjust test to adhere to stricter useClientSpec\n + git-p4: clarify comment\n + git-p4: fix verbose comment typo\n + git-p4: only a single ... wildcard is supported\n\nWill merge early in the next cycle.\n\n* rs/diff-postimage-in-context (2012-01-06) 1 commit\n  (merged to 'next' on 2012-01-09 at 9635032)\n + xdiff: print post-image for common records instead of pre-image\n\nLooked reasonable.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* cb/push-quiet (2012-01-08) 3 commits\n  (merged to 'next' on 2012-01-20 at 4326dda)\n + t5541: avoid TAP test miscounting\n + fix push --quiet: add 'quiet' capability to receive-pack\n + server_supports(): parse feature list more carefully\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* nd/clone-detached (2012-01-24) 12 commits\n  (merged to 'next' on 2012-01-26 at 7b0cc8a)\n + clone: fix up delay cloning conditions\n  (merged to 'next' on 2012-01-23 at bee31c6)\n + push: do not let configured foreign-vcs permanently clobbered\n  (merged to 'next' on 2012-01-23 at 9cab64e)\n + clone: print advice on checking out detached HEAD\n + clone: allow --branch to take a tag\n + clone: refuse to clone if --branch points to bogus ref\n + clone: --branch=<branch> always means refs/heads/<branch>\n + clone: delay cloning until after remote HEAD checking\n + clone: factor out remote ref writing\n + clone: factor out HEAD update code\n + clone: factor out checkout code\n + clone: write detached HEAD in bare repositories\n + t5601: add missing && cascade\n (this branch uses nd/clone-single-branch.)\n\nApplied two band-aids to a corner-case regression.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* nd/clone-single-branch (2012-01-08) 1 commit\n  (merged to 'next' on 2012-01-09 at 6c3c759)\n + clone: add --single-branch to fetch only one branch\n (this branch is used by nd/clone-detached.)\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* jn/gitweb-unspecified-action (2012-01-09) 1 commit\n  (merged to 'next' on 2012-01-20 at 2b31714)\n + gitweb: Fix actionless dispatch for non-existent objects\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* nd/index-pack-no-recurse (2012-01-16) 3 commits\n  (merged to 'next' on 2012-01-20 at d1e964e)\n + index-pack: eliminate unlimited recursion in get_base_data()\n + index-pack: eliminate recursion in find_unresolved_deltas\n + Eliminate recursion in setting/clearing marks in commit list\n\nMuch better explained than the previous round.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* cb/git-daemon-tests (2012-01-08) 5 commits\n  (merged to 'next' on 2012-01-08 at 1db8351)\n + git-daemon tests: wait until daemon is ready\n + git-daemon: produce output when ready\n + git-daemon: add tests\n + dashed externals: kill children on exit\n + run-command: optionally kill children on exit\n\nWill merge early in the next cycle.\n\n* jk/parse-object-cached (2012-01-06) 3 commits\n  (merged to 'next' on 2012-01-08 at 8c6fa4a)\n + upload-pack: avoid parsing tag destinations\n + upload-pack: avoid parsing objects during ref advertisement\n + parse_object: try internal cache before reading object db\n\nThese are a bit scary changes, but I do think they are worth doing.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n"},{"id":"183216","messageId":"7vfwf0xu8a.fsf@alter.siamese.dyndns.org","threadId":"29457","inReplyTo":"7v7h0czur2.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jan 2012, #06; Fri, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-28T05:37:57Z","receivedAt":"2012-01-28T05:37:57Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> * mm/zsh-completion-regression-fix (2012-01-17) 1 commit\n>   (merged to 'next' on 2012-01-23 at 7bc2e0a)\n>  + bash-completion: don't add quoted space for ZSH (fix regression)\n>\n> Will merge early in the next cycle and deal with any fallout in 'master'.\n\nThis topic has been superseded by Felipe's f15026b (git-completion:\nworkaround zsh COMPREPLY bug, 2012-01-25) to use \"typeset -h IFS\", so I\nshould drop this.\n\nAm I mistaken?\n"},{"id":"183224","messageId":"CAMP44s0FBm3_P--wykHRXROSQLFgmDeVwr2cyEgk33QBfYbdSA@mail.gmail.com","threadId":"29457","inReplyTo":"7vfwf0xu8a.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jan 2012, #06; Fri, 27)","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-01-28T17:23:29Z","receivedAt":"2012-01-28T17:23:29Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sat, Jan 28, 2012 at 7:37 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> Junio C Hamano <gitster@pobox.com> writes:\n>\n>> * mm/zsh-completion-regression-fix (2012-01-17) 1 commit\n>>   (merged to 'next' on 2012-01-23 at 7bc2e0a)\n>>  + bash-completion: don't add quoted space for ZSH (fix regression)\n>>\n>> Will merge early in the next cycle and deal with any fallout in 'master'.\n>\n> This topic has been superseded by Felipe's f15026b (git-completion:\n> workaround zsh COMPREPLY bug, 2012-01-25) to use \"typeset -h IFS\", so I\n> should drop this.\n>\n> Am I mistaken?\n\nThat's correct.\n\n-- \nFelipe Contreras\n"},{"id":"183293","messageId":"vpq62ftd1bj.fsf@bauges.imag.fr","threadId":"29457","inReplyTo":"CAMP44s0FBm3_P--wykHRXROSQLFgmDeVwr2cyEgk33QBfYbdSA@mail.gmail.com","subject":"Re: What's cooking in git.git (Jan 2012, #06; Fri, 27)","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2012-01-30T08:47:12Z","receivedAt":"2012-01-30T08:47:12Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Felipe Contreras <felipe.contreras@gmail.com> writes:\n\n> On Sat, Jan 28, 2012 at 7:37 AM, Junio C Hamano <gitster@pobox.com> wrote:\n>> Junio C Hamano <gitster@pobox.com> writes:\n>>\n>>> * mm/zsh-completion-regression-fix (2012-01-17) 1 commit\n>>>   (merged to 'next' on 2012-01-23 at 7bc2e0a)\n>>>  + bash-completion: don't add quoted space for ZSH (fix regression)\n>>>\n>>> Will merge early in the next cycle and deal with any fallout in 'master'.\n>>\n>> This topic has been superseded by Felipe's f15026b (git-completion:\n>> workaround zsh COMPREPLY bug, 2012-01-25) to use \"typeset -h IFS\", so I\n>> should drop this.\n>>\n>> Am I mistaken?\n>\n> That's correct.\n\nYes. You can drop my version.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"183665","messageId":"m3y5slark1.fsf@localhost.localdomain","threadId":"29457","inReplyTo":"7vipjwzvc2.fsf@alter.siamese.dyndns.org","subject":"Re: [ANNOUNCE] Git 1.7.9","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2012-02-02T20:50:14Z","receivedAt":"2012-02-02T20:50:14Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> The latest feature release Git 1.7.9 is now available at the usual\n> places.\n> \n> The release tarballs are found at:\n> \n>     http://code.google.com/p/git-core/downloads/list\n> \n> and their SHA-1 checksums are:\n> \n> ed51ef5ef250daaa6e98515cf2641820cd268d4c  git-1.7.9.tar.gz\n> c7b1fa20dc501beb2cb5091dd24dbfd2a0013a0c  git-htmldocs-1.7.9.tar.gz\n> 1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a  git-manpages-1.7.9.tar.gz\n\nWhen trying to rebuild RPM out of tarball with\n\n  $ rpmbuild -tb git-1.7.9.tar.gz\n\nI get the following error at the end of build phase:\n\n RPM build errors:\n     Installed (but unpackaged) file(s) found:\n    /usr/share/locale/is/LC_MESSAGES/git.mo\n\nShouldn't this file be put in git package, or in separate \ngit-i18n-is / git-i18n-Icelandic RPM package?\n\n-- \nJakub Narebski\n"},{"id":"183714","messageId":"201202031352.10279.jnareb@gmail.com","threadId":"29457","inReplyTo":"CAPc5daVhXQ3-TCqZi8di=j5LdpwXZUt3bO8KkvA2UmL6axCRqQ@mail.gmail.com","subject":"Re: [ANNOUNCE] Git 1.7.9","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2012-02-03T12:52:09Z","receivedAt":"2012-02-03T12:52:09Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Fri, 3 Feb 2012, Junio C Hamano wrote:\n> On Thu, Feb 2, 2012 at 12:50 PM, Jakub Narebski <jnareb@gmail.com> wrote:\n> \n> > When trying to rebuild RPM out of tarball with\n> >\n> >  $ rpmbuild -tb git-1.7.9.tar.gz\n> >\n> > I get the following error at the end of build phase:\n> >\n> >  RPM build errors:\n> >     Installed (but unpackaged) file(s) found:\n> >    /usr/share/locale/is/LC_MESSAGES/git.mo\n> >\n> \n> I think it should be simply ignored at least for now.  I stopped touching\n> the rpm spec since August last year (the only reason I was running rpmbuild\n> was to install them on k.org), so I didn't notice.\n\nSo for the time being something like that would be an acceptable fix?\n \ndiff --git a/git.spec b/git.spec\nindex 8ceb42b..5461b0b 100644\n--- a/git.spec\n+++ b/git.spec\n@@ -134,6 +134,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'\n %else\n rm -rf $RPM_BUILD_ROOT%{_mandir}\n %endif\n+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale\n \n mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d\n install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git\n\n\n-- \nJakub Narebski\nPoland\n"},{"id":"183751","messageId":"7vehubpuv7.fsf@alter.siamese.dyndns.org","threadId":"29457","inReplyTo":"201202031352.10279.jnareb@gmail.com","subject":"Re: [ANNOUNCE] Git 1.7.9","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-03T19:41:48Z","receivedAt":"2012-02-03T19:41:48Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n>> >  RPM build errors:\n>> >     Installed (but unpackaged) file(s) found:\n>> >    /usr/share/locale/is/LC_MESSAGES/git.mo\n>> >\n>> \n>> I think it should be simply ignored at least for now.  I stopped touching\n>> the rpm spec since August last year (the only reason I was running rpmbuild\n>> was to install them on k.org), so I didn't notice.\n>\n> So for the time being something like that would be an acceptable fix?\n\nExcept that the patch probably wants to go to git.spec.in, removing that\ninstallation target would be a good local workaround for now.\n\nI said \"local workaround\", meaning that I am not all that interested in\napplying such a patch myself.  Somebody who wants to do RPM needs to\ndecide what subpackage(s) it should go before we start accepting more po/\nfiles, and at that time the workaround needs to be reverted.\n\nAnd hopefully that should happen soonish ;-)\n"},{"id":"183759","messageId":"201202032155.26532.jnareb@gmail.com","threadId":"29457","inReplyTo":"7vehubpuv7.fsf@alter.siamese.dyndns.org","subject":"Re: [ANNOUNCE] Git 1.7.9","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2012-02-03T20:55:25Z","receivedAt":"2012-02-03T20:55:25Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Fri, 3 Feb 2012, Junio C Hamano wrote:\n> Jakub Narebski <jnareb@gmail.com> writes:\n\n>>>>  RPM build errors:\n>>>>     Installed (but unpackaged) file(s) found:\n>>>>    /usr/share/locale/is/LC_MESSAGES/git.mo\n>>>>\n>>> \n>>> I think it should be simply ignored at least for now.  I stopped touching\n>>> the rpm spec since August last year (the only reason I was running rpmbuild\n>>> was to install them on k.org), so I didn't notice.\n>>\n>> So for the time being something like that would be an acceptable fix?\n> \n> Except that the patch probably wants to go to git.spec.in, removing that\n> installation target would be a good local workaround for now.\n\nO.K., will do.\n\nAnyway this change makes rpmbuild process complete.\n \n> I said \"local workaround\", meaning that I am not all that interested in\n> applying such a patch myself.  Somebody who wants to do RPM needs to\n> decide what subpackage(s) it should go before we start accepting more po/\n> files, and at that time the workaround needs to be reverted.\n> \n> And hopefully that should happen soonish ;-)\n\nThe git-i18n-Icelandic proposal for /usr/share/locale/is/LC_MESSAGES/git.mo\nfollow the KDE pattern (e.g. kde-i18n-Polish).  This might be a place for\ntranslated manpages and other documentation, if there is any.\n\nOn the other hand all translations for gitk are in gitk package\n(as /usr/share/gitk/lib/msgs/*.msg, not /usr/share/locale/*/LC_MESSAGES/git.mo)\nSame for git-gui.\n\n-- \nJakub Narebski\nPoland\n"},{"id":"183766","messageId":"201202032249.07594.jnareb@gmail.com","threadId":"29457","inReplyTo":"201202032155.26532.jnareb@gmail.com","subject":"[PATCH] git.spec: Workaround localized messages not put in any RPM","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2012-02-03T21:49:07Z","receivedAt":"2012-02-03T21:49:07Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Currently building git RPM from tarball results in the following\nerror:\n\n  RPM build errors:\n     Installed (but unpackaged) file(s) found:\n     /usr/share/locale/is/LC_MESSAGES/git.mo\n\nThis is caused by the fact that localized messages do not have their\nplace in some RPM package.  Let's postpone decision where they should\nbe put (be it git-i18n-Icelandic, or git-i18n, or git package itself)\nfor later by removing locale files at the end of install phase.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n git.spec.in |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/git.spec.in b/git.spec.in\nindex c562c62..b93df10 100644\n--- a/git.spec.in\n+++ b/git.spec.in\n@@ -134,6 +134,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'\n %else\n rm -rf $RPM_BUILD_ROOT%{_mandir}\n %endif\n+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale\n \n mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d\n install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git\n-- \n1.7.9\n"}]}