{"thread":{"id":"26627","subject":"What's cooking in git.git (Feb 2011, #07; Mon, 28)","startedAt":"2011-03-01T01:05:32Z","lastAt":"2011-03-05T17:04:26Z","messageCount":8,"participants":["Junio C Hamano","Jens Lehmann","Erik Faye-Lund","Johannes Sixt","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"162501","messageId":"7vbp1vfy5f.fsf@alter.siamese.dyndns.org","threadId":"26627","inReplyTo":null,"subject":"What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-01T01:05:32Z","receivedAt":"2011-03-01T01:05:32Z","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' while commits prefixed with '+' are in 'next'.\n\nI started draft release notes for 1.7.5 on 'master' branch.\n\n--------------------------------------------------\n[New Topics]\n\n* jc/diff-irreversible-delete (2011-02-28) 1 commit\n - git diff -D: omit the preimage of deletes\n\nJust a POC.\n\n* jc/index-pack (2011-02-25) 5 commits\n - index-pack --verify: read anomalous offsets from v2 idx file\n - write_idx_file: need_large_offset() helper function\n - index-pack: --verify\n - write_idx_file: introduce a struct to hold idx customization options\n - index-pack: group the delta-base array entries also by type\n\nStill a WIP.\n\n* mm/push-default-advice (2011-02-28) 2 commits\n - push: better error messages for detached HEAD and \"no destination\"\n - push: better error message when push.default = tracking\n\nThere were some rewording discussion I didn't roll into this, not because\nI had objections to, but because I was handling other topics.  I expect\nI'll see a reroll soonish so that we can merge this down soonish.\n\n* sp/maint-fd-limit (2011-02-28) 2 commits\n - mingw: add minimum getrlimit() compatibility stub\n - Limit file descriptors used by packs\n\nErik, please check the made-up commit log message and sign it off.\nWill merge to 'next' after that.\n\n* uk/ls-remote-in-get-remote-url (2011-02-28) 1 commit\n - get_remote_url(): use the same data source as ls-remote to get remote urls\n\nWill merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\n\n* jh/merge-sans-branch (2011-02-10) 4 commits\n . merge: add support for merging from upstream by default\n - merge: introduce per-branch-configuration helper function\n - merge: introduce setup_merge_commit helper function\n - merge: update the usage information to be more modern\n\nThere was an objection to the tip one that determines the upstream in a\nwrong way?\n\n* jc/complete-symmetric-diff (2011-02-23) 1 commit\n - completion: complete \"git diff ...branc<TAB>\"\n\nIt was pointed out that this would regress diffing two blobs,\nusing <tree>:<path> syntax.\n\n* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit\n - Look for password in both CVS and CVSNT password files.\n\nIt seems that we need separate parsers for these two formats in order not\nto regress the users of the original cvs.\n\n* jk/tag-contains (2010-07-05) 4 commits\n - Why is \"git tag --contains\" so slow?\n - default core.clockskew variable to one day\n - limit \"contains\" traversals based on commit timestamp\n - tag: speed up --contains calculation\n\nThe idea of the bottom one is probably Ok, except that the use of object\nflags needs to be rethought, or at least the helper needs to be moved to\nbuiltin/tag.c to make it clear that it should not be used outside the\ncurrent usage context.\n\n* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits\n . diffcore-rename: fall back to -C when -C -C busts the rename limit\n . diffcore-rename: record filepair for rename src\n . diffcore-rename: refactor \"too many candidates\" logic\n\nSomebody said that this is an expensive no-op?\n\n--------------------------------------------------\n[Cooking]\n\n* jn/maint-commit-missing-template (2011-02-25) 1 commit\n  (merged to 'next' on 2011-02-25 at c95589d)\n + commit: error out for missing commit message template\n\n* mg/maint-difftool-vim-readonly (2011-02-25) 1 commit\n  (merged to 'next' on 2011-02-25 at 990579c)\n + mergetool-lib: call vim in readonly mode for diffs\n\n* fk/maint-cvsimport-early-failure (2011-01-31) 1 commit\n - git-cvsimport.perl: Bail out right away when reading from the server fails\n\n* jk/strbuf-vaddf (2011-02-25) 2 commits\n - strbuf: add strbuf_vaddf\n - compat: provide a fallback va_copy definition\n (this branch is used by ab/i18n-st, jk/trace-sifter and jn/status-translatable.)\n\n* jk/trace-sifter (2011-02-24) 6 commits\n - trace: give repo_setup trace its own key\n - add packet tracing debug code\n - trace: add trace_strbuf\n - trace: factor out \"do we want to trace\" logic\n - trace: refactor to support multiple env variables\n - trace: add trace_vprintf\n (this branch uses jk/strbuf-vaddf; is tangled with ab/i18n-st and jn/status-translatable.)\n\n* jn/maint-instaweb-plack-fix (2011-02-26) 1 commit\n - git-instaweb: Change how gitweb.psgi is made runnable as standalone app\n\n* jn/status-translatable (2011-02-25) 3 commits\n - commit, status: use status_printf{,_ln,_more} helpers\n - commit: refer to commit template as s->fp\n - wt-status: add helpers for printing wt-status lines\n (this branch is used by ab/i18n-st and ab/i18n-st; uses jk/strbuf-vaddf; is tangled with jk/trace-sifter.)\n\n* mh/p4 (2011-02-25) 1 commit\n  (merged to 'next' on 2011-02-26 at 1693331)\n + git-p4 submit: prevent 'Jobs' section from being removed from p4 change log\n\n* nd/rfc-add-u-full-tree (2011-02-07) 1 commit\n - add: make \"add -u\" update full tree without pathspec\n\n* ss/git-gui-mergetool (2011-02-26) 2 commits\n - mergetool--lib: Add Beyond Compare 3 as a tool\n - mergetool--lib: Sort tools alphabetically for easier lookup\n\n* ss/mergetool--lib (2011-02-27) 2 commits\n - mergetool--lib: Add Beyond Compare 3 as a tool\n - mergetool--lib: Sort tools alphabetically for easier lookup\n\nWill merge to 'next'.\n\n* nd/index-doc (2010-09-06) 1 commit\n - doc: technical details about the index file format\n\nI'll try to find time to fill in the details.\n\n* ab/i18n-st (2011-02-22) 74 commits\n - i18n: git-shortlog basic messages\n - i18n: git-revert split up \"could not revert/apply\" message\n - i18n: git-revert literal \"me\" messages\n - i18n: git-revert \"Your local changes\" message\n - i18n: git-revert basic messages\n - i18n: git-notes GIT_NOTES_REWRITE_MODE error message\n - i18n: git-notes basic commands\n - i18n: git-gc \"Auto packing the repository\" message\n - i18n: git-gc basic messages\n - i18n: git-describe basic messages\n - i18n: git-clean clean.requireForce messages\n - i18n: git-clean basic messages\n - i18n: git-bundle basic messages\n - i18n: git-archive basic messages\n - i18n: git-status \"renamed: \" message\n - i18n: git-status \"Initial commit\" message\n - i18n: git-status \"Changes to be committed\" message\n - i18n: git-status shortstatus messages\n - i18n: git-status \"nothing to commit\" messages\n - i18n: git-status basic messages\n - i18n: git-push \"prevent you from losing\" message\n - i18n: git-push basic messages\n - i18n: git-tag tag_template message\n - i18n: git-tag basic messages\n - i18n: git-reset \"Unstaged changes after reset\" message\n - i18n: git-reset reset_type_names messages\n - i18n: git-reset basic messages\n - i18n: git-rm basic messages\n - i18n: git-mv \"bad\" messages\n - i18n: git-mv basic messages\n - i18n: git-merge \"Wonderful\" message\n - i18n: git-merge \"You have not concluded your merge\" messages\n - i18n: git-merge \"Updating %s..%s\" message\n - i18n: git-merge basic messages\n - i18n: git-log \"--OPT does not make sense\" messages\n - i18n: git-log basic messages\n - i18n: git-grep \"--open-files-in-pager\" message\n - i18n: git-grep basic messages\n - i18n: git-fetch split up \"(non-fast-forward)\" message\n - i18n: git-fetch update_local_ref messages\n - i18n: git-fetch formatting messages\n - i18n: git-fetch basic messages\n - i18n: git-diff basic messages\n - i18n: git-commit advice messages\n - i18n: git-commit \"enter the commit message\" message\n - i18n: git-commit print_summary messages\n - i18n: git-commit formatting messages\n - i18n: git-commit \"middle of a merge\" message\n - i18n: git-commit basic messages\n - i18n: git-checkout \"Switched to a .. branch\" message\n - i18n: git-checkout \"HEAD is now at\" message\n - i18n: git-checkout describe_detached_head messages\n - i18n: git-checkout: our/their version message\n - i18n: git-checkout basic messages\n - i18n: git-branch \"(no branch)\" message\n - i18n: git-branch \"git branch -v\" messages\n - i18n: git-branch \"Deleted branch [...]\" message\n - i18n: git-branch \"remote branch '%s' not found\" message\n - i18n: git-branch basic messages\n - i18n: git-add \"Unstaged changes\" message\n - i18n: git-add \"remove '%s'\" message\n - i18n: git-add \"did not match any files\" message\n - i18n: git-add \"The following paths are ignored\" message\n - i18n: git-add basic messages\n - i18n: git-clone \"Cloning into\" message\n - i18n: git-clone \"Cloning into\" message\n - i18n: git-clone basic messages\n - i18n: git-init \"Initialized [...] repository\" message\n - i18n: git-init basic messages\n - i18n: \"make distclean\" should clean up after \"make pot\"\n - i18n: Makefile: \"pot\" target to extract messages marked for translation\n - i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set\n - i18n: add GETTEXT_POISON to simulate unfriendly translator\n - i18n: add no-op _() and N_() wrappers\n (this branch uses jk/strbuf-vaddf, jn/status-translatable and jn/status-translatable; is tangled with jk/trace-sifter.)\n\nRebased on other infrastructure adjustments (tentatively renamed the\nbranch).  I'd like to fast-track the basics (especially the bottom 3\npatches), and am even tempted to rebase other patches on 'pu' that are not\nyet in 'next' on top of them, to make the transition easier.\n\nUnless there is something glaringly wrong, I'd merge up to 9018b8a (i18n:\ngit-clone \"Cloning into\" message) to 'next' soonish, possibly rebasing\nother 'pu'-only topics on top of that commit.\n\n* jc/checkout-orphan-warning (2011-02-18) 1 commit\n - commit: give final warning when reattaching HEAD to leave commits behind\n\n* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit\n - branch/checkout --track: Ensure that upstream branch is indeed a branch\n\nWill merge to 'next'.\n\n* jk/diffstat-binary (2011-02-19) 2 commits\n  (merged to 'next' on 2011-02-23 at 49da967)\n + diff: don't retrieve binary blobs for diffstat\n + diff: handle diffstat of rewritten binary files\n\n* jk/fail-null-clone (2011-02-17) 1 commit\n  (merged to 'next' on 2011-02-23 at a4217f5)\n + clone: die when trying to clone missing local path\n\n* jk/merge-rename-ux (2011-02-20) 6 commits\n - pull: propagate --progress to merge\n - merge: enable progress reporting for rename detection\n - add inexact rename detection progress infrastructure\n - commit: stop setting rename limit\n - bump rename limit defaults (again)\n - merge: improve inexact rename limit warning\n\nWill merge to 'next'.\n\n* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit\n  (merged to 'next' on 2011-02-23 at d754139)\n + tests: skip terminal output tests on OS X\n\n* js/cherry-pick-usability (2011-02-19) 4 commits\n  (merged to 'next' on 2011-02-23 at 95db30e)\n + Teach commit about CHERRY_PICK_HEAD\n + bash: teach __git_ps1 about CHERRY_PICK_HEAD\n + Introduce CHERRY_PICK_HEAD\n + t3507: introduce pristine-detach helper\n\n* lt/rename-no-extra-copy-detection (2011-02-18) 3 commits\n  (merged to 'next' on 2011-02-23 at 2c1f271)\n + diffcore-rename: improve estimate_similarity() heuristics\n + diffcore-rename: properly honor the difference between -M and -C\n + for_each_hash: allow passing a 'void *data' pointer to callback\n\n* mg/rev-list-one-side-only (2011-02-22) 6 commits\n - t6007: test rev-list --cherry\n - log --cherry: a synonym\n - rev-list: --left/right-only are mutually exclusive\n - rev-list: documentation and test for --left/right-only\n - t6007: Make sure we test --cherry-pick\n - revlist.c: introduce --left/right-only for unsymmetric picking\n\nWill merge to 'next'; somebody may want to try losing many lines from\nformat-patch before it hits 'master', though.  Hint, hint...\n\n* so/submodule-no-update-first-time (2011-02-17) 2 commits\n  (merged to 'next' on 2011-02-23 at 2c6e8c9)\n + t7406: \"git submodule update {--merge|--rebase]\" with new submodules\n + submodule: no [--merge|--rebase] when newly cloned\n\n* jh/submodule-fetch-on-demand (2011-02-23) 6 commits\n - submodule update: Don't fetch when the submodule commit is already present\n - fetch/pull: Don't recurse into a submodule when commits are already present\n - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option\n - config: teach the fetch.recurseSubmodules option the 'on-demand' value\n - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option\n - fetch/pull: recurse into submodules when necessary\n\nHow well has this been cooked?\n\n* jk/format-patch-multiline-header (2011-02-23) 3 commits\n - format-patch: rfc2047-encode newlines in headers\n - format-patch: wrap long header lines\n - strbuf: add fixed-length version of add_wrapped_text\n\nWill merge to 'next'.\n\n* js/checkout-untracked-symlink (2011-02-20) 2 commits\n  (merged to 'next' on 2011-02-23 at 52a35ce)\n + do not overwrite untracked symlinks\n + Demonstrate breakage: checkout overwrites untracked symlink with directory\n\n* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit\n  (merged to 'next' on 2011-02-23 at 58b03b1)\n + grep --no-index: honor pathspecs correctly\n\n* mz/rebase (2011-02-24) 33 commits\n  (merged to 'next' on 2011-02-25 at 52caa7a)\n + Makefile: do not install sourced rebase scripts\n  (merged to 'next' on 2011-02-22 at 3219155)\n + rebase: use @{upstream} if no upstream specified\n + rebase -i: remove unnecessary state rebase-root\n + rebase -i: don't read unused variable preserve_merges\n + git-rebase--am: remove unnecessary --3way option\n + rebase -m: don't print exit code 2 when merge fails\n + rebase -m: remember allow_rerere_autoupdate option\n + rebase: remember strategy and strategy options\n + rebase: remember verbose option\n + rebase: extract code for writing basic state\n + rebase: factor out sub command handling\n + rebase: make -v a tiny bit more verbose\n + rebase -i: align variable names\n + rebase: show consistent conflict resolution hint\n + rebase: extract am code to new source file\n + rebase: extract merge code to new source file\n + rebase: remove $branch as synonym for $orig_head\n + rebase -i: support --stat\n + rebase: factor out call to pre-rebase hook\n + rebase: factor out clean work tree check\n + rebase: factor out reference parsing\n + rebase: reorder validation steps\n + rebase -i: remove now unnecessary directory checks\n + rebase: factor out command line option processing\n + rebase: align variable content\n + rebase: align variable names\n + rebase: stricter check of standalone sub command\n + rebase: act on command line outside parsing loop\n + rebase: improve detection of rebase in progress\n + rebase: remove unused rebase state 'prev_head'\n + rebase: read state outside loop\n + rebase: refactor reading of state\n + rebase: clearer names for directory variables\n\nMinor UI regression was reported but otherwise it looked like that the\ntopic is in a good shape.\n"},{"id":"162516","messageId":"4D6CA765.6000305@web.de","threadId":"26627","inReplyTo":"7vbp1vfy5f.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2011-03-01T07:59:33Z","receivedAt":"2011-03-01T07:59:33Z","isPatch":false,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 01.03.2011 02:05, schrieb Junio C Hamano:\n> * jh/submodule-fetch-on-demand (2011-02-23) 6 commits\n>  - submodule update: Don't fetch when the submodule commit is already present\n>  - fetch/pull: Don't recurse into a submodule when commits are already present\n>  - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option\n>  - config: teach the fetch.recurseSubmodules option the 'on-demand' value\n>  - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option\n>  - fetch/pull: recurse into submodules when necessary\n> \n> How well has this been cooked?\n\nI'm currently working on a v2 of this series.\n"},{"id":"162519","messageId":"AANLkTiksROE_dQTUn3Y_1Op6NDpGzEsSJ70JNYyYrufS@mail.gmail.com","threadId":"26627","inReplyTo":"7vbp1vfy5f.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2011-03-01T08:39:07Z","receivedAt":"2011-03-01T08:39:07Z","isPatch":false,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Tue, Mar 1, 2011 at 2:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> Here are the topics that have been cooking.  Commits prefixed with '-' are\n> only in 'pu' while commits prefixed with '+' are in 'next'.\n>\n> I started draft release notes for 1.7.5 on 'master' branch.\n>\n> --------------------------------------------------\n> [New Topics]\n>\n> * jc/diff-irreversible-delete (2011-02-28) 1 commit\n>  - git diff -D: omit the preimage of deletes\n>\n> Just a POC.\n>\n> * jc/index-pack (2011-02-25) 5 commits\n>  - index-pack --verify: read anomalous offsets from v2 idx file\n>  - write_idx_file: need_large_offset() helper function\n>  - index-pack: --verify\n>  - write_idx_file: introduce a struct to hold idx customization options\n>  - index-pack: group the delta-base array entries also by type\n>\n> Still a WIP.\n>\n> * mm/push-default-advice (2011-02-28) 2 commits\n>  - push: better error messages for detached HEAD and \"no destination\"\n>  - push: better error message when push.default = tracking\n>\n> There were some rewording discussion I didn't roll into this, not because\n> I had objections to, but because I was handling other topics.  I expect\n> I'll see a reroll soonish so that we can merge this down soonish.\n>\n> * sp/maint-fd-limit (2011-02-28) 2 commits\n>  - mingw: add minimum getrlimit() compatibility stub\n>  - Limit file descriptors used by packs\n>\n> Erik, please check the made-up commit log message and sign it off.\n> Will merge to 'next' after that.\n\nDo you have any hint on how I can create a repo with more than 2048\npacks so I can test that the patch works?\n\nIt builds just fine, perhaps that's enough? I guess Shawn already\ntested the other part...\n\nThe reason I'm a bit in doubt is the following comment (from MSDN):\n\n\"Note   This upper limit may be beyond what is supported by a\nparticular Win32 platform and configuration.\"\n\nBut searching a bit more, it seems that the rest of the world seems to\nthink 2048 is the correct maximum. I especially take comfort in\nreading that mysql (who keep a lot of open files) had their\nOS_FILE_LIMIT define set to 2048, and it seemed to work (apart from\nthe times they needed even more open files!). I also find that there's\na registry key called \"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\nNT\\CurrentVersion\\Windows\\USERProcessHandleQuota\", and this is\nprobably what they mean to warn about. I think consulting that would\nbe completely overkill, and probably not even practically possible\n(because the relationship between the maximum number of open files and\nthe maximum used handles isn't trivial).\n\nThere's also the added complication that _open_osfhandle also seems to\nbe limited by this 2048 limit (see the third comment here:\nhttp://bugs.mysql.com/bug.php?id=24509). We use this function for\npipes and sockets as well. This alone might be a reason to corner-case\ntest the resulting binary on Windows properly.\n"},{"id":"162562","messageId":"7voc5uenmy.fsf@alter.siamese.dyndns.org","threadId":"26627","inReplyTo":"AANLkTiksROE_dQTUn3Y_1Op6NDpGzEsSJ70JNYyYrufS@mail.gmail.com","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-01T17:50:13Z","receivedAt":"2011-03-01T17:50:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Erik Faye-Lund <kusmabite@gmail.com> writes:\n\n>> Erik, please check the made-up commit log message and sign it off.\n>> Will merge to 'next' after that.\n>\n> Do you have any hint on how I can create a repo with more than 2048\n> packs so I can test that the patch works?\n\nA stupid and brute force way is to prepare an empty bare repository, add\nsomething like the following to its config:\n\n    [transfer]\n            unpacklimit = 1\n\n    [gc]\n            auto = 0\n            autopacklimit = 0\n\nand push into it from a random existing repository starting from a\nreasonably old commit, walking to a newer commit.  You can use something\nlike (totally untested):\n\n        git rev-list --first-parent master |\n        head -n 2000 |\n        tac |\n        while read commit\n        do\n\t\tgit push ../victim.git $commit:refs/heads/master\n\tdone\n\n> There's also the added complication that _open_osfhandle also seems to\n> be limited by this 2048 limit (see the third comment here:\n> http://bugs.mysql.com/bug.php?id=24509). We use this function for\n> pipes and sockets as well. This alone might be a reason to corner-case\n> test the resulting binary on Windows properly.\n\nAs long as the use of osfhandles for non filedescriptors is reasonably\nbounded, it may be enough to make the 25 slop configurable per platform,\nno?\n"},{"id":"162623","messageId":"4D6DE88F.9030001@viscovery.net","threadId":"26627","inReplyTo":"7voc5uenmy.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2011-03-02T06:49:51Z","receivedAt":"2011-03-02T06:49:51Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 3/1/2011 18:50, schrieb Junio C Hamano:\n> Erik Faye-Lund <kusmabite@gmail.com> writes:\n>> There's also the added complication that _open_osfhandle also seems to\n>> be limited by this 2048 limit (see the third comment here:\n>> http://bugs.mysql.com/bug.php?id=24509). We use this function for\n>> pipes and sockets as well. This alone might be a reason to corner-case\n>> test the resulting binary on Windows properly.\n> \n> As long as the use of osfhandles for non filedescriptors is reasonably\n> bounded, it may be enough to make the 25 slop configurable per platform,\n> no?\n\nIt's not necessary to complicate things. The file descriptors acquired\nwith _open_osfhandle are (only) used in the implementation of pipe() and\nsocket() and count towards the limit no more and no less than the file\ndescriptors acquired with pipe() and socket() on Unix.\n\n-- Hannes\n"},{"id":"162659","messageId":"AANLkTim7Jo5KLwf760dQN5PucrsD1wvuksds-4Qi0csd@mail.gmail.com","threadId":"26627","inReplyTo":"7vbp1vfy5f.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2011-03-02T18:22:02Z","receivedAt":"2011-03-02T18:22:02Z","isPatch":false,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Tue, Mar 1, 2011 at 2:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> * sp/maint-fd-limit (2011-02-28) 2 commits\n>  - mingw: add minimum getrlimit() compatibility stub\n>  - Limit file descriptors used by packs\n>\n> Erik, please check the made-up commit log message and sign it off.\n> Will merge to 'next' after that.\n\nSeems to work:\n\n$ ls .git/objects/pack/*.pack | wc -l\n   2049\n$ git gc --auto\nAuto packing the repository for optimum performance. You may also run\n\"git gc\" manually. See \"git help gc\" for more information.\nCounting objects: 2056, done.\nDelta compression using up to 4 threads.\nCompressing objects: 100% (2049/2049), done.\nWriting objects: 100% (2056/2056), done.\nTotal 2056 (delta 2048), reused 13 (delta 5)\nRemoving duplicate objects: 100% (256/256), done.\n\nSo feel free to add:\nSigned-off-by: Erik Faye-Lund <kusmabite@gmail.com>\n"},{"id":"162660","messageId":"AANLkTim_euHU-vSULW0zk6SwrHridtvv5aqPVhBr_aXi@mail.gmail.com","threadId":"26627","inReplyTo":"AANLkTim7Jo5KLwf760dQN5PucrsD1wvuksds-4Qi0csd@mail.gmail.com","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2011-03-02T18:28:12Z","receivedAt":"2011-03-02T18:28:12Z","isPatch":false,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Wed, Mar 2, 2011 at 7:22 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:\n> On Tue, Mar 1, 2011 at 2:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n>> * sp/maint-fd-limit (2011-02-28) 2 commits\n>>  - mingw: add minimum getrlimit() compatibility stub\n>>  - Limit file descriptors used by packs\n>>\n>> Erik, please check the made-up commit log message and sign it off.\n>> Will merge to 'next' after that.\n>\n> Seems to work:\n>\n> $ ls .git/objects/pack/*.pack | wc -l\n>   2049\n> $ git gc --auto\n> Auto packing the repository for optimum performance. You may also run\n> \"git gc\" manually. See \"git help gc\" for more information.\n> Counting objects: 2056, done.\n> Delta compression using up to 4 threads.\n> Compressing objects: 100% (2049/2049), done.\n> Writing objects: 100% (2056/2056), done.\n> Total 2056 (delta 2048), reused 13 (delta 5)\n> Removing duplicate objects: 100% (256/256), done.\n>\n> So feel free to add:\n> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>\n>\n\nOh, and to be clear: Doing the same before these two patches gave this error:\n\n$ git gc --auto\nAuto packing the repository for optimum performance. You may also\nrun \"git gc\" manually. See \"git help gc\" for more information.\nCounting objects: 2056, done.\nDelta compression using up to 4 threads.\nCompressing objects: 100% (2049/2049), done.\nfatal: Unable to create temporary file: Too many open files\nerror: failed to run repack\n\nSo the issue is indeed fixed, and it seems we don't have to bias the\nresource limit.\n"},{"id":"162830","messageId":"4D726D1A.50507@drmicha.warpmail.net","threadId":"26627","inReplyTo":"7vbp1vfy5f.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-05T17:04:26Z","receivedAt":"2011-03-05T17:04:26Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 01.03.2011 02:05:\n...\n> * mg/rev-list-one-side-only (2011-02-22) 6 commits\n>  - t6007: test rev-list --cherry\n>  - log --cherry: a synonym\n>  - rev-list: --left/right-only are mutually exclusive\n>  - rev-list: documentation and test for --left/right-only\n>  - t6007: Make sure we test --cherry-pick\n>  - revlist.c: introduce --left/right-only for unsymmetric picking\n> \n> Will merge to 'next'; somebody may want to try losing many lines from\n> format-patch before it hits 'master', though.  Hint, hint...\n\nI was looking at f-p and also cherry, and getting second thoughts on\n\"--cherry\" in the course of it. Would you hold back the top 2, please?\n\nI'm wondering whether we should make \"rev-list --cherry\" more close to\n\"cherry\" (which also takes up your suggestion to show equivalent\ncommits). With the top 2, \"--cherry\" lists the \"+\" commits only.\n\nI'm thinking of something like \"--cherry-mark\" which is like\n--cherry-pick but marks equivalent commits (with a new flag PATCHSAME)\nrather than dropping them. Then,\n\ngit rev-list --cherry-pick --no-merges --left-right --right-only A...B\n\nwould be equivalent to\n\ngit cherry A B\n\nbut would make a lot of sense without --right-only, as well.\n\nI have a monkey patch for that right now (to be polished) which uses \"=\"\nbecause \"-\" is taken for boundary commits already. (I also noticed \"^\"\nfor UNINTERESTING - when do they get shown??) I'm wondering about the\nrelation between --cherry-mark and --left-right though: Should the\nformer imply the latter, or should --cherry-mark always output '='? I\nguess the latter.\n\nIf we were/are open to changing the characters which \"git cherry\" uses\nas markers we could probably replace it by the invocation above. The\nalternative (overload the meaning of '-') does not look like the best\nsolution.\n\nMichael\n"}]}