From 24549c40bcf670335859604f8caa2560c5bbade1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 27 Dec 2011 15:01:42 -0800 Subject: [PATCH] What's cooking (2011/12 #09) --- whats-cooking.txt | 266 +++++++++++++++------------------------------- 1 file changed, 88 insertions(+), 178 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 4fcdf6c286..a6490565ec 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,20 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Dec 2011, #08; Thu, 22) -X-master-at: 5d6dfc7cb140a6eb90138334fab2245b69bc8bc4 -X-next-at: 7d1ccddcec7e93d27acda459c41e32851e845d51 +Subject: What's cooking in git.git (Dec 2011, #09; Tue, 27) +X-master-at: ec330158ec04849fe5ff2cb8749797cd63ae592b +X-next-at: 551ac8f4336eaa5d2cf05fd3dec4a3676b57379f -What's cooking in git.git (Dec 2011, #08; Thu, 22) +What's cooking in git.git (Dec 2011, #09; Tue, 27) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -The tip of 'master' is now feature complete for 1.7.9 so I could tag it as -the -rc0, but I'll let it simmer for several days to give people chance to -test over the holidays. +By now I know a bit better than taking the lack of serious regression +reports during the holiday weekend as a sign of perfection of the upcoming +release, but I will tag -rc0 soonish anyway. As far as I can see the tip +of 'master' is feature complete for 1.7.9, modulo possible bugs and +regressions. Here are the repositories that have my integration branches: @@ -42,9 +44,36 @@ The preformatted documentation in HTML and man format are found in: -------------------------------------------------- [New Topics] -* tr/doc-sh-setup (2011-12-20) 1 commit - (merged to 'next' on 2011-12-21 at bd73695) - + git-sh-setup: make require_clean_work_tree part of the interface +* jh/fetch-head-update (2011-12-27) 1 commit + - write first for-merge ref to FETCH_HEAD first + +Needs sign-off. I have squashed minimal fixes in. + +* jv/maint-config-set (2011-12-27) 1 commit + (merged to 'next' on 2011-12-27 at 551ac8f) + + Fix an incorrect reference to --set-all. + +Will merge to "master" before -rc0. + +* nd/index-pack-no-recurse (2011-12-27) 4 commits + - fixup! 3413d4d + - index-pack: eliminate unlimited recursion in get_delta_base() + - index-pack: eliminate recursion in find_unresolved_deltas + - Eliminate recursion in setting/clearing marks in commit list + +Expecting a reroll. + +* ss/git-svn-askpass (2011-12-27) 5 commits + - make askpass_prompt a global prompt method for asking users + - ignore empty *_ASKPASS variables + - honour *_ASKPASS for querying username and for querying further actions like unknown certificates + - switch to central prompt method + - add central method for prompting a user using GIT_ASKPASS or SSH_ASKPASS + +Expecting a reroll. + +-------------------------------------------------- +[Graduated to "master"] * ab/sun-studio-portability (2011-12-21) 3 commits (merged to 'next' on 2011-12-21 at 0cc5a63) @@ -52,157 +81,39 @@ The preformatted documentation in HTML and man format are found in: + Fix a bitwise negation assignment issue spotted by Sun Studio + Fix an enum assignment issue spotted by Sun Studio +* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits + (merged to 'next' on 2011-12-20 at b816812) + + gitweb: Fix fallback mode of to_utf8 subroutine + + gitweb: Output valid utf8 in git_blame_common('data') + + gitweb: esc_html() site name for title in OPML + + gitweb: Call to_utf8() on input string in chop_and_escape_str() + +* rr/revert-cherry-pick (2011-12-15) 6 commits + (merged to 'next' on 2011-12-21 at d0428dc) + + t3502, t3510: clarify cherry-pick -m failure + + t3510 (cherry-pick-sequencer): use exit status + + revert: simplify getting commit subject in format_todo() + + revert: tolerate extra spaces, tabs in insn sheet + + revert: make commit subjects in insn sheet optional + + revert: free msg in format_todo() + * tr/bash-read-unescaped (2011-12-21) 1 commit (merged to 'next' on 2011-12-21 at de865c1) + bash completion: use read -r everywhere -* jc/advise-i18n (2011-12-22) 1 commit - - i18n of multi-line advice messages - -Allow localization of advice messages that tend to be longer and -multi-line formatted. For now this is deliberately limited to advise() -interface and not vreportf() in general as touching the latter has -interactions with error() that has plumbing callers whose prefix "error: " -should never be translated. +* tr/doc-sh-setup (2011-12-20) 1 commit + (merged to 'next' on 2011-12-21 at bd73695) + + git-sh-setup: make require_clean_work_tree part of the interface --------------------------------------------------- -[Graduated to "master"] +* tr/pty-all (2011-12-19) 1 commit + (merged to 'next' on 2011-12-20 at 9b637d3) + + test-terminal: set output terminals to raw mode -* cn/maint-lf-to-crlf-filter (2011-12-16) 1 commit - (merged to 'next' on 2011-12-20 at 83d6f7c) - + lf_to_crlf_filter(): tell the caller we added "\n" when draining - (this branch is used by jc/maint-lf-to-crlf-keep-crlf.) - -A recent fix to the codepath was not quite correct. - -* ef/setenv-putenv (2011-12-14) 2 commits - (merged to 'next' on 2011-12-20 at 4845020) - + compat/setenv.c: error if name contains '=' - + compat/setenv.c: update errno when erroring out - (this branch is used by ef/x-setenv-putenv.) - -* jc/advice-doc (2011-12-18) 1 commit - (merged to 'next' on 2011-12-19 at 0b410e5) - + advice: Document that they all default to true - (this branch is used by jc/advise-push-default.) - -* jc/maint-lf-to-crlf-keep-crlf (2011-12-18) 1 commit - (merged to 'next' on 2011-12-20 at eee6eb3) - + lf_to_crlf_filter(): resurrect CRLF->CRLF hack - -The lf-to-crlf filter in the streaming checkout codepath forgot that we -try not to convert LF to CRLF if the repository data already has CRLF. - -* jc/request-pull-show-head-4 (2011-12-19) 2 commits - (merged to 'next' on 2011-12-19 at 771939b) - + request-pull: do not emit "tag" before the tagname - (merged to 'next' on 2011-12-16 at bea51ac) - + request-pull: update the "pull" command generation logic - -* jk/doc-fsck (2011-12-16) 1 commit - (merged to 'next' on 2011-12-20 at 70df8a4) - + docs: brush up obsolete bits of git-fsck manpage - -* jk/follow-rename-score (2011-12-16) 1 commit - (merged to 'next' on 2011-12-20 at 74db2a9) - + use custom rename score during --follow - -* jk/git-prompt (2011-12-12) 10 commits - (merged to 'next' on 2011-12-20 at 24aff90) - + contrib: add credential helper for OS X Keychain - + Makefile: OS X has /dev/tty - + Makefile: linux has /dev/tty - + credential: use git_prompt instead of git_getpass - + prompt: use git_terminal_prompt - + add generic terminal prompt function - + refactor git_getpass into generic prompt function - + move git_getpass to its own source file - + imap-send: don't check return value of git_getpass - + imap-send: avoid buffer overflow - -* jk/http-push-to-empty (2011-12-19) 1 commit - (merged to 'next' on 2011-12-19 at 845e2a1) - + remote-curl: don't pass back fake refs - -* jk/maint-do-not-feed-stdin-to-tests (2011-12-15) 1 commit - (merged to 'next' on 2011-12-20 at 43e83c5) - + test-lib: redirect stdin of tests - -* jk/maint-push-v-is-verbose (2011-12-17) 1 commit - (merged to 'next' on 2011-12-20 at b79f101) - + make "git push -v" actually verbose - -* jk/maint-strbuf-missing-init (2011-12-18) 2 commits - (merged to 'next' on 2011-12-20 at 72fa8ae) - + Update jk/maint-strbuf-missing-init to builtin/ rename - + commit, merge: initialize static strbuf - -* jk/pretty-reglog-ent (2011-12-16) 1 commit - (merged to 'next' on 2011-12-20 at 949b010) - + pretty: give placeholders to reflog identity - -* jn/test-cleanup-7006 (2011-12-14) 1 commit - (merged to 'next' on 2011-12-20 at 952f48f) - + test: errors preparing for a test are not special - -* mh/ref-api (2011-12-12) 16 commits - (merged to 'next' on 2011-12-15 at d65a830) - + add_ref(): take a (struct ref_entry *) parameter - + create_ref_entry(): extract function from add_ref() - + repack_without_ref(): remove temporary - + 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 - (this branch is used by mh/ref-api-rest.) - -Later part split out to expedite moving the earlier good bits forward. - -* nd/war-on-nul-in-commit (2011-12-15) 3 commits - (merged to 'next' on 2011-12-20 at d441111) - + commit_tree(): refuse commit messages that contain NULs - + Convert commit_tree() to take strbuf as message - + merge: abort if fails to commit - -* rs/diff-tree-combined-clean-up (2011-12-17) 3 commits - (merged to 'next' on 2011-12-20 at 265e049) - + submodule: use diff_tree_combined_merge() instead of diff_tree_combined() - + pass struct commit to diff_tree_combined_merge() - + use struct sha1_array in diff_tree_combined() - -* tr/grep-threading (2011-12-16) 3 commits - (merged to 'next' on 2011-12-20 at 1a852ef) - + grep: disable threading in non-worktree case - + grep: enable threading with -p and -W using lazy attribute lookup - + grep: load funcname patterns for -W +Kept only the second one from the original. -------------------------------------------------- [Stalled] -* pw/p4-docs-and-tests (2011-12-18) 11 commits - - git-p4: document and test submit options - - git-p4: test and document --use-client-spec - - git-p4: test --keep-path - - git-p4: test --max-changes - - git-p4: document and test --import-local - - git-p4: honor --changesfile option and test - - git-p4: document and test clone --branch - - git-p4: test cloning with two dirs, clarify doc - - git-p4: clone does not use --git-dir - - git-p4: test debug macro - - git-p4: introduce asciidoc documentation - -Waiting for a reroll. - * jc/advise-push-default (2011-12-18) 1 commit - push: hint to use push.default=upstream when appropriate @@ -268,30 +179,33 @@ At least pack-objects and fsck need to learn the new encoding for the series to be usable locally, and then index-pack/unpack-objects needs to learn it to be used remotely. --------------------------------------------------- -[Cooking] +* jc/advise-i18n (2011-12-22) 1 commit + - i18n of multi-line advice messages -* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits - (merged to 'next' on 2011-12-20 at b816812) - + gitweb: Fix fallback mode of to_utf8 subroutine - + gitweb: Output valid utf8 in git_blame_common('data') - + gitweb: esc_html() site name for title in OPML - + gitweb: Call to_utf8() on input string in chop_and_escape_str() +Allow localization of advice messages that tend to be longer and +multi-line formatted. For now this is deliberately limited to advise() +interface and not vreportf() in general as touching the latter has +interactions with error() that has plumbing callers whose prefix "error: " +should never be translated. -* tr/pty-all (2011-12-19) 1 commit - (merged to 'next' on 2011-12-20 at 9b637d3) - + test-terminal: set output terminals to raw mode +-------------------------------------------------- +[Cooking] -Kept only the second one from the original. +* pw/p4-docs-and-tests (2011-12-27) 11 commits + - git-p4: document and test submit options + - git-p4: test and document --use-client-spec + - git-p4: test --keep-path + - git-p4: test --max-changes + - git-p4: document and test --import-local + - git-p4: honor --changesfile option and test + - git-p4: document and test clone --branch + - git-p4: test cloning with two dirs, clarify doc + - git-p4: clone does not use --git-dir + - git-p4: introduce asciidoc documentation + - rename git-p4 tests -* rr/revert-cherry-pick (2011-12-15) 6 commits - (merged to 'next' on 2011-12-21 at d0428dc) - + t3502, t3510: clarify cherry-pick -m failure - + t3510 (cherry-pick-sequencer): use exit status - + revert: simplify getting commit subject in format_todo() - + revert: tolerate extra spaces, tabs in insn sheet - + revert: make commit subjects in insn sheet optional - + revert: free msg in format_todo() +Rorolled. +Not urgent. * jc/signed-commit (2011-11-29) 5 commits (merged to 'next' on 2011-12-21 at 8fcbf00) @@ -301,11 +215,7 @@ Kept only the second one from the original. + log: --show-signature + commit: teach --gpg-sign option -* jc/push-ignore-stale (2011-12-14) 2 commits - - push: --ignore-stale option - - set_ref_status_for_push(): use transport-flags abstraction - -Probably solving a wrong problem and encouraging a wrong workflow while at -it. jc/advise-push-default might be a better approach. +I am ambivalent on this one. I do not desperately need it myself, I know +the kernel folks do not, I heard some other people might. -Will drop. +Opinions? -- 2.47.3