diff --git a/whats-cooking.txt b/whats-cooking.txt index 1a53c713ad..b32a303c05 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,19 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Nov 2012, #08; Sun, 25) -X-master-at: e8a1f5a2ae53805986b1b965e036450bdfc0c460 -X-next-at: 9942e54037a4342f619d609da15329417569d00b +Subject: What's cooking in git.git (Nov 2012, #09; Wed, 28) +X-master-at: b7973fbbc3f8f72df352f4ef1a2ff325db92c36f +X-next-at: 0e4115f14e74f5bdd623ce876941a254499f6c9d -What's cooking in git.git (Nov 2012, #08; Sun, 25) +What's cooking in git.git (Nov 2012, #09; Wed, 28) -------------------------------------------------- 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 'maint' has been tagged as 1.8.0.1 with many fixes since -the 1.8.0 release. +Hopefully 1.8.1-rc0 preview will be tagged this weekend. Many +topics are marked to be cooked in 'next' during the feature freeze, +but some topics in flight should be in 'master' before -rc1 happens. You can find the changes described here in the integration branches of the repositories listed at @@ -20,54 +21,137 @@ repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] + +* bc/append-signed-off-by (2012-11-26) 11 commits + - Unify appending signoff in format-patch, commit and sequencer + - format-patch: update append_signoff prototype + - format-patch: stricter S-o-b detection + - t4014: more tests about appending s-o-b lines + - sequencer.c: teach append_signoff to avoid adding a duplicate newline + - sequencer.c: teach append_signoff how to detect duplicate s-o-b + - sequencer.c: always separate "(cherry picked from" from commit body + - sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer + - t/t3511: add some tests of 'cherry-pick -s' functionality + - t/test-lib-functions.sh: allow to specify the tag name to test_commit + - sequencer.c: remove broken support for rfc2822 continuation in footer + + Will merge to 'next'. + + +* er/doc-add-new-commands (2012-11-26) 1 commit + - Documentation: how to add a new command + + Will merge to 'next'. + + +* fc/send-email-no-sender-prompt (2012-11-26) 1 commit + - send-email: avoid questions when user has an ident + (this branch is used by jk/send-email-sender-prompt.) + + Will merge to 'next'. + + +* jl/submodule-rm (2012-11-23) 1 commit + (merged to 'next' on 2012-11-28 at 0e4115f) + + Teach rm to remove submodules when given with a trailing '/' + + Finishing touches to the topic already in 'master'. + Will merge to 'master'. + + +* km/send-email-remove-cruft-in-address (2012-11-26) 5 commits + - git-send-email: allow edit invalid email address + - git-send-email: ask what to do with an invalid email address + - git-send-email: remove invalid addresses earlier + - git-send-email: fix fallback code in extract_valid_address() + - git-send-email: remove garbage after email address + + Will merge to 'next'. + + +* mh/unify-xml-in-imap-send-and-http-push (2012-11-26) 8 commits + - wrap_in_html(): process message in bulk rather than line-by-line + - wrap_in_html(): use strbuf_addstr_xml_quoted() + - imap-send: change msg_data from storing (char *, len) to storing strbuf + - imap-send: correctly report errors reading from stdin + - imap-send: store all_msgs as a strbuf + - lf_to_crlf(): NUL-terminate msg_data::data + - xml_entities(): use function strbuf_addstr_xml_quoted() + - Add new function strbuf_add_xml_quoted() + + +* pw/p4-various-fixes (2012-11-26) 6 commits + - git p4: remove unneeded cmd initialization + - git p4: fix labelDetails typo in exception + - git p4 test: display unresolvable host error + - git p4: catch p4 errors when streaming file contents + - git p4: handle servers without move support + - git p4: catch p4 describe errors + + Will merge to 'next'. + + +* rr/t4041-cleanup (2012-11-27) 4 commits + - t4041 (diff-submodule-option): modernize style + - t4041 (diff-submodule-option): rewrite add_file() routine + - t4041 (diff-submodule-option): parse digests sensibly + - t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs + + As a clean-up, it still misses some. + + +* jc/doc-maintainer (2012-11-27) 1 commit + - update "howto maintain git" + + An early draft that is still incomplete. -* bc/do-not-recurse-in-die (2012-11-15) 1 commit - (merged to 'next' on 2012-11-18 at 79d62a8) - + usage.c: detect recursion in die routines and bail out immediately +* jc/doc-push-satellite (2012-11-27) 1 commit + - Documentation/git-push.txt: clarify the "push from satellite" workflow + + Will merge to 'next'. -* jh/update-ref-d-through-symref (2012-10-21) 2 commits - (merged to 'next' on 2012-11-19 at 6bcca4c) - + Fix failure to delete a packed ref through a symref - + t1400-update-ref: Add test verifying bug with symrefs in delete_ref() - "update-ref -d --deref SYM" to delete a ref through a symbolic ref - that points to it did not remove it correctly. +* jk/fsck-dot-in-trees (2012-11-28) 1 commit + - fsck: warn about '.' and '..' in trees + + Will merge to 'next'. -* lt/diff-stat-show-0-lines (2012-10-17) 1 commit - (merged to 'next' on 2012-11-19 at 0037290) - + Fix "git diff --stat" for interesting - but empty - file changes +* lt/diff-stat-show-0-lines (2012-11-27) 6 commits + - diff --shortstat: do not count "unmerged" entries + - diff --stat: do not count "unmerged" entries + - diff --stat: move the "total count" logic to the last loop + - diff --stat: use "file" temporary variable to refer to data->files[i] + - diff --stat: status of unmodified pair in diff-q is not zero + - test: add failing tests for "diff --stat" to t4049 - We failed to mention a file without any content change but whose - permission bit was modified, or (worse yet) a new file without any - content in the "git diff --stat" output. + Will merge to 'next'. -* mk/complete-tcsh (2012-11-16) 1 commit - (merged to 'next' on 2012-11-19 at 8309029) - + tcsh-completion re-using git-completion.bash +* mh/doc-remote-helpers (2012-11-27) 6 commits + - git-remote-helpers.txt: clarify options & ref list attributes + - git-remote-helpers.txt: clarify command <-> capability correspondences + - git-remote-helpers.txt: rearrange description of capabilities + - git-remote-helpers.txt: minor grammar fix + - git-remote-helpers.txt: document missing capabilities + - git-remote-helpers.txt: document invocation before input format + Need comment and Ack from people who have worked on remote-helpers + before this goes forward. -* nd/maint-compat-fnmatch-fix (2012-11-20) 1 commit - (merged to 'next' on 2012-11-21 at ce6fbe5) - + compat/fnmatch: fix off-by-one character class's length check +* mh/pthreads-autoconf (2012-11-27) 1 commit + - configure.ac: fix pthreads detection on Mac OS X -* rr/submodule-diff-config (2012-11-18) 4 commits - (merged to 'next' on 2012-11-19 at 355319e) - + submodule: display summary header in bold - + diff: rename "set" variable - + diff: introduce diff.submodule configuration variable - + Documentation: move diff.wordRegex from config.txt to diff-config.txt + Will merge to 'next'. - Lets "git diff --submodule=log" become the default via configuration. +* mk/complete-tcsh (2012-11-27) 1 commit + - Support for git aliasing for tcsh completion -* sg/complete-help-undup (2012-11-14) 1 commit - (merged to 'next' on 2012-11-18 at eadd0f3) - + completion: remove 'help' duplicate from porcelain commands + Will merge to 'next'. -------------------------------------------------- [Stalled] @@ -170,47 +254,6 @@ repositories listed at remote interface happy with this change? -* jk/send-email-sender-prompt (2012-11-15) 8 commits - - send-email: do not prompt for explicit repo ident - - Git.pm: teach "ident" to query explicitness - - var: provide explicit/implicit ident information - - var: accept multiple variables on the command line - - ident: keep separate "explicit" flags for author and committer - - ident: make user_ident_explicitly_given static - - t7502: factor out autoident prerequisite - - test-lib: allow negation of prerequisites - - Avoid annoying sender prompt in git-send-email, but only when it is - safe to do so. - - Perhaps keep only the first three patches, and replace the rest - with the one from Felipe that takes a much simpler approach (the - rationale of that patch needs to be cleaned up first, along the - lines Jeff outlined, though). Frozen until that happens. - - -* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit - - Unify appending signoff in format-patch, commit and sequencer - - I am not sure if the logic to refrain from adding a sign-off based - on the existing run of sign-offs is done correctly in this change. - - -* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits - . pretty: support %>> that steal trailing spaces - . pretty: support truncating in %>, %< and %>< - . pretty: support padding placeholders, %< %> and %>< - . pretty: two phase conversion for non utf-8 commits - . 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: support %C(auto[,N]) to turn on coloring on next placeholder(s) - . pretty: split parsing %C into a separate function - . pretty: share code between format_decoration and show_decorations - - This causes warnings with -Wuninitialized, so I've ejected it from pu - for the time being. - - * rc/maint-complete-git-p4 (2012-09-24) 1 commit (merged to 'next' on 2012-10-29 at af52cef) + Teach git-completion about git p4 @@ -276,7 +319,7 @@ repositories listed at Stalled mostly due to lack of responses. -* jc/doc-default-format (2012-10-07) 2 commits +* jc/doc-default-format (2012-11-26) 2 commits - [SQAUSH] allow "cd Doc* && make DEFAULT_DOC_TARGET=..." - Allow generating a non-default set of documentation @@ -323,48 +366,76 @@ repositories listed at "The first remote becomes the default" bit is better done as a separate step. +-------------------------------------------------- +[Cooking] * mh/ceiling (2012-10-29) 8 commits - - string_list_longest_prefix(): remove function - - setup_git_directory_gently_1(): resolve symlinks in ceiling paths - - longest_ancestor_length(): require prefix list entries to be normalized - - longest_ancestor_length(): take a string_list argument for prefixes - - longest_ancestor_length(): use string_list_split() - - Introduce new function real_path_if_valid() - - real_path_internal(): add comment explaining use of cwd - - Introduce new static function real_path_internal() + (merged to 'next' on 2012-11-26 at d1ce76a) + + string_list_longest_prefix(): remove function + + setup_git_directory_gently_1(): resolve symlinks in ceiling paths + + longest_ancestor_length(): require prefix list entries to be normalized + + longest_ancestor_length(): take a string_list argument for prefixes + + longest_ancestor_length(): use string_list_split() + + Introduce new function real_path_if_valid() + + real_path_internal(): add comment explaining use of cwd + + Introduce new static function real_path_internal() Elements of GIT_CEILING_DIRECTORIES list may not match the real pathname we obtain from getcwd(), leading the GIT_DIR discovery logic to escape the ceilings the user thought to have specified. --------------------------------------------------- -[Cooking] + Resurrected from Stalled; the earlier performance fear was + unwarranted. + + Will cook in 'next'. -* fc/fast-export-fixes (2012-11-21) 19 commits + +* jk/send-email-sender-prompt (2012-11-28) 7 commits + - t9001: check send-email behavior with implicit sender + - Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt + - t: add tests for "git var" + - ident: keep separate "explicit" flags for author and committer + - ident: make user_ident_explicitly_given static + - t7502: factor out autoident prerequisite + - test-lib: allow negation of prerequisites + (this branch uses fc/send-email-no-sender-prompt.) + + Resurrected only the internal clean-up part. + + Will merge to 'next'. + + +* fc/fast-export-fixes (2012-11-27) 25 commits + - fast-export: trivial cleanups + - fast-export: refactor get_tags_and_duplicates() + - fast-export: make extra_refs global + - transport-helper: fix push without marks + - transport-helper: fix pushing with straight refspec + - transport-helper: fix push without refspec + - transport-helper: trivial code shuffle + - [squash] earlier breakages in t5800 fixed by the previous - fast-export: don't handle uninteresting refs + - transport-helper: update remote helper namespace + - [squash] previous breaks t5800 - fast-export: make sure updated refs get updated - fast-export: fix comparison in tests - fast-export: trivial cleanup - - remote-testgit: advertise "done" feature and write "done" ourselves - - fixup! remote-testgit: report success after an import + - remote-testgit: implement the "done" feature manually - remote-testgit: report success after an import - - fixup! remote-testgit: exercise non-default refspec feature - - remote-testgit: exercise non-default refspec feature + - remote-testgit: exercise more features - remote-testgit: cleanup tests - remote-testgit: remove irrelevant test - - remote-testgit: remove non-local tests - - fixup! Add git-remote-testgit - - Add git-remote-testgit + - remote-testgit: remove non-local functionality + - Add new simplified git-remote-testgit - Rename git-remote-testgit to git-remote-testpy - remote-helpers: fix failure message - remote-testgit: fix direction of marks - - fixup! fast-export: avoid importing blob marks - fast-export: avoid importing blob marks - Replaced with the last re-roll posted to the list, queued with - various fixup! commits to record suggested changes (most are - trivial style fixes). + It needs a bit of re-roll or reorder to keep things bisectable, at + least, and with log message here and there to justify non-trivial + bits with something better than unsubstantiated "this is trivial" + claim. Overall, the series looked OK. * pp/gitweb-config-underscore (2012-11-21) 1 commit @@ -373,36 +444,42 @@ repositories listed at The key "gitweb.remote_heads" is not legal git config; this maps it to "gitweb.remoteheads". + Will merge to 'next'. + * jc/apply-trailing-blank-removal (2012-10-12) 1 commit - - apply.c:update_pre_post_images(): the preimage can be truncated + (merged to 'next' on 2012-11-26 at 3af69e7) + + apply.c:update_pre_post_images(): the preimage can be truncated Fix to update_pre_post_images() that did not take into account the possibility that whitespace fix could shrink the preimage and change the number of lines in it. - Will merge to 'next'. + Will cook in 'next'. -* nd/pathspec-wildcard (2012-11-19) 4 commits +* nd/pathspec-wildcard (2012-11-26) 4 commits - tree_entry_interesting: do basedir compare on wildcard patterns when possible - pathspec: apply "*.c" optimization from exclude - pathspec: do exact comparison on the leading non-wildcard part - pathspec: save the non-wildcard length part + Will merge to 'next'. + * mm/status-push-pull-advise (2012-11-16) 1 commit - - status: add advice on how to push/pull to tracking branch + (merged to 'next' on 2012-11-26 at ed40d5e) + + status: add advice on how to push/pull to tracking branch - Will merge to 'next'. + Will merge to 'master' in the seventh batch. * fc/zsh-completion (2012-11-19) 2 commits - - completion: start moving to the new zsh completion - - completion: add new zsh completion + (merged to 'next' on 2012-11-26 at 48ebdc9) + + completion: start moving to the new zsh completion + + completion: add new zsh completion - Replaced by shedding large changes to other independent topics. - Any comments from zsh users? + Will merge to 'master' in the seventh batch. * nd/wildmatch (2012-11-20) 14 commits @@ -448,30 +525,39 @@ repositories listed at itself, but I think that issue should be addressed in some other way (e.g. making sure individual tests in 9902 can be skipped). + Will merge to 'next'. + * jk/pickaxe-textconv (2012-10-28) 2 commits - - pickaxe: use textconv for -S counting - - pickaxe: hoist empty needle check + (merged to 'next' on 2012-11-26 at 2c5b5c9) + + pickaxe: use textconv for -S counting + + pickaxe: hoist empty needle check Use textconv filters when searching with "log -S". - Will merge to 'next'. - + Will merge to 'master' in the seventh batch. -* fc/remote-bzr (2012-11-08) 5 commits - (merged to 'next' on 2012-11-18 at 86add07) - + remote-bzr: update working tree - + remote-bzr: add support for remote repositories - + remote-bzr: add support for pushing - + remote-bzr: add simple tests - + Add new remote-bzr transport helper - New remote helper for bzr. +* fc/remote-bzr (2012-11-28) 10 commits + - (fixup) test-bzr.sh: fix multi-line string assignment + - remote-bzr: detect local repositories + - remote-bzr: add support for older versions of bzr + - remote-bzr: add support to push special modes + - remote-bzr: add support for fecthing special modes + - remote-bzr: add simple tests + - remote-bzr: update working tree + - remote-bzr: add support for remote repositories + - remote-bzr: add support for pushing + - Add new remote-bzr transport helper - Will merge to 'master' in the seventh batch. + New remote helper for bzr (v3). With minor fixes this may be ready + for 'next'. -* fc/remote-hg (2012-11-12) 20 commits +* fc/remote-hg (2012-11-27) 22 commits + (merged to 'next' on 2012-11-28 at f805784) + + remote-hg: fix for older versions of python + + remote-hg: fix for files with spaces (merged to 'next' on 2012-11-18 at 4a4f2e4) + remote-hg: avoid bad refs + remote-hg: try the 'tip' if no checkout present @@ -496,14 +582,45 @@ repositories listed at New remote helper for hg. - Will merge to 'master' in the seventh batch. + Will merge to 'master'. -* cr/push-force-tag-update (2012-11-19) 5 commits - - push: update remote tags only with force +* cr/push-force-tag-update (2012-11-26) 7 commits + - push: clarify rejection of update to non-commit-ish + - push: require force for annotated tags + - push: require force for refs under refs/tags/ - push: flag updates that require force - push: keep track of "update" state separately - push: add advice for rejected tag reference - push: return reject reasons via a mask Require "-f" for push to update a tag, even if it is a fast-forward. + + With a minor tweak, I think this is getting ready for 'next'. + +-------------------------------------------------- +[Discarded] + +* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit + . Unify appending signoff in format-patch, commit and sequencer + + I am not sure if the logic to refrain from adding a sign-off based + on the existing run of sign-offs is done correctly in this change. + + Brandon's series attempts the same thing and seemed to be more + cleanly done. + + +* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits + . pretty: support %>> that steal trailing spaces + . pretty: support truncating in %>, %< and %>< + . pretty: support padding placeholders, %< %> and %>< + . pretty: two phase conversion for non utf-8 commits + . 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: support %C(auto[,N]) to turn on coloring on next placeholder(s) + . pretty: split parsing %C into a separate function + . pretty: share code between format_decoration and show_decorations + + This causes warnings with -Wuninitialized, so I've ejected it from pu + for the time being.