From 7c63c98dc70f23108b0948ab9526b8ce48c0bc64 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 12 Apr 2013 14:31:26 -0700 Subject: [PATCH] What's cooking (2013/04 #04) --- whats-cooking.txt | 476 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 280 insertions(+), 196 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index d80d1aaaf2..2e502b093c 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2013, #03; Sun, 7) -X-master-at: 52a3e011c779456e63b6274af0024eeb92dd7888 -X-next-at: b213c0d2377aff930c500c0ac0d580a34e76686d +Subject: What's cooking in git.git (Apr 2013, #04; Fri, 12) +X-master-at: caa7d79f1f7c9940acfaf161b9b84bbf81980d95 +X-next-at: 8f252db48b97f196bce10b8bf2bd2bcf5b3a6ce3 -What's cooking in git.git (Apr 2013, #03; Sun, 7) +What's cooking in git.git (Apr 2013, #04; Fri, 12) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -24,140 +24,218 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* cn/commit-amend-doc (2013-04-05) 1 commit - (merged to 'next' on 2013-04-05 at 4c42e59) - + Documentation/git-commit: reword the --amend explanation - (this branch is used by jc/detached-head-doc.) +* po/help-guides (2013-04-03) 5 commits + (merged to 'next' on 2013-04-04 at 3d99b28) + + doc: include --guide option description for "git help" + + help: mention -a and -g option, and 'git help ' usage. + + builtin/help.c: add list_common_guides_help() function + + builtin/help.c: add --guide option + + builtin/help.c: split "-a" processing into two + "git help" learned "-g" option to show the list of guides just like + list of commands are given with "-a". -* fc/remote-helpers-test-updates (2013-04-04) 4 commits - (merged to 'next' on 2013-04-04 at 0612744) - + remote-hg: fix hg-git test-case - + remote-bzr: remove stale check code for tests - + remote-helpers: fix the run of all tests - + remote-bzr: avoid echo -n - (this branch is used by fc/transport-helper-waitpid.) +* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit + (merged to 'next' on 2013-03-29 at f6a05ca) + + combine-diff: coalesce lost lines optimally -* jk/bisect-prn-unsigned (2013-04-03) 1 commit - (merged to 'next' on 2013-04-04 at 2c4df36) - + bisect: avoid signed integer overflow + Attempts to minimize "diff -c/--cc" output by coalescing the same + lines removed from the parents better, but with an O(n^2) + complexity. -* jk/diffcore-break-divzero (2013-04-03) 1 commit - (merged to 'next' on 2013-04-04 at b7632e0) - + diffcore-break: don't divide by zero +* js/rerere-forget-protect-against-NUL (2013-04-04) 2 commits + (merged to 'next' on 2013-04-05 at 426d4e2) + + rerere forget: do not segfault if not all stages are present + + rerere forget: grok files containing NUL + A few bugfixes to "git rerere" working on corner case merge + conflicts. -* jk/filter-branch-come-back-to-original (2013-04-02) 1 commit - (merged to 'next' on 2013-04-04 at 621684a) - + filter-branch: return to original dir after filtering - When used with "-d temporary-directory" option, "git filter-branch" - failed to come back to the original working tree to perform the - final clean-up procedure. +* sr/log-SG-no-textconv (2013-04-05) 6 commits + (merged to 'next' on 2013-04-05 at 7f06945) + + diffcore-pickaxe: unify code for log -S/-G + + diffcore-pickaxe: fix leaks in "log -S" and "log -G" + + diffcore-pickaxe: port optimization from has_changes() to diff_grep() + + diffcore-pickaxe: respect --no-textconv + + diffcore-pickaxe: remove fill_one() + + diffcore-pickaxe: remove unnecessary call to get_textconv() + "git log -S/-G" started paying attention to textconv filter, but + there was no way to disable this. Make it honor --no-textconv + option. -* jk/rm-removed-paths (2013-04-04) 3 commits - (merged to 'next' on 2013-04-05 at ce9a926) - + t3600: document failure of rm across symbolic links - + t3600: test behavior of reverse-d/f conflict - + rm: do not complain about d/f conflicts during deletion +-------------------------------------------------- +[New Topics] - A handful of test cases and a corner case bugfix for "git rm". +* po/help-guides (2013-04-12) 1 commit + - help: mark common_guides[] as translatable + Finishing touches. + Will fast-track to 'master'. -* jk/set-upstream-error-cases (2013-04-02) 5 commits - (merged to 'next' on 2013-04-04 at b58c26b) - + branch: give advice when tracking start-point is missing - + branch: mention start_name in set-upstream error messages - + branch: improve error message for missing --set-upstream-to ref - + branch: factor out "upstream is not a branch" error messages - + t3200: test --set-upstream-to with bogus refs - The handing by "git branch --set-upstream-to" against various forms - of errorneous inputs was suboptimal and has been improved. +* ap/strbuf-humanize (2013-04-10) 2 commits + - count-objects: add -H option to humanize sizes + - strbuf: create strbuf_humanise_bytes() to show byte sizes + Teach "--human-readable" aka "-H" option to "git count-objects" to + show various large numbers in Ki/Mi/GiB scaled as necessary. -* mg/texinfo-5 (2013-04-03) 1 commit - (merged to 'next' on 2013-04-04 at bd84440) - + Documentation: Strip texinfo anchors to avoid duplicates + Will merge to 'next'. - Strip @anchor elements in the texinfo output of the documentation, - as a single document created by concatenating our entire manual set - will produce many duplicates that makes newer texinfo unhappy. + It may not be a bad idea to discard mc/count-objects-kibibytes, + which can introduce regression to scripted users that expect the + output to say "N kilobytes". Opinions? -* mm/status-during-revert (2013-04-02) 2 commits - (merged to 'next' on 2013-04-04 at 1282528) - + status: show commit sha1 in "You are currently reverting" message - + status: show 'revert' state and status hint +* as/clone-reference-with-gitfile (2013-04-09) 2 commits + - clone: Allow repo using gitfile as a reference + - clone: Fix error message for reference repository - "git status" learned to report that you are in the middle of a - revert session, just like it does for a cherry-pick and a bisect - session. + "git clone" did not work if a repository pointed at by the + "--reference" option is a gitfile that points at another place. + Waiting for comments. -* rr/triangle (2013-04-02) 6 commits - (merged to 'next' on 2013-04-04 at 2d2c8ee) - + remote.c: introduce branch..pushremote - + remote.c: introduce remote.pushdefault - + remote.c: introduce a way to have different remotes for fetch/push - + t5516 (fetch-push): drop implicit arguments from helper functions - + t5516 (fetch-push): update test description - + remote.c: simplify a bit of code using git_config_string() - Support "pull from one place, push to another place" workflow - better by introducing remote.pushdefault (overrides the "origin" - thing) and branch.*.pushremote (overrides the branch.*.remote). +* fc/transport-helper-error-reporting (2013-04-11) 3 commits + - transport-helper: improve push messages + - transport-helper: mention helper name when it dies + - transport-helper: report errors properly + Rerolled enough times. In-code comments may want to be further + extended to explain tricky parts, but seems to be ready otherwise. -* tb/shared-perm (2013-04-05) 2 commits - (merged to 'next' on 2013-04-05 at 2481155) - + path.c: optimize adjust_shared_perm() - + path.c: simplify adjust_shared_perm() + Will merge to 'next'. - Simplifies adjust_shared_perm() implementation. --------------------------------------------------- -[New Topics] +* jc/decorate (2013-04-07) 2 commits + - decorate: add "clear_decoration()" + - decorate: document API + (this branch is used by jc/gg.) -* fc/send-email-annotate (2013-04-07) 6 commits - - format-patch: trivial cleanups - - format-patch: add format.coverLetter configuration variable - - log: update to OPT_BOOL - - format-patch: refactor branch name calculation - - format-patch: improve head calculation for cover-letter - - send-email: make annotate configurable + Will discard. -* jk/http-error-messages (2013-04-06) 9 commits - - http: drop http_error function - - remote-curl: die directly with http error messages - - http: re-word http error message - - http: simplify http_error helper function - - remote-curl: consistently report repo url for http errors - - remote-curl: always show friendlier 404 message - - remote-curl: let servers override http 404 advice - - remote-curl: show server content on http errors - - http: add HTTP_KEEP_ERROR option +* jc/gg (2013-04-08) 3 commits + - commit: add get_commit_encoding() + - commit: rename parse_commit_date() + - commit: shrink "indegree" field + (this branch uses jc/decorate.) + Will discard. -* jk/show-branch-strbuf (2013-04-06) 1 commit - - show-branch: use strbuf instead of static buffer +* jk/doc-http-backend (2013-04-11) 2 commits + - doc/http-backend: give some lighttpd config examples + - doc/http-backend: clarify "half-auth" repo configuration -* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit - - bundle: Accept prerequisites without commit messages + Improve documentation to illustrate "push authenticated, fetch + anonymous" configuration for smart HTTP servers. + Will merge to 'next'. -* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits - - fmt-merge-msg: use core.commentchar in tag signatures completely - - fmt-merge-msg: respect core.commentchar in people credits + +* jk/gitweb-utf8 (2013-04-08) 4 commits + - gitweb: Fix broken blob action parameters on blob/commitdiff pages + - gitweb: Don't append ';js=(0|1)' to external links + - gitweb: Make feed title valid utf8 + - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch + + Various fixes to gitweb. + + Waiting for a reroll after a review. + + +* jk/submodule-subdirectory-ok (2013-04-10) 2 commits + - submodule: drop the top-level requirement + - rev-parse: add --prefix option + + Allow various subcommands of "git submodule" to be run not from the + top of the working tree of the superproject. + + Waiting for comments. + + +* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit + - checkout: abbreviate hash in suggest_reattach + + Update the informational message when "git checkout" leaves the + detached head state. + + Will merge to 'next'. + + +* mv/sequencer-pick-error-diag (2013-04-11) 1 commit + - cherry-pick: make sure all input objects are commits + + "git cherry-pick $blob $tree" is diagnosed as a nonsense. + + Will merge to 'next'. + +* rs/empty-archive (2013-04-10) 1 commit + - t5004: fix issue with empty archive test and bsdtar + + Implementations of "tar" of BSD descend have found to have trouble + with reading an otherwise empty tar archive with pax headers and + causes an unnecessary test failure. + + Will merge to 'next'. + + +* th/t9903-symlinked-workdir (2013-04-11) 1 commit + - t9903: Don't fail when run from path accessed through symlink + + Will merge to 'next'. + + +* fc/completion (2013-04-12) 9 commits + - completion: small optimization + - completion: inline __gitcomp_1 to its sole callsite + - completion: get rid of compgen + - completion: add __gitcomp_nl tests + - SQUASH??? avoid referencing undefined positional vars??? + - completion: add new __gitcompadd helper + - completion: get rid of empty COMPREPLY assignments + - completion: trivial test improvement + - completion: add more cherry-pick options + + Looked mostly good. + + Will merge to 'next', after squashing the fix in. + + +* jk/daemon-user-doc (2013-04-12) 1 commit + - doc: clarify that "git daemon --user=" option does not export HOME=~user + + Will merge to 'next'. -------------------------------------------------- [Stalled] +* nd/pretty-formats (2013-04-01) 12 commits + - pretty: support %>> that steal trailing spaces + - pretty: support truncating in %>, %< and %>< + - pretty: support padding placeholders, %< %> and %>< + - pretty: add %C(auto) for auto-coloring on the next placeholder + - pretty: two phase conversion for non utf-8 commits + - utf8: keep NULs in reencode_string() + - pretty: get the correct encoding for --pretty:format=%e + - pretty: save commit encoding from logmsg_reencode if the caller needs it + - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences + - utf8.c: move display_mode_esc_sequence_len() for use by other functions + - pretty: share code between format_decoration and show_decorations + - pretty-formats.txt: wrap long lines + + A mixed bag of a bugfix and two fun enhancements on pretty formats + placeholder. + + Expecting a reroll. + + * jc/format-patch (2013-02-21) 2 commits - format-patch: --inline-single - format-patch: rename "no_inline" field @@ -173,10 +251,77 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* fc/remote-hg (2013-04-04) 13 commits +* fc/send-email-annotate (2013-04-07) 6 commits + - format-patch: trivial cleanups + - format-patch: add format.coverLetter configuration variable + - log: update to OPT_BOOL + - format-patch: refactor branch name calculation + - format-patch: improve head calculation for cover-letter + - send-email: make annotate configurable + + Looked basically OK to me. Comments? + + +* jk/http-error-messages (2013-04-06) 9 commits + (merged to 'next' on 2013-04-11 at 7a03981) + + http: drop http_error function + + remote-curl: die directly with http error messages + + http: re-word http error message + + http: simplify http_error helper function + + remote-curl: consistently report repo url for http errors + + remote-curl: always show friendlier 404 message + + remote-curl: let servers override http 404 advice + + remote-curl: show server content on http errors + + http: add HTTP_KEEP_ERROR option + + Improve error reporting from the http transfer clients. + + Will merge to 'master'. + + +* jk/show-branch-strbuf (2013-04-06) 1 commit + (merged to 'next' on 2013-04-11 at 7a20aa5) + + show-branch: use strbuf instead of static buffer + + "git show-branch" was not prepared to show a very long run of + ancestor operators e.g. foobar^2~2^2^2^2...^2~4 correctly. + + Will merge to 'master'. + + +* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit + (merged to 'next' on 2013-04-11 at bb9f869) + + bundle: Accept prerequisites without commit messages + + "git bundle" did not like a bundle created using a commit without + any message as its one of the prerequistes. + + Will merge to 'master'. + + +* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits + (merged to 'next' on 2013-04-11 at 6af638b) + + fmt-merge-msg: use core.commentchar in tag signatures completely + + fmt-merge-msg: respect core.commentchar in people credits + + The new core.commentchar configuration was not applied to a few + places. + + Will merge to 'master'. + + +* fc/remote-hg (2013-04-11) 21 commits + - remote-hg: activate graphlog extension for hg_log() + - remote-hg: fix bad file paths + - remote-hg: document location of stored hg repository + - remote-hg: fix bad state issue + - remote-hg: add 'insecure' option + - remote-hg: add simple mail test + - remote-hg: add basic author tests + - remote-hg: show more proper errors + - remote-hg: force remote push - remote-hg: push to the appropriate branch - remote-hg: update tags globally - - remote-hg: force remote push - remote-hg: update remote bookmarks - remote-hg: refactor export - remote-hg: split bookmark handling @@ -188,29 +333,9 @@ of the repositories listed at - remote-hg: add missing config variable in doc - remote-hg: trivial cleanups - The "forced push" may need to become optional behaviour. - Also the tip one was found faulty. - - Expecting a reroll. - - -* fc/transport-helper-waitpid (2013-04-07) 3 commits - - SQUASH??? - - transport-helper: check if remote helper is alive - - [EXPLAIN BETTER] run-command: add new check_command helper + Rerolled. - Waiting for a response to summarize what this topic is about here. - - -* js/rerere-forget-protect-against-NUL (2013-04-04) 2 commits - (merged to 'next' on 2013-04-05 at 426d4e2) - + rerere forget: do not segfault if not all stages are present - + rerere forget: grok files containing NUL - - A few bugfixes to "git rerere" working on corner case merge - conflicts. - - Will merge to 'master'. + Waiting for comments. * mc/count-objects-kibibytes (2013-04-03) 1 commit @@ -231,29 +356,19 @@ of the repositories listed at Will merge to 'master'. -* po/help-guides (2013-04-03) 5 commits - (merged to 'next' on 2013-04-04 at 3d99b28) - + doc: include --guide option description for "git help" - + help: mention -a and -g option, and 'git help ' usage. - + builtin/help.c: add list_common_guides_help() function - + builtin/help.c: add --guide option - + builtin/help.c: split "-a" processing into two - - "git help" learned "-g" option to show the list of guides just like - list of commands are given with "-a". - - Will merge to 'master'. - - -* jk/http-dumb-namespaces (2013-04-04) 1 commit +* jk/http-dumb-namespaces (2013-04-09) 1 commit - http-backend: respect GIT_NAMESPACE with dumb clients Allow smart-capable HTTP servers to be restricted via the GIT_NAMESPACE mechanism when talking with commit-walker clients (they already do so when talking with smart HTTP clients). + Will merge to 'next'. + + -* jl/submodule-mv (2013-04-03) 3 commits +* jl/submodule-mv (2013-04-11) 4 commits + - rm: delete .gitmodules entry of submodules removed from the work tree - Teach mv to update the path entry in .gitmodules for moved submodules - Teach mv to move submodules using a gitfile - Teach mv to move submodules together with their work trees @@ -266,22 +381,6 @@ of the repositories listed at nd/magic-pathspecs topic. -* sr/log-SG-no-textconv (2013-04-05) 6 commits - (merged to 'next' on 2013-04-05 at 7f06945) - + diffcore-pickaxe: unify code for log -S/-G - + diffcore-pickaxe: fix leaks in "log -S" and "log -G" - + diffcore-pickaxe: port optimization from has_changes() to diff_grep() - + diffcore-pickaxe: respect --no-textconv - + diffcore-pickaxe: remove fill_one() - + diffcore-pickaxe: remove unnecessary call to get_textconv() - - "git log -S/-G" started paying attention to textconv filter, but - there was no way to disable this. Make it honor --no-textconv - option. - - Will merge to 'master'. - - * tr/perl-keep-stderr-open (2013-04-04) 2 commits (merged to 'next' on 2013-04-07 at 04f737a) + t9700: do not close STDERR @@ -292,6 +391,8 @@ of the repositories listed at descriptor #2 for unrelated purpose, and error reporting code may write into them. + Will merge to 'master'. + * jc/detached-head-doc (2013-04-05) 1 commit - glossary: extend "detached HEAD" description @@ -300,60 +401,32 @@ of the repositories listed at * jk/diff-algo-finishing-touches (2013-04-05) 2 commits - - diff: allow unstuck arguments with --diff-algorithm - - git-merge(1): document diff-algorithm option to merge-recursive + (merged to 'next' on 2013-04-11 at af83b2b) + + diff: allow unstuck arguments with --diff-algorithm + + git-merge(1): document diff-algorithm option to merge-recursive "git diff --diff-algorithm algo" is also understood as "git diff - --diff-algorithm=algo". + --diff-algorithm=algo". Will merge to 'next'. * jk/diff-graph-submodule-summary (2013-04-05) 1 commit - - submodule: print graph output next to submodule log + (merged to 'next' on 2013-04-11 at 70dfa8d) + + submodule: print graph output next to submodule log Make "git diff --graph" work better with submodule log output. Will merge to 'next'. -* nd/pretty-formats (2013-04-01) 12 commits - - pretty: support %>> that steal trailing spaces - - pretty: support truncating in %>, %< and %>< - - pretty: support padding placeholders, %< %> and %>< - - pretty: add %C(auto) for auto-coloring on the next placeholder - - pretty: two phase conversion for non utf-8 commits - - utf8: keep NULs in reencode_string() - - pretty: get the correct encoding for --pretty:format=%e - - pretty: save commit encoding from logmsg_reencode if the caller needs it - - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences - - utf8.c: move display_mode_esc_sequence_len() for use by other functions - - pretty: share code between format_decoration and show_decorations - - pretty-formats.txt: wrap long lines - - A mixed bag of a bugfix and two fun enhancements on pretty formats - placeholder. - - Expecting a reroll. - - -* jk/merge-tree-added-identically (2013-03-27) 1 commit - - merge-tree: fix "same file added in subdir" - - We would most likely want to change things the other way around. - - Expecting a reroll. - - -* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit - (merged to 'next' on 2013-03-29 at f6a05ca) - + combine-diff: coalesce lost lines optimally +* jk/merge-tree-added-identically (2013-04-08) 1 commit + - merge-tree: don't print entries that match "local" - Attempts to minimize "diff -c/--cc" output by coalescing the same - lines removed from the parents better, but with an O(n^2) - complexity. + The resolution of some corner cases by "git merge-tree" were + inconsistent between top-of-the-tree and in a subdirectory. - Will cook in 'next' to see if people with real-world usage scream. + Will merge to 'next'. * kb/status-ignored-optim (2013-03-19) 8 commits @@ -485,7 +558,11 @@ of the repositories listed at Will cook in 'next' until Git 2.0. -* tr/line-log (2013-04-05) 7 commits +* tr/line-log (2013-04-12) 11 commits + - log -L: improve comments in process_all_files() + - log -L: store the path instead of a diff_filespec + - log -L: test merge of parallel modify/rename + - t4211: pass -M to 'git log -M -L...' test (merged to 'next' on 2013-04-05 at 5afb00c) + log -L: fix overlapping input ranges + log -L: check range set invariants when we look it up @@ -496,9 +573,6 @@ of the repositories listed at + Export rewrite_parents() for 'log -L' + Refactor parse_loc - Will merge down to 'master' - with warts and all, hoping they get fixed eventually in-tree. - * jc/push-2.0-default-to-simple (2013-04-03) 13 commits - push: switch default from "matching" to "simple" @@ -521,3 +595,13 @@ of the repositories listed at case. Will cook in 'next' until Git 2.0. + +-------------------------------------------------- +[Discarded] + +* fc/transport-helper-waitpid (2013-04-07) 3 commits + . SQUASH??? + . transport-helper: check if remote helper is alive + . [EXPLAIN BETTER] run-command: add new check_command helper + + fc/transport-helper-error-reporting supersedes this topic. -- 2.11.4.GIT