From b683d55d468b61a831ec2ae051d312012604f8b6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 May 2012 15:10:11 -0700 Subject: [PATCH] What's cooking (2012/05 #06) --- whats-cooking.txt | 321 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 190 insertions(+), 131 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 5d62f53e71..d9f7c221e2 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,25 +1,28 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (May 2012, #05; Sun, 20) -X-master-at: aa3bb87176d42f1782c5030fa41e6e62492551c0 -X-next-at: 292236e1ac597c1020462c4a16e9603482ac1410 +Subject: What's cooking in git.git (May 2012, #06; Wed, 23) +X-master-at: bd578b507fa79f94009ae1c1a436dc14cf7e6002 +X-next-at: be95121998f97475e9491ebbe005f08e85f054ef -What's cooking in git.git (May 2012, #05; Sun, 20) +What's cooking in git.git (May 2012, #06; Wed, 23) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -I haven't tagged 1.7.11-rc0 as some of the late "fixup" patches still -haven't settled yet, but hopefully we can go directly to rc1 by the end of -the week. - You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[New Topics] +[Graduated to "master"] + +* bp/diff-no-index-strbuf-fix (2012-05-16) 2 commits + (merged to 'next' on 2012-05-18 at b2c26bb) + + diff --no-index: don't leak buffers in queue_diff + + diff --no-index: reset temporary buffer lengths on directory iteration + +Fix regressions to "git diff --no-index" when it recurses down. * hv/submodule-alt-odb (2012-05-14) 1 commit (merged to 'next' on 2012-05-18 at 2f17ac8) @@ -28,30 +31,6 @@ repositories listed at When peeking into object stores of submodules, the code forgot that they might borrow objects from alternate object stores on their own. -* jk/ident-gecos-strbuf (2012-05-20) 13 commits - - format-patch: refactor get_patch_filename - - ident: use a dynamic strbuf in fmt_ident - - ident: use full dns names to generate email addresses - - ident: report passwd errors with a more friendly message - - drop length limitations on gecos-derived names and emails - - ident: don't write fallback username into git_default_name - - fmt_ident: drop IDENT_WARN_ON_NO_NAME code - - format-patch: use default email for generating message ids - - fmt-merge-msg: don't use static buffer in record_person - - move git_default_* variables to ident.c - - move identity config parsing to ident.c - - http-push: do not access git_default_email directly - - ident: split setup_ident into separate functions - -Fixes quite a lot of brokenness when ident information needs to be taken -from the system and cleans up the code. The series seem to break tests -here and there along the way but at the end everything balances out ;-) - -* bp/diff-no-index-strbuf-fix (2012-05-16) 2 commits - (merged to 'next' on 2012-05-18 at b2c26bb) - + diff --no-index: don't leak buffers in queue_diff - + diff --no-index: reset temporary buffer lengths on directory iteration - * js/rebase-i-p-test-fix (2012-05-18) 1 commit (merged to 'next' on 2012-05-18 at b7482fc) + Fix t3411.3 to actually rebase something @@ -60,117 +39,123 @@ here and there along the way but at the end everything balances out ;-) (merged to 'next' on 2012-05-18 at c16f1c7) + rev-parse doc: --git-dir does not always show a relative path -* js/submodule-relative (2012-05-20) 2 commits - - submodule: fix handling of superproject with relative origin URLs - - submodule: add tests for add,sync,init in presence of relative super origin URL - -* mh/ref-api-lazy-loose (2012-05-20) 1 commit - - free_ref_entry(): do not trigger reading of loose refs - -* mh/test-keep-prove-cache (2012-05-20) 1 commit - - t/Makefile: retain cache t/.prove across prove runs - -* ng/pack-objects-cleanup (2012-05-18) 2 commits - - pack-objects: refactor write_object() into helper functions - - pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .." - * rs/archive-tree-in-tip-simplify (2012-05-18) 2 commits (merged to 'next' on 2012-05-18 at a8ca614) + archive-tar: keep const in checksum calculation + archive: simplify refname handling -* rs/maint-grep-F (2012-05-20) 3 commits - - grep: support newline separated pattern list - - grep: factor out do_append_grep_pat() - - grep: factor out create_grep_pat() +-------------------------------------------------- +[New Topics] -* rs/xdiff-fast-hash-fix (2012-05-18) 1 commit - - xdiff: signed right shift for 32-bit case of XDL_FAST_HASH +* fc/git-prompt-script (2012-05-22) 5 commits + - completion: split __git_ps1 into a separate script + - completion: remove executable mode + - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script + - tests: add tests for the bash prompt functions in the completion script + - tests: move code to run tests under bash into a helper library + (this branch is tangled with sg/bash-prompt.) -* sp/sh-windows-pwd (2012-05-16) 1 commit - - git-sh-setup: define workaround wrappers before they are used +Looked reasonable from my point of view, but I am not familiar with the +direction in which larger "bash completion" project folks are going, so +people more knowledgeable than myself need to help me guiding this topic. -* fc/git-complete-helper-fix (2012-05-20) 2 commits - - completion: add support for backwards compatibility - - completion: rename internal helpers _git and _gitk +* jk/fetch-pack-remove-dups-optim (2012-05-22) 5 commits + (merged to 'next' on 2012-05-23 at 6057c21) + + fetch-pack: avoid quadratic loop in filter_refs + + fetch-pack: sort the list of incoming refs + + add sorting infrastructure for list refs + + fetch-pack: avoid quadratic behavior in remove_duplicates + + fetch-pack: sort incoming heads -* jc/wip-apply-3way (2012-05-14) 9 commits - . WIP: apply --3way with add/add conflicts - . apply: refactor codepath to check new files - - apply: register conflicted stages to the index - - apply: plug the three-way merge logic in - - apply: fall back on three-way merge - - apply: accept -3/--3way command line option - - apply: split load_preimage() helper function out - - apply: refactor read_file_or_gitlink() - - apply: clear_image() clears things a bit more - (this branch is tangled with jc/apply-3way.) +The way "fetch-pack" taht is given multiple references to fetch tried to +remove duplicates was very inefficient. --------------------------------------------------- -[Graduated to "master"] +Will merge to master. + +* jk/ident-split-fix (2012-05-22) 1 commit + (merged to 'next' on 2012-05-23 at 811c9ec) + + fix off-by-one error in split_ident_line + +An author/committer name that is a single character was mishandled as an +invalid name by mistake. + +Will merge to master and later to maint. + +* jk/pretty-commit-header-incomplete-line (2012-05-22) 1 commit + (merged to 'next' on 2012-05-23 at f788433) + + avoid segfault when reading header of malformed commits + +Will merge to master and later to maint. + +* mh/fetch-pack-constness (2012-05-22) 4 commits + (merged to 'next' on 2012-05-23 at be95121) + + cmd_fetch_pack(): respect constness of argv parameter + + cmd_fetch_pack(): combine the loop termination conditions + + cmd_fetch_pack(): handle non-option arguments outside of the loop + + cmd_fetch_pack(): declare dest to be const + +Tighten constness of some local variables in a callchain. + +* rs/refs-string-slice (2012-05-22) 4 commits + (merged to 'next' on 2012-05-23 at d224de1) + + refs: do not create ref_entry when searching + + refs: use strings directly in find_containing_dir() + + refs: convert parameter of create_dir_entry() to length-limited string + + refs: convert parameter of search_ref_dir() to length-limited string -* fc/git-complete-helper (2012-05-20) 2 commits - - completion: add support for backwards compatibility - - completion: rename internal helpers _git and _gitk -* fc/git-complete-helper (2012-05-14) 1 commit - (merged to 'next' on 2012-05-14 at 759d5f4) - + completion: add new __git_complete helper - -There is a late fix-up that still need to be merged for backward -compatibility for external users of the unpublished internal API. - -* fc/simplify-complete-revlist-file (2012-05-07) 1 commit - (merged to 'next' on 2012-05-08 at ff0b7d1) - + completion: simplify __git_complete_revlist_file - -* ld/git-p4-tags-and-labels (2012-05-11) 3 commits - (merged to 'next' on 2012-05-11 at 441bd9a) - + git p4: fix bug when enabling tag import/export via config variables - + git p4: fix bug when verbose enabled with tag export - + git p4: add test for tag import/export enabled via config - -* nd/i18n-parseopt (2012-05-08) 2 commits - (merged to 'next' on 2012-05-08 at 15eb029) - + i18n: apply: mark parseopt strings for translation - + i18n: parseopt: lookup help and argument translations when showing usage - -Text from "git cmd --help" are getting prepared for i18n. - -* nd/threaded-index-pack (2012-05-07) 4 commits - (merged to 'next' on 2012-05-08 at 053b797) - + index-pack: disable threading if NO_PREAD is defined - + index-pack: support multithreaded delta resolving - + index-pack: restructure pack processing into three main functions - + compat/win32/pthread.h: Add an pthread_key_delete() implementation - -Enables threading in index-pack to resolve base data in parallel. - -* rs/xdiff-lose-emit-func (2012-05-14) 7 commits - (merged to 'next' on 2012-05-14 at 422f328) - + builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning - (merged to 'next' on 2012-05-11 at 1eeb893) - + xdiff: remove unused functions - + xdiff: remove emit_func() and xdi_diff_hunks() - + blame: factor out helper for calling xdi_diff() - + blame: use hunk_func(), part 2 - + blame: use hunk_func(), part 1 - + xdiff: add hunk_func() - -Simplifies the interface between the implementation of "blame" and -underlying xdiff engine, and removes a lot of unused or unnecessary code -from the latter. +Avoid unnecessary temporary allocations while looking for matching refs +inside refs API. + +* cr/persistent-https (2012-05-23) 1 commit + - Add persistent-https to contrib + +A remote helper that acts as a proxy that caches ssl session for the +https:// transport is added to the contrib/ area. + +* jk/format-person-part-buffer-limit (2012-05-22) 1 commit + (merged to 'next' on 2012-05-23 at ef025b0) + + pretty: avoid buffer overflow in format_person_part + +Will merge to master and later to maint. + +* nd/stream-index-pack (2012-05-23) 6 commits + - sha1_loose_object_info: do not complain out loud on non-existent objects + - index-pack: avoid collision test when verifying in-repo pack + - index-pack: use streaming interface for collision test on large blobs + - index-pack: factor out unpack core from get_data_from_pack + - index-pack: use streaming interface on large blobs (most of the time) + - index-pack: hash non-delta objects while reading from stream + +Use streaming API to read from the object store to avoid having to hold +a large blob object in-core while running index-pack. + +The later 3 patches in the series looked a bit suspect. + +* va/git-p4-test (2012-05-23) 2 commits + - git-p4: Verify detection of "empty" branch creation + - git-p4: Test changelists touching two branches -------------------------------------------------- [Stalled] +* nl/http-proxy-more (2012-05-11) 2 commits + - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY + - http: Avoid limit of retrying request only twice + +I queued only the later two patches from this series, even though they do +not make much sense without the first one that seems to need a bit more +work, so that we won't forget. + * sg/bash-prompt (2012-05-09) 4 commits - completion: respect $GIT_DIR - completion: use __gitdir() in _git_log() - tests: add tests for the bash prompt functions in the completion script - tests: move code to run tests under bash into a helper library + (this branch is tangled with fc/git-prompt-script.) This is only the "correction" bits taken from the beginning of a larger -series that is to be rerolled. +series that is to be rerolled. The first two are tangled with Felipe's +topic so a reroll, if comes, should build on top of them. * jc/apply-3way (2012-05-16) 12 commits - WIP: the message is bogus in apply:::check_patch() @@ -244,17 +229,91 @@ not working :-(. -------------------------------------------------- [Cooking] -* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits - - dir: simplify fill_directory() - - dir: respect string length argument of read_directory_recursive() +* jk/ident-gecos-strbuf (2012-05-22) 15 commits + (merged to 'next' on 2012-05-23 at 6fce816) + + format-patch: refactor get_patch_filename + + ident: trim whitespace from default name/email + + ident: use a dynamic strbuf in fmt_ident + + ident: use full dns names to generate email addresses + + ident: report passwd errors with a more friendly message + + drop length limitations on gecos-derived names and emails + + ident: don't write fallback username into git_default_name + + fmt_ident: drop IDENT_WARN_ON_NO_NAME code + + format-patch: use default email for generating message ids + + ident: trim trailing newline from /etc/mailname + + move git_default_* variables to ident.c + + move identity config parsing to ident.c + + fmt-merge-msg: don't use static buffer in record_person + + http-push: do not access git_default_email directly + + ident: split setup_ident into separate functions -* nl/http-proxy-more (2012-05-11) 2 commits - - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY - - http: Avoid limit of retrying request only twice +Fixes quite a lot of brokenness when ident information needs to be taken +from the system and cleans up the code. -I queued only the later two patches from this series, even though they do -not make much sense without the first one that seems to need a bit more -work, so that we won't forget. +Will merge to master. + +* js/submodule-relative (2012-05-23) 2 commits + - submodule: fix handling of relative superproject origin URLs + - submodule: document handling of relative superproject origin URLs + +* mh/ref-api-lazy-loose (2012-05-20) 1 commit + (merged to 'next' on 2012-05-23 at c41a30a) + + free_ref_entry(): do not trigger reading of loose refs + +The code to lazily read loose refs by mistake unnecessarily read the refs +in a subhierarchy when we free the data for the subhierarchy. + +Will merge to master. + +* mh/test-keep-prove-cache (2012-05-20) 1 commit + (merged to 'next' on 2012-05-23 at 870d1f9) + + t/Makefile: retain cache t/.prove across prove runs + +* ng/pack-objects-cleanup (2012-05-18) 2 commits + (merged to 'next' on 2012-05-23 at f90b1ba) + + pack-objects: refactor write_object() into helper functions + + pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .." + +* rs/maint-grep-F (2012-05-21) 4 commits + (merged to 'next' on 2012-05-23 at b24143c) + + grep: stop leaking line strings with -f + + grep: support newline separated pattern list + + grep: factor out do_append_grep_pat() + + grep: factor out create_grep_pat() + +"git grep -F", unlike the case where it reads from a file, did not treat +individual lines in the given pattern argument as separate patterns as it +should. + +Will merge to master and later to maint. + +* rs/xdiff-fast-hash-fix (2012-05-23) 3 commits + (merged to 'next' on 2012-05-23 at 8df26a5) + + xdiff: import new 32-bit version of count_masked_bytes() + + xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines + + xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines + +Will merge to master. + +* sp/sh-windows-pwd (2012-05-16) 1 commit + (merged to 'next' on 2012-05-23 at 63004c3) + + git-sh-setup: define workaround wrappers before they are used + +Will merge to master. + +* fc/git-complete-helper-fix (2012-05-20) 2 commits + (merged to 'next' on 2012-05-23 at 6124da2) + + completion: add support for backwards compatibility + + completion: rename internal helpers _git and _gitk + +Will merge to master. + +* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits + (merged to 'next' on 2012-05-23 at 2e22549) + + dir: simplify fill_directory() + + dir: respect string length argument of read_directory_recursive() + +Will merge to master. * mm/push-default-switch-warning (2012-04-26) 2 commits - t5541: warning message is given even with --quiet -- 2.11.4.GIT