From: Junio C Hamano Date: Wed, 13 Jun 2012 23:00:41 +0000 (-0700) Subject: What's cooking (2012/06 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ea53dfe59fc831fd0ef3229ccc1b985e2618390;p=thirdparty%2Fgit.git What's cooking (2012/06 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 0c24d7057c..c3659653bf 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,17 +1,18 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jun 2012, #02; Wed, 6) -X-master-at: f623ca1cae600e97cb0b38131fdd33e4fb669cf8 -X-next-at: 8e148144574e6c6511b591286e44a677a260d760 +Subject: What's cooking in git.git (Jun 2012, #03; Wed, 13) +X-master-at: 2ae48a9bb87193de9e9da10abd9e7286c0e4c43d +X-next-at: 8698a94dadcf25a536d802359376c8811d29a59d -What's cooking in git.git (Jun 2012, #02; Wed, 6) +What's cooking in git.git (Jun 2012, #03; Wed, 13) -------------------------------------------------- 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'm planning to tag 1.7.11-rc2 tomorrow or Friday (we have slipped -by one week). Please concentrate on testing, finding and fixing -regressions introduced after 1.7.10 until 1.7.11 final. +Most likely, I'll tag 1.7.11 final this weekend. It doesn't look +like there is any remaining topic that cannot wait for the next +cycle. A few small regressions on the master front have been +patched up, and it seems we are good to go. You can find the changes described here in the integration branches of the repositories listed at @@ -21,90 +22,84 @@ repositories listed at -------------------------------------------------- [New Topics] -* jc/bundle-complete-notice (2012-06-04) 1 commit - (merged to 'next' on 2012-06-05 at ee25a35) - + tweak "bundle verify" of a complete history +* nd/i18n-branch-lego (2012-06-07) 1 commit + - Remove i18n legos in notifying new branch tracking setup -Running "git bundle verify" on a bundle that records a complete -history said "it requires these 0 commits". +Restructure the way message strings are created, in preparation for +marking them for i18n. -Not urgent; probably early post 1.7.11. +* nd/i18n-misc (2012-06-07) 3 commits + - rerere: remove i18n legos in result message + - notes-merge: remove i18n legos in merge result message + - reflog: remove i18n legos in pruning message -* jc/svn-auth-providers-unusable-at-1.6.12 (2012-06-04) 1 commit - (merged to 'next' on 2012-06-04 at c4ffe24) - + git-svn: platform auth providers are working only on 1.6.15 or newer +Restructure the way message strings are created, in preparation for +marking them for i18n. -Regression fix for people with libsvn between 1.6.12 and 1.6.15 on -which we tried to use non-working platform auth providers. +* rr/doc-commit (2012-06-08) 1 commit + - commit: document a couple of options -Will merge to master. +* hv/remote-end-hung-up (2012-06-11) 1 commit + - lessen the impression of unexpectedness on remote hangup -* lk/more-helpful-status-hints (2012-06-05) 4 commits - - status: better advices when splitting a commit (during rebase -i) - - status: don't suggest "git rm" or "git add" if not appropriate - - t7512-status-help.sh: better advices for git status - - wt-status.*: better advices for git status added +* hv/submodule-checkout-nuke-submodules (2012-06-11) 1 commit + - update-index: allow overwriting existing submodule index entries -Almost there, modulo minor details pointed out by Matthieu. +* jc/rev-list-simplify-merges-first-parent (2012-06-13) 3 commits + - revision: ignore side parents while running simplify-merges + - revision: note the lack of free() in simplify_merges() + - revision: "simplify" options imply topo-order sort -* rr/maint-t3510-cascade-fix (2012-06-04) 1 commit - (merged to 'next' on 2012-06-04 at 4c3368b) - + t3510 (cherry-pick-sequence): add missing '&&' +* jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit + - archive: ustar header checksum is computed unsigned -Will merge to master. +* rs/git-blame-mapcar-mapc (2012-06-10) 1 commit + - git-blame.el: use mapc instead of mapcar -* jc/merge-annotated-tag (2012-06-05) 2 commits - - merge: allow fast-forwarding to an annotated but unsigned tag - - merge: separte the logic to check for a signed tag +* rs/ipv6-ssh-url (2012-06-13) 1 commit + - git: Wrong parsing of ssh urls with IPv6 literals ignores port -"git merge anno" created a merge commit even when anno is an -unsigned annotated tag that points at a commit that can be fast -forwarded to; this came from a laziness of the implementation of -merging of signed tags in 1.7.9, and can be worked around by saying -"git merge --ff-only anno", so it is not really necessariy, but is -here for completeness. - -Not urgent. - -* jk/no-more-pre-exec-callback (2012-06-05) 1 commit - - pager: drop "wait for output to run less" hack +* vr/use-our-perl-in-tests (2012-06-12) 3 commits + - t/README: add a bit more Don'ts + - tests: enclose $PERL_PATH in duoble quotes + - t: Replace 'perl' by $PERL_PATH -On hold for 6 months until ancient "less" goes extinct. - -* jk/maint-t1304-setfacl (2012-06-06) 1 commit - - t1304: improve setfacl prerequisite setup +-------------------------------------------------- +[Graduated to "master"] -Works around a false test failure caused by a bug in ecryptofs. +* cr/persistent-https (2012-05-30) 1 commit + (merged to 'next' on 2012-06-01 at c647464) + + Add persistent-https to contrib -Not urgent; probably early post 1.7.11. +A remote helper that acts as a proxy that caches ssl session for the +https:// transport is added to the contrib/ area. -* lk/rebase-i-x (2012-06-06) 1 commit - - rebase [-i --exec | -ix] ... +* jc/fmt-merge-msg-people (2012-06-06) 1 commit + (merged to 'next' on 2012-06-08 at 7d8f4b6) + + fmt-merge-msg: make attribution into comment lines -Adds -x to "rebase -i" to insert "exec " after each -commit in the resulting history. +* jc/svn-auth-providers-unusable-at-1.6.12 (2012-06-04) 1 commit + (merged to 'next' on 2012-06-04 at c4ffe24) + + git-svn: platform auth providers are working only on 1.6.15 or newer -Not urgent; probably early post 1.7.11. +Regression fix for people with libsvn between 1.6.12 and 1.6.15 on +which we tried to use non-working platform auth providers. -* vr/help-per-platform (2012-06-06) 1 commit - - help: use HTML as the default help format on Windows +* mm/api-credentials-doc (2012-06-07) 5 commits + + docs: fix cross-directory linkgit references + (merged to 'next' on 2012-06-05 at 8e14814) + + api-credentials.txt: add "see also" section + + api-credentials.txt: mention credential.helper explicitly + + api-credentials.txt: show the big picture first + + doc: fix xref link from api docs to manual pages -* jc/fmt-merge-msg-people (2012-06-06) 1 commit - - fmt-merge-msg: make attribution into comment lines +* rr/maint-t3510-cascade-fix (2012-06-04) 1 commit + (merged to 'next' on 2012-06-04 at 4c3368b) + + t3510 (cherry-pick-sequence): add missing '&&' -------------------------------------------------- [Stalled] -* nd/exclude-workaround-top-heavy (2012-05-29) 2 commits - - exclude: do strcmp as much as possible before fnmatch - - Unindent excluded_from_list() - -Attempts to optimize matching with an exclude pattern with a deep -directory hierarchy by taking the part that specifies leading path -without wildcard literally. - -The code to check for wildcard needs to be redone. - * 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 @@ -120,7 +115,11 @@ Rewords the status message of "git push" that pushed only one ref differently from "Everything up-to-date", to give a bit more help to people who get the message when their current branch is not pushed. -* fc/git-prompt-script (2012-05-22) 5 commits +I had an impression after the discussion thread that a redesign is +coming, but it hasn't happened yet. + +* fc/git-prompt-script (2012-06-10) 6 commits + - completion: warn people about duplicated function - completion: split __git_ps1 into a separate script - completion: remove executable mode - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script @@ -128,8 +127,10 @@ people who get the message when their current branch is not pushed. - tests: move code to run tests under bash into a helper library (this branch is tangled with sg/bash-prompt.) -The last remaining sticking point is what to do with the duplicated shell -function. +The last remaining sticking point is what to do with the duplicated +shell function. Together with the warning patch at the tip, if we +side port the tip commit from sg/bash-prompt, I think this will be +ready for testing. * sg/bash-prompt (2012-05-09) 4 commits - completion: respect $GIT_DIR @@ -142,36 +143,15 @@ This is only the "correction" bits taken from the beginning of a larger 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-06-06) 12 commits - - apply: fix an incomplete message - - apply: refactor "previous patch" logic - - apply: a bit more comments on PATH_TO_BE_DELETED - - apply: document --3way option - - apply: allow rerere() upon --3way results - - 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 - -"git apply" learns to wiggle the base version and perform three-way merge -when a patch does not exactly apply to the version you have. - -It turns out that it is somewhat unpleasant to handle add/add conflicts in -this code, but it seems necessary if we want to use "apply -3" to replace -the use of "apply --build-fake-ancestor" followed by the slow "merge" in -"am -3". - * jc/maint-push-refs-all (2012-05-04) 2 commits - get_fetch_map(): tighten checks on dest refs - fetch/push: allow refs/*:refs/* Allows pushing and fetching refs/stash. -Not ready. There still seem to be other bugs hiding (e.g. try pushing twice). +Not ready. + * jc/run-hook-env-1 (2012-03-11) 1 commit - run_hook(): enhance the interface to pass arbitrary environment @@ -213,11 +193,91 @@ not working :-(. -------------------------------------------------- [Cooking] +* jc/apply-3way (2012-06-13) 19 commits + - apply --3way: tests + - apply: document --3way option + - apply: allow rerere() upon --3way results + - apply: register conflicted stages to the index + - apply: --3way with add/add conflict + - apply: move verify_index_match() higher + - apply: plug the three-way merge logic in + - apply: fall back on three-way merge + - apply: accept -3/--3way command line option + - apply: move "already exists" logic to check_to_create() + - apply: move check_to_create_blob() closer to its sole caller + - apply: further split load_preimage() + - apply: refactor "previous patch" logic + - apply: split load_preimage() helper function out + - apply: factor out checkout_target() helper function + - apply: refactor read_file_or_gitlink() + - apply: clear_image() clears things a bit more + - apply: a bit more comments on PATH_TO_BE_DELETED + - apply: fix an incomplete comment in check_patch() + +"git apply" learns to wiggle the base version and perform three-way merge +when a patch does not exactly apply to the version you have. + + +* nd/exclude-workaround-top-heavy (2012-06-07) 3 commits + - exclude: do strcmp as much as possible before fnmatch + - dir.c: get rid of the wildcard symbol set in no_wildcard() + - Unindent excluded_from_list() + +Attempts to optimize matching with an exclude pattern with a deep +directory hierarchy by taking the part that specifies leading path +without wildcard literally. + +* jc/bundle-complete-notice (2012-06-04) 1 commit + (merged to 'next' on 2012-06-05 at ee25a35) + + tweak "bundle verify" of a complete history + +Running "git bundle verify" on a bundle that records a complete +history said "it requires these 0 commits". + +Not urgent; probably early post 1.7.11. + +* lk/more-helpful-status-hints (2012-06-11) 5 commits + - fixup! status: better advices when splitting a commit (during rebase -i) + - status: better advices when splitting a commit (during rebase -i) + - status: don't suggest "git rm" or "git add" if not appropriate + - t7512-status-help.sh: better advices for git status + - wt-status.*: better advices for git status added + +Almost there, modulo minor details pointed out by Matthieu. + +* jk/no-more-pre-exec-callback (2012-06-05) 1 commit + - pager: drop "wait for output to run less" hack + +On hold for 6 months until ancient "less" goes extinct. + +* jk/maint-t1304-setfacl (2012-06-07) 1 commit + (merged to 'next' on 2012-06-08 at ebba27c) + + t1304: improve setfacl prerequisite setup + +Works around a false test failure caused by a bug in ecryptofs. + +Not urgent; probably early post 1.7.11. + +* lk/rebase-i-x (2012-06-13) 1 commit + - rebase -i: teach "--exec " + +Adds -x to "rebase -i" to insert "exec " after each +commit in the resulting history. + +Will merge to next after 1.7.11. + +* vr/help-per-platform (2012-06-06) 1 commit + (merged to 'next' on 2012-06-08 at f4b2b0b) + + help: use HTML as the default help format on Windows + +Not urgent; probably early post 1.7.11. + * jc/ls-files-i-dir (2012-06-05) 6 commits - - dir.c: make excluded() file scope static - - unpack-trees.c: use path_excluded() in check_ok_to_remove() - - builtin/add.c: use path_excluded() - - path_excluded(): update API to less cache-entry centric + (merged to 'next' on 2012-06-08 at 2b5a256) + + dir.c: make excluded() file scope static + + unpack-trees.c: use path_excluded() in check_ok_to_remove() + + builtin/add.c: use path_excluded() + + path_excluded(): update API to less cache-entry centric (merged to 'next' on 2012-06-05 at 8f35db3) + ls-files -i: micro-optimize path_excluded() + ls-files -i: pay attention to exclusion of leading paths @@ -247,8 +307,8 @@ Not urgent; probably early post 1.7.11. - vcs-svn: simplify cleanup in apply_one_window() - vcs-svn: fix clang-analyzer error -I do not know the doneness of this series that came out of the -blue. Are people involved in vcs-svn happy with this series? +I'd take Jonathan's clean-up offer and keep this on hold until +1.7.11 final. * jk/version-string (2012-06-03) 3 commits (merged to 'next' on 2012-06-05 at b6f7266) @@ -256,22 +316,12 @@ blue. Are people involved in vcs-svn happy with this series? + version: add git_user_agent function + move git_version_string into version.c -I am somewhat tempted to merge this to master before 1.7.11 final. -Thoughts? - -* mm/api-credentials-doc (2012-06-04) 4 commits - (merged to 'next' on 2012-06-05 at 8e14814) - + api-credentials.txt: add "see also" section - + api-credentials.txt: mention credential.helper explicitly - + api-credentials.txt: show the big picture first - + doc: fix xref link from api docs to manual pages - -Will merge to master. +Will merge to master early post 1.7.11. * nd/stream-pack-objects (2012-05-29) 1 commit - pack-objects: use streaming interface for reading large loose blobs -Not urgent; probably early post 1.7.11. +Will merge to next after 1.7.11. * jk/clone-local (2012-05-30) 2 commits (merged to 'next' on 2012-06-05 at b819eb5) @@ -292,15 +342,6 @@ Not urgent; probably early post 1.7.11. Not urgent; probably early post 1.7.11. -* cr/persistent-https (2012-05-30) 1 commit - (merged to 'next' on 2012-06-01 at c647464) - + 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. - -Will merge to master. - * nd/stream-index-pack (2012-05-24) 4 commits - index-pack: use streaming interface for collision test on large blobs - index-pack: factor out unpack core from get_data_from_pack @@ -310,7 +351,7 @@ Will merge to master. Use streaming API to read from the object store to avoid having to hold a large blob object in-core while running index-pack. -Not urgent; probably early post 1.7.11. +Will merge to next after 1.7.11. * js/submodule-relative (2012-06-06) 4 commits - submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar @@ -342,3 +383,15 @@ Hopwefully we can have a solidly tested series early in 1.7.12 or + git-daemon wrapper to wait until daemon is ready Reverted from 'next' to replace it with js/daemon-test-race-fix. + +* jc/merge-annotated-tag (2012-06-05) 2 commits + . merge: allow fast-forwarding to an annotated but unsigned tag + . merge: separte the logic to check for a signed tag + +"git merge anno" created a merge commit even when anno is an +unsigned annotated tag that points at a commit that can be fast +forwarded to; this came from a laziness of the implementation of +merging of signed tags in 1.7.9. People may have different opinion +on making signed and unsigned annotated tag behave differently, but +I tend to agree that it is probably not a good idea. +