From: Junio C Hamano Date: Thu, 17 Nov 2011 06:45:38 +0000 (-0800) Subject: What's cooking (2011/11 #04) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67b04653e372766e43b4568210fd5ed706208f8c;p=thirdparty%2Fgit.git What's cooking (2011/11 #04) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 93c390892a..7cab0530cc 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,14 +1,17 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Nov 2011, #03; Sun, 13) -X-master-at: bc1bbe0c19a6ff39522b4fa3259f34150e308e1f -X-next-at: 72bb2d5b6710462dbf2e8d479ac63e2a74695332 +Subject: What's cooking in git.git (Nov 2011, #04; Wed, 16) +X-master-at: 09116a1c31e3754cb18bb69ef057342cd7808935 +X-next-at: cc761519149511482c8cf0afc615993437266af7 -What's cooking in git.git (Nov 2011, #03; Sun, 13) +What's cooking in git.git (Nov 2011, #04; Wed, 16) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. +One nasty regression killed, hopefully we are good to go for the third +release candidate tomorrow. + Here are the repositories that have my integration branches: With maint, master, next, pu, todo: @@ -37,42 +40,50 @@ The preformatted documentation in HTML and man format are found in: -------------------------------------------------- [New Topics] -* jc/commit-tree-extra (2011-11-12) 2 commits - - commit-tree: teach -C - - commit-tree: teach -x - (this branch uses jc/pull-signed-tag; is tangled with jc/signed-commit.) +* jk/refresh-porcelain-output (2011-11-14) 5 commits + - perhaps squash? show intent-to-add entries as "A" in verbose refresh + - refresh_index: notice typechanges in output + - read-cache: let refresh_cache_ent pass up changed flags + - refresh_index: mark deletions in porcelain output + - refresh_index: rename format variables -* nd/resolve-ref (2011-11-13) 2 commits - - Copy resolve_ref() return value for longer use - - Convert many resolve_ref() calls to read_ref*() and ref_exists() +The tip two commits need to be squashed into one. --------------------------------------------------- -[Graduated to "master"] +* ab/enable-i18n (2011-11-14) 1 commit + - i18n: add infrastructure for translating Git with gettext -* ab/i18n-test-fix (2011-11-05) 2 commits - (merged to 'next' on 2011-11-06 at f1de9a6) - + t/t7508-status.sh: use test_i18ncmp - + t/t6030-bisect-porcelain.sh: use test_i18ngrep +* gh/userdiff-matlab (2011-11-15) 1 commit + - Add built-in diff patterns for MATLAB code -* fc/remote-seturl-usage-fix (2011-11-06) 1 commit - (merged to 'next' on 2011-11-06 at 6c8328c) - + remote: fix remote set-url usage +* jc/maint-pack-object-cycle (2011-11-16) 1 commit + - pack-object: tolerate broken packs that have duplicated objects -* jc/remote-setbranches-usage-fix (2011-11-06) 1 commit - (merged to 'next' on 2011-11-06 at 017606d) - + remote: fix set-branches usage +Make the client side more robust against bogus pack stream; the problem +was discovered by accident while repacking a clone obtained from somewhat +buggy test server. -* pw/p4-appledouble-fix (2011-11-05) 1 commit - (merged to 'next' on 2011-11-06 at 2ec0af3) - + git-p4: ignore apple filetype +* jc/index-pack-reject-dups (2011-11-16) 1 commit + - receive-pack, fetch-pack: reject bogus pack that records objects twice -Regression fix for the upcoming release. +And this is the prevention to reject such pack stream in the first place. -* sn/http-auth-with-netrc-fix (2011-11-04) 1 commit - (merged to 'next' on 2011-11-06 at 60b7f96) - + http: don't always prompt for password +* jc/maint-name-rev-all (2011-11-15) 1 commit + - name-rev --all: do not even attempt to describe non-commit object -Regression fix for the upcoming release. +Fix for a corner-case bug? that was present from day one of the command. + +* ml/mailmap (2011-11-16) 1 commit + - mailmap: xcalloc mailmap_info + +An obvious(ly correct) cleanup. + +* rr/misc-fixes (2011-11-15) 4 commits + - git-compat-util: don't assume value for undefined variable + - sha1_file: don't mix enum with int + - convert: don't mix enum with int + - http: remove unused function hex() + +Obvious(ly correct) cleanups. -------------------------------------------------- [Stalled] @@ -86,6 +97,21 @@ Regression fix for the upcoming release. What the topic aims to achieve may make sense, but the implementation looked somewhat suboptimal. +* sg/complete-refs (2011-10-21) 9 commits + (merged to 'next' on 2011-10-26 at d65e2b4) + + completion: remove broken dead code from __git_heads() and __git_tags() + + completion: fast initial completion for config 'remote.*.fetch' value + + completion: improve ls-remote output filtering in __git_refs_remotes() + + completion: query only refs/heads/ in __git_refs_remotes() + + completion: support full refs from remote repositories + + completion: improve ls-remote output filtering in __git_refs() + + completion: make refs completion consistent for local and remote repos + + completion: optimize refs completion + + completion: document __gitcomp() + +Will keep in 'next' during this cycle. +Needs an Ack or two from completion folks before going forward. + * sr/transport-helper-fix-rfc (2011-07-19) 2 commits - t5800: point out that deleting branches does not work - t5800: document inability to push new branch with old content @@ -135,22 +161,38 @@ Will keep in 'pu' as a showcase for a while and then will drop. Kills I/O parallelism and needs to be improved or discarded. +* jc/commit-tree-extra (2011-11-12) 2 commits + - commit-tree: teach -C + - commit-tree: teach -x + (this branch uses jc/pull-signed-tag; is tangled with jc/signed-commit.) + +Not absolutely needed; parked in 'pu' but may drop. + +-------------------------------------------------- +[Cooking] + +* nd/resolve-ref (2011-11-13) 2 commits + - Copy resolve_ref() return value for longer use + - Convert many resolve_ref() calls to read_ref*() and ref_exists() + +A fix for an error-reporting codepath that is not a regression, that +turned into a patch that touches many callsite. + * vr/msvc (2011-10-31) 3 commits - - MSVC: Remove unneeded header stubs - - Compile fix for MSVC: Include - - Compile fix for MSVC: Do not include sys/resources.h + (merged to 'next' on 2011-11-14 at f46d021) + + MSVC: Remove unneeded header stubs + + Compile fix for MSVC: Include + + Compile fix for MSVC: Do not include sys/resources.h -It seems this needs to be rehashed with msysgit folks. +Will keep in 'next' during this cycle. * na/strtoimax (2011-11-05) 3 commits - - Support sizes >=2G in various config options accepting 'g' sizes. - - Compatibility: declare strtoimax() under NO_STRTOUMAX - - Add strtoimax() compatibility function. + (merged to 'next' on 2011-11-14 at b64e1cb) + + Support sizes >=2G in various config options accepting 'g' sizes. + + Compatibility: declare strtoimax() under NO_STRTOUMAX + + Add strtoimax() compatibility function. -It seems this needs to be rehashed with msysgit folks. - --------------------------------------------------- -[Cooking] +Will keep in 'next' during this cycle. * jc/signed-commit (2011-11-12) 4 commits - pretty: %G[?GS] placeholders @@ -163,26 +205,54 @@ Rebased on top of jc/pull-signed-tag topic, after reverting the old one out of 'next'. * jc/pull-signed-tag (2011-11-12) 15 commits - - commit-tree: teach -m/-F options to read logs from elsewhere - - commit-tree: update the command line parsing - - commit: teach --amend to carry forward extra headers - - merge: force edit and no-ff mode when merging a tag object - - commit: copy merged signed tags to headers of merge commit - - merge: record tag objects without peeling in MERGE_HEAD - - merge: make usage of commit->util more extensible - - fmt-merge-msg: Add contents of merged tag in the merge message - - fmt-merge-msg: package options into a structure - - fmt-merge-msg: avoid early returns - - refs DWIMmery: use the same rule for both "git fetch" and others - - fetch: allow "git fetch $there v1.0" to fetch a tag - - merge: notice local merging of tags and keep it unwrapped - - fetch: do not store peeled tag object names in FETCH_HEAD - - Split GPG interface into its own helper library + (merged to 'next' on 2011-11-14 at 25e8838) + + commit-tree: teach -m/-F options to read logs from elsewhere + + commit-tree: update the command line parsing + + commit: teach --amend to carry forward extra headers + + merge: force edit and no-ff mode when merging a tag object + + commit: copy merged signed tags to headers of merge commit + + merge: record tag objects without peeling in MERGE_HEAD + + merge: make usage of commit->util more extensible + + fmt-merge-msg: Add contents of merged tag in the merge message + + fmt-merge-msg: package options into a structure + + fmt-merge-msg: avoid early returns + + refs DWIMmery: use the same rule for both "git fetch" and others + + fetch: allow "git fetch $there v1.0" to fetch a tag + + merge: notice local merging of tags and keep it unwrapped + + fetch: do not store peeled tag object names in FETCH_HEAD + + Split GPG interface into its own helper library (this branch is used by jc/commit-tree-extra and jc/signed-commit.) Further updated to allow "commit --amend" to retain the mergetag headers. I think this is ready for the cycle after upcoming 1.7.8. +Will keep in 'next' during this cycle. + +* jc/request-pull-show-head-4 (2011-11-09) 12 commits + (merged to 'next' on 2011-11-13 at e473fd2) + + request-pull: use the annotated tag contents + (merged to 'next' on 2011-10-15 at 7e340ff) + + fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error + (merged to 'next' on 2011-10-10 at 092175e) + + environment.c: Fix an sparse "symbol not declared" warning + + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning + (merged to 'next' on 2011-10-07 at fcaeca0) + + fmt-merge-msg: use branch.$name.description + (merged to 'next' on 2011-10-06 at fa5e0fe) + + request-pull: use the branch description + + request-pull: state what commit to expect + + request-pull: modernize style + + branch: teach --edit-description option + + format-patch: use branch description in cover letter + + branch: add read_branch_desc() helper function + + Merge branch 'bk/ancestry-path' into jc/branch-desc + +Allow setting "description" for branches and use it to help communications +between humans in various workflow elements. It also allows requesting for +a signed tag to be pulled and shows the tag message in the generated message. + +Will keep in 'next' during this cycle. + * ab/clang-lints (2011-11-06) 2 commits (merged to 'next' on 2011-11-13 at a573aec) + cast variable in call to free() in builtin/diff.c and submodule.c @@ -245,6 +315,7 @@ Replaces a series from Kato Kazuyoshi on the same topic. + http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping Reduces unnecessary waits. +Will keep in 'next' during this cycle. * nd/misc-cleanups (2011-10-27) 6 commits (merged to 'next' on 2011-10-28 at 2527a49) @@ -267,7 +338,9 @@ Will keep in 'next' during this cycle. Will keep in 'next' during this cycle. -* mh/ref-api-3 (2011-10-19) 11 commits +* mh/ref-api-3 (2011-11-16) 26 commits + (merged to 'next' on 2011-11-16 at cc76151) + + refs: loosen over-strict "format" check (merged to 'next' on 2011-10-23 at 92e2d35) + is_refname_available(): reimplement using do_for_each_ref_in_array() + names_conflict(): simplify implementation @@ -280,7 +353,22 @@ Will keep in 'next' during this cycle. + parse_ref_line(): add a check that the refname is properly formatted + repack_without_ref(): remove temporary + Rename another local variable name -> refname - (this branch uses mh/ref-api-2.) + (merged to 'next' on 2011-10-19 at cc89f0e) + + resolve_gitlink_ref_recursive(): change to work with struct ref_cache + + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions + + resolve_gitlink_ref(): improve docstring + + get_ref_dir(): change signature + + refs: change signatures of get_packed_refs() and get_loose_refs() + + is_dup_ref(): extract function from sort_ref_array() + + add_ref(): add docstring + + parse_ref_line(): add docstring + + is_refname_available(): remove the "quiet" argument + + clear_ref_array(): rename from free_ref_array() + + refs: rename parameters result -> sha1 + + refs: rename "refname" variables + + struct ref_entry: document name member + + cache.h: add comments for git_path() and git_path_submodule() + (this branch is tangled with mh/ref-api-2.) Will keep in 'next' during this cycle. @@ -304,7 +392,9 @@ Will keep in 'next' during this cycle. The tip commit might be loosening things a bit too much. Will keep in 'pu' until hearing a convincing argument for the patch. -* mh/ref-api-2 (2011-10-17) 14 commits +* mh/ref-api-2 (2011-11-16) 15 commits + (merged to 'next' on 2011-11-16 at 511457f) + + refs: loosen over-strict "format" check (merged to 'next' on 2011-10-19 at cc89f0e) + resolve_gitlink_ref_recursive(): change to work with struct ref_cache + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions @@ -320,61 +410,6 @@ Will keep in 'pu' until hearing a convincing argument for the patch. + refs: rename "refname" variables + struct ref_entry: document name member + cache.h: add comments for git_path() and git_path_submodule() - (this branch is used by mh/ref-api-3.) - -Will keep in 'next' during this cycle. - -* sg/complete-refs (2011-10-21) 9 commits - (merged to 'next' on 2011-10-26 at d65e2b4) - + completion: remove broken dead code from __git_heads() and __git_tags() - + completion: fast initial completion for config 'remote.*.fetch' value - + completion: improve ls-remote output filtering in __git_refs_remotes() - + completion: query only refs/heads/ in __git_refs_remotes() - + completion: support full refs from remote repositories - + completion: improve ls-remote output filtering in __git_refs() - + completion: make refs completion consistent for local and remote repos - + completion: optimize refs completion - + completion: document __gitcomp() - -Will keep in 'next' until an Ack or two from completion folks. - -* jc/request-pull-show-head-4 (2011-11-09) 12 commits - (merged to 'next' on 2011-11-13 at e473fd2) - + request-pull: use the annotated tag contents - (merged to 'next' on 2011-10-15 at 7e340ff) - + fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error - (merged to 'next' on 2011-10-10 at 092175e) - + environment.c: Fix an sparse "symbol not declared" warning - + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning - (merged to 'next' on 2011-10-07 at fcaeca0) - + fmt-merge-msg: use branch.$name.description - (merged to 'next' on 2011-10-06 at fa5e0fe) - + request-pull: use the branch description - + request-pull: state what commit to expect - + request-pull: modernize style - + branch: teach --edit-description option - + format-patch: use branch description in cover letter - + branch: add read_branch_desc() helper function - + Merge branch 'bk/ancestry-path' into jc/branch-desc - -Allow setting "description" for branches and use it to help communications -between humans in various workflow elements. It also allows requesting for -a signed tag to be pulled and shows the tag message in the generated message. + (this branch is tangled with mh/ref-api-3.) Will keep in 'next' during this cycle. - --------------------------------------------------- -[Discarded] - -* kk/gitweb-side-by-side-diff (2011-10-17) 2 commits - . gitweb: add a feature to show side-by-side diff - . gitweb: change format_diff_line() to remove leading SP from $diff_class - -* jc/check-ref-format-fixup (2011-10-19) 2 commits - (merged to 'next' on 2011-10-19 at 98981be) - + Revert "Restrict ref-like names immediately below $GIT_DIR" - (merged to 'next' on 2011-10-15 at 8e89bc5) - + Restrict ref-like names immediately below $GIT_DIR - -This became a no-op except for the bottom one which is part of the other -topic now.