From: Junio C Hamano Date: Wed, 7 Apr 2010 23:59:06 +0000 (-0700) Subject: What's cooking (2010/04 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6425bf2e3556f515a9f1bffef376732a0933f170;p=thirdparty%2Fgit.git What's cooking (2010/04 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 878d8bdb2c..8a42e71e06 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Apr 2010, #02; Sun, 04) -X-master-at: 11766ca4a89ba960271e94281463d1b44654ca3b -X-next-at: c303c1b3242eaacf3f3c56ba3a93a3eba1aeb693 +Subject: What's cooking in git.git (Apr 2010, #03; Wed, 07) +X-master-at: 02125bcc41aed022ddcb5955935726e50d89b60e +X-next-at: 8b27e1648dab6f72ab9c25c9887380e679b5421d -What's cooking in git.git (Apr 2010, #02; Sun, 04) +What's cooking in git.git (Apr 2010, #03; Wed, 07) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -14,118 +14,103 @@ still holding onto them. -------------------------------------------------- [Graduated to "master"] -* mg/mailmap-update (2010-03-19) 1 commit - (merged to 'next' on 2010-03-28 at 8ac3436) - + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela - -* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at 7e8e58e) - + send-email: lazily assign editor variable - -* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at d3e9f04) - + rev-list: use default abbrev length when abbrev-commit is in effect - -* rb/maint-python-path (2010-03-21) 1 commit - (merged to 'next' on 2010-03-28 at 58ba409) - + Correct references to /usr/bin/python which does not exist on FreeBSD - -* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at fbedd77) - + imap-send: Remove limitation on message body - -* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at bf02879) - + http-backend: Don't infinite loop during die() - -* bc/t5505-fix (2010-03-19) 3 commits - (merged to 'next' on 2010-03-28 at 1b097af) - + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob - + t5505: add missing && - + t5505: remove unnecessary subshell invocations - -* bw/template-tool-buildconfig (2010-03-20) 2 commits - (merged to 'next' on 2010-03-28 at 1e6fd8d) - + Modernize git calling conventions in hook templates - + Make templates honour SHELL_PATH and PERL_PATH - -* mb/rebase-i-no-ff (2010-03-24) 1 commit - (merged to 'next' on 2010-03-28 at b2c54cb) - + Teach rebase the --no-ff option. - -* jn/merge-diff3-label (2010-03-20) 14 commits - (merged to 'next' on 2010-03-20 at 26f1805) - + merge-recursive: add a label for ancestor - + cherry-pick, revert: add a label for ancestor - + revert: clarify label on conflict hunks - + compat: add mempcpy() - + checkout -m --conflict=diff3: add a label for ancestor - + merge_trees(): add ancestor label parameter for diff3-style output - + merge_file(): add comment explaining behavior wrt conflict style - + checkout --conflict=diff3: add a label for ancestor - + ll_merge(): add ancestor label parameter for diff3-style output - + merge-file --diff3: add a label for ancestor - + xdl_merge(): move file1 and file2 labels to xmparam structure - + xdl_merge(): add optional ancestor label to diff3-style output - + tests: document cherry-pick behavior in face of conflicts - + tests: document format of conflicts from checkout -m - (this branch is used by cc/revert-strategy.) - -* do/rebase-i-arbitrary (2010-03-14) 1 commit - (merged to 'next' on 2010-03-28 at 5ba9970) - + rebase--interactive: don't require what's rebased to be a branch - -* ja/send-email-ehlo (2010-03-14) 3 commits - (merged to 'next' on 2010-03-28 at 00964a8) - + git-send-email.perl - try to give real name of the calling host to HELO/EHLO - + git-send-email.perl: add option --smtp-debug - + git-send-email.perl: improve error message in send_message() - -* ak/everyday-git (2009-10-21) 1 commit - (merged to 'next' on 2010-03-28 at ae67548) - + everyday: fsck and gc are not everyday operations - -* bc/acl-test (2010-03-15) 5 commits - (merged to 'next' on 2010-03-28 at b40fa09) - + t/t1304: make a second colon optional in the mask ACL check - + t/t1304: set the ACL effective rights mask - + t/t1304: use 'test -r' to test readability rather than looking at mode bits - + t/t1304: set the Default ACL base entries - + t/t1304: avoid -d option to setfacl - -* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit - (merged to 'next' on 2010-03-28 at 305ad0b) - + daemon.c: avoid accessing ss_family member of struct sockaddr_storage - -* ef/cherry-abbrev (2010-03-20) 2 commits - (merged to 'next' on 2010-03-28 at eb3825c) - + ls: remove redundant logic - + cherry: support --abbrev option - -* gh/maint-stash-show-error-message (2010-03-16) 1 commit - (merged to 'next' on 2010-03-28 at 61a5643) - + Improve error messages from 'git stash show' - -* rs/threaded-grep-context (2010-03-15) 1 commit - (merged to 'next' on 2010-03-28 at 1934af1) - + grep: enable threading for context line printing +* sg/bash-completion (2010-02-23) 4 commits + (merged to 'next' on 2010-03-08 at bc59860) + + bash: completion for gitk aliases + + bash: support user-supplied completion scripts for aliases + + bash: support user-supplied completion scripts for user's git commands + + bash: improve aliased command recognition --------------------------------------------------- -[New Topics] +Nobody seems to care about "_git_frotz" that may potentially crash with +whatever random things the end users is doing in their environment, and +renaming them to "_git_complete_frotz" to avoid that. So let's not worry +about that. -* mh/status-optionally-refresh (2010-04-03) 3 commits - - t7508: add a test for "git status" in a read-only repository - - git status: refresh the index if possible - - t7508: add test for "git status" refreshing the index +* ic/bash-completion-rpm (2010-03-26) 1 commit + (merged to 'next' on 2010-04-02 at 0358304) + + RPM spec: include bash completion support + +* da/maint-python-startup (2010-03-27) 1 commit + (merged to 'next' on 2010-04-01 at ca6897a) + + Makefile: Remove usage of deprecated Python "has_key" method + +* jc/conflict-marker-size (2010-03-24) 1 commit + (merged to 'next' on 2010-04-01 at 164b1f4) + + diff --check: honor conflict-marker-size attribute + +* sb/fmt-merge-msg (2010-03-24) 7 commits + (merged to 'next' on 2010-04-01 at 5fcbec5) + + fmt-merge-msg: hide summary option + + fmt-merge-msg: remove custom string_list implementation + + string-list: add unsorted_string_list_lookup() + + fmt-merge-msg: use pretty.c routines + + t6200: test fmt-merge-msg more + + t6200: modernize with test_tick + + fmt-merge-msg: be quiet if nothing to merge + (this branch is used by jp/hold-sring-list-sanity.) + +* ef/maint-empty-commit-log (2010-03-21) 1 commit + (merged to 'next' on 2010-03-28 at aa103e5) + + rev-list: fix --pretty=oneline with empty message * jn/mailinfo-scissors (2010-04-03) 1 commit - - Teach mailinfo %< as an alternative scissors mark + (merged to 'next' on 2010-04-05 at 366435a) + + Teach mailinfo %< as an alternative scissors mark -* tr/word-diff (2010-04-04) 2 commits - - gitk: add the equivalent of diff --color-words - - diff: add --word-diff option that generalizes --color-words +* mg/notes-reflog (2010-03-29) 2 commits + (merged to 'next' on 2010-04-06 at 1b8066f) + + refs.c: Write reflogs for notes just like for branch heads + + t3301-notes: Test the creation of reflog entries + +-------------------------------------------------- +[New Topics] -The tip "gitk" one I'd prefer to wait until we get Ack from Paulus. +* eb/unpretty-b-format (2010-03-24) 1 commit + (merged to 'next' on 2010-04-07 at 7f5c112) + + Add `%B' in format strings for raw commit body in `git log' and friends + +* ne/rev-cache (2010-04-05) 7 commits + - graft awareness + - object name support + - integration into revision walker + - administrative api and tools + - support for non-commit objects + - basic api and porcelain + - man page and technical docs + +For some reason this was extremely hard to read, partly because it had too +many distracting style violations and too many long lines. I'll start +reading it later in the week when I find time to comment. + +* jp/hold-sring-list-sanity (2010-04-06) 6 commits + . string_list: Fix argument order for string_list_append + . string_list: Fix argument order for string_list_lookup + . string_list: Fix argument order for string_list_insert_at_index + . string_list: Fix argument order for string_list_insert + . string_list: Fix argument order for for_each_string_list + . string_list: Fix argument order for print_string_list + (this branch uses js/grep-open and sr/remote-helper-export.) + +Building this on top of slushy codebase is not a very promising endeavor. +Good thing to do, but bad timing. + +* ab/commit-empty-message (2010-04-06) 1 commit + (merged to 'next' on 2010-04-07 at 701e863) + + Add option to git-commit to allow empty log messages + +* jc/test-sleepless (2010-04-06) 1 commit + (merged to 'next' on 2010-04-07 at 8ccf40a) + + war on "sleep" in tests + +* jc/maint-reflog-expire-unreachable (2010-04-07) 2 commits + - reflog --expire-unreachable: a side note + - reflog --expire-unreachable: avoid merge-base computation + +* jc/doc-submit-gmail (2010-04-07) 1 commit + - SubmittingPatches: update GMail section + +* tc/maint-curl-helper (2010-04-08) 1 commit + - remote-curl: avoid double-slashes in HTTP requests -------------------------------------------------- [Stalled] @@ -139,22 +124,23 @@ moving forward. * js/grep-open (2010-03-26) 2 commits - grep -O: allow optional argument specifying the pager (or editor) - grep: Add the option '--open-files-in-pager' + (this branch is used by jp/hold-sring-list-sanity.) Probably needs to support --no-index mode as well. -* sd/log-decorate (2010-02-17) 3 commits - (merged to 'next' on 2010-03-08 at 58a6fba) - + log.decorate: usability fixes - + Add `log.decorate' configuration variable. - + git_config_maybe_bool() +* tr/word-diff (2010-04-04) 2 commits + - gitk: add the equivalent of diff --color-words + - diff: add --word-diff option that generalizes --color-words -Needs squelching the configuration setting when "--pretty=raw" is given, -at least, or possibly when any "--pretty" is explicitly given. +-------------------------------------------------- +[Cooking] -* np/malloc-threading (2010-03-24) 1 commit +* np/malloc-threading (2010-04-07) 2 commits + - Make xmalloc and xrealloc thread-safe (addendum) - Make xmalloc and xrealloc thread-safe -Still has locking issues? +Updated with Freku's "init_recursive_mutex()". The fix should eventually +go to 'maint' and 'master'. * js/async-thread (2010-03-09) 7 commits - Enable threaded async procedures whenever pthreads is available @@ -166,94 +152,73 @@ Still has locking issues? + Make report() from usage.c public as vreportf() and use it. + Modernize t5530-upload-pack-error. -Waiting for resolution of locking issues in malloc-threading. +Been waiting for resolution of locking issues in malloc-threading. --------------------------------------------------- -[Cooking] +* sd/log-decorate (2010-04-06) 4 commits + (merged to 'next' on 2010-04-06 at 992c9ad) + + log --pretty/--oneline: ignore log.decorate + (merged to 'next' on 2010-03-08 at 58a6fba) + + log.decorate: usability fixes + + Add `log.decorate' configuration variable. + + git_config_maybe_bool() -* sg/bash-completion (2010-02-23) 4 commits - (merged to 'next' on 2010-03-08 at bc59860) - + bash: completion for gitk aliases - + bash: support user-supplied completion scripts for aliases - + bash: support user-supplied completion scripts for user's git commands - + bash: improve aliased command recognition +I did the tip one myself. An extra set or two of eyeballs would be +appreciated. -Nobody seems to care about "_git_frotz" that may potentially crash with -whatever random things the end users is doing in their environment, and -renaming them to "_git_complete_frotz" to avoid that. So let's not worry -about that. +* mh/status-optionally-refresh (2010-04-03) 3 commits + (merged to 'next' on 2010-04-05 at 0e64aac) + + t7508: add a test for "git status" in a read-only repository + + git status: refresh the index if possible + + t7508: add test for "git status" refreshing the index * cw/ws-indent-with-tab (2010-04-03) 6 commits - - whitespace: tests for git-apply --whitespace=fix with tab-in-indent - - whitespace: add tab-in-indent support for --whitespace=fix - - whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst - - whitespace: tests for git-diff --check with tab-in-indent error class - - whitespace: add tab-in-indent error class - - whitespace: we cannot "catch all errors known to git" anymore - -Looked sensible. - -* ic/bash-completion-rpm (2010-03-26) 1 commit - (merged to 'next' on 2010-04-02 at 0358304) - + RPM spec: include bash completion support - -This is needed in 'master' by -rc1 at the latest. - -* mg/notes-reflog (2010-03-29) 2 commits - - refs.c: Write reflogs for notes just like for branch heads - - t3301-notes: Test the creation of reflog entries - -Implementation is trivially correct; I am unsure if "notes" tree wants -reflog in the first place, though. Please convince me and I'll move it -to 'next' soon, aiming for -rc0 or -rc1 at the latest. - -* rr/remote-helper-doc (2010-03-28) 2 commits - - Documentation/remote-helpers: Fix some typos + (merged to 'next' on 2010-04-05 at 5b5e579) + + whitespace: tests for git-apply --whitespace=fix with tab-in-indent + + whitespace: add tab-in-indent support for --whitespace=fix + + whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst + + whitespace: tests for git-diff --check with tab-in-indent error class + + whitespace: add tab-in-indent error class + + whitespace: we cannot "catch all errors known to git" anymore + +* rr/remote-helper-doc (2010-04-07) 3 commits + - Documentation/remote-helpers: Add invocation section + - Documentation/urls: Rewrite to accomodate ::
- Documentation/remote-helpers: Rewrite description -Although I lost track of this series with too rapid succession of -updates, intermixed with some documentation updates in the related -areas, my impression is that area experts haven't Acked them yet. - * sr/remote-helper-export (2010-03-29) 7 commits - - remote-helpers: add tests for testgit helper - - remote-helpers: add testgit helper - - remote-helpers: add support for an export command - - remote-helpers: allow requesing the path to the .git directory - - fast-import: always create marks_file directories - - clone: also configure url for bare clones - - clone: pass the remote name to remote_get - -May merge to 'next', but I would prefer waiting til 1.7.2 to have -this with a confidence than fast-tracking it. + (merged to 'next' on 2010-04-07 at 5651307) + + remote-helpers: add tests for testgit helper + + remote-helpers: add testgit helper + + remote-helpers: add support for an export command + + remote-helpers: allow requesing the path to the .git directory + + fast-import: always create marks_file directories + + clone: also configure url for bare clones + + clone: pass the remote name to remote_get + (this branch is used by jp/hold-sring-list-sanity.) * cc/revert-strategy (2010-03-31) 5 commits - - revert: add "--strategy" option to choose merge strategy - - merge: make function try_merge_command non static - - merge: refactor code that calls "git merge-STRATEGY" - - revert: refactor merge recursive code into its own function - - revert: use strbuf to refactor the code that writes the merge message + (merged to 'next' on 2010-04-05 at 50909c1) + + revert: add "--strategy" option to choose merge strategy + + merge: make function try_merge_command non static + + merge: refactor code that calls "git merge-STRATEGY" + + revert: refactor merge recursive code into its own function + + revert: use strbuf to refactor the code that writes the merge message -May merge to 'next' soon, but this is more about debugging and we are not -in a great hurry. +This is more about debugging and we are not in a great hurry. * mr/gitweb-jsmin (2010-04-02) 6 commits - - gitweb: update INSTALL to use shorter make target - - gitweb: add documentation to INSTALL regarding gitweb.js - - instaweb: add minification awareness - - Gitweb: add autoconfigure support for minifiers - - Gitweb: add support for minifying gitweb.css - - Gitweb: add ignore and clean rules for minified files - -Soon in 'next', to iron out leftover issues if any. + (merged to 'next' on 2010-04-05 at 5ad036c) + + gitweb: update INSTALL to use shorter make target + + gitweb: add documentation to INSTALL regarding gitweb.js + + instaweb: add minification awareness + + Gitweb: add autoconfigure support for minifiers + + Gitweb: add support for minifying gitweb.css + + Gitweb: add ignore and clean rules for minified files * sc/http-late-auth (2010-04-01) 1 commit (merged to 'next' on 2010-04-02 at c991acf) + Prompt for a username when an HTTP request 401s -I would prefer waiting til 1.7.2 to have this with a confidence than -fast-tracking it. - * jk/cached-textconv (2010-04-01) 7 commits (merged to 'next' on 2010-04-02 at a023e3c) + diff: avoid useless filespec population @@ -264,47 +229,17 @@ fast-tracking it. + fix textconv leak in emit_rewrite_diff + fix const-correctness of write_sha1_file -I would prefer waiting til 1.7.2 to have this with a confidence than -fast-tracking it. +* ld/discovery-limit-to-fs (2010-04-04) 6 commits + - write-index: check and warn when worktree crosses a filesystem boundary + (merged to 'next' on 2010-04-07 at 11ea09a) + + Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM + + GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries + + Add support for GIT_ONE_FILESYSTEM + + truncate cwd string before printing error message + + config.c: remove static keyword from git_env_bool() -* da/maint-python-startup (2010-03-27) 1 commit - (merged to 'next' on 2010-04-01 at ca6897a) - + Makefile: Remove usage of deprecated Python "has_key" method - -Hopefully will merge to 'master' by -rc0. - -* jc/conflict-marker-size (2010-03-24) 1 commit - (merged to 'next' on 2010-04-01 at 164b1f4) - + diff --check: honor conflict-marker-size attribute - -Hopefully will merge to 'master' by -rc0. - -* ld/discovery-limit-to-fs (2010-04-04) 4 commits - - GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries - - Add support for GIT_ONE_FILESYSTEM - - truncate cwd string before printing error message - - config.c: remove static keyword from git_env_bool() - -Linus made a good point of making this a default, and Erick Mattos -confirmed that it won't be a problem even on Windows. - -The tip one is my attempt to do just that, but I have a feeling that -it is introducing a double-negation. ONE-FILESYSTEM that defaults to -true but the user can flip it to false to trigger NOT-LIMITED-TO-ONE -semantics. Perhaps it should be renamed to GIT_DISCOVER_REPOSITORY_XDEV -or something that defaults to false. - -* sb/fmt-merge-msg (2010-03-24) 7 commits - (merged to 'next' on 2010-04-01 at 5fcbec5) - + fmt-merge-msg: hide summary option - + fmt-merge-msg: remove custom string_list implementation - + string-list: add unsorted_string_list_lookup() - + fmt-merge-msg: use pretty.c routines - + t6200: test fmt-merge-msg more - + t6200: modernize with test_tick - + fmt-merge-msg: be quiet if nothing to merge - -Hopefully will merge to 'master' by -rc0. +The tip one is a bit iffy; the whole series changes behaviour in a corner +case, and is not a 1.7.1 material. * pc/remove-warn (2010-03-26) 4 commits (merged to 'next' on 2010-04-02 at 52fc00d) @@ -315,12 +250,6 @@ Hopefully will merge to 'master' by -rc0. I cherry-picked only obviously sensible bits. -* ef/maint-empty-commit-log (2010-03-21) 1 commit - (merged to 'next' on 2010-03-28 at aa103e5) - + rev-list: fix --pretty=oneline with empty message - -Hopefully will merge to 'master' by -rc0. - * em/checkout-orphan (2010-03-21) 1 commit (merged to 'next' on 2010-03-28 at 86b6a4f) + git checkout: create unparented branch by --orphan @@ -329,16 +258,14 @@ Perhaps needs a bit of documentation updates, describing the "going open source" scenario. * ar/config-from-command-line (2010-03-26) 2 commits - - Use strbufs instead of open-coded string manipulation - - Allow passing of configuration parameters in the command line - -May merge to 'next', but I would prefer waiting til 1.7.2 to have -this with a confidence than fast-tracking it. + (merged to 'next' on 2010-04-07 at e50fd3a) + + Use strbufs instead of open-coded string manipulation + + Allow passing of configuration parameters in the command line -* nd/setup (2010-03-25) 43 commits +* nd/setup (2010-04-05) 43 commits - builtins: do not commit pager choice early - - builtins: reset startup_info->have_run_setup_gitdir when unsetting up repository - builtins: setup repository before print unknown command error + - t0001: Add test cases for "git init" with aliases - Guard unallowed access to repository when it's not set up - alias: keep repository found while collecting aliases as long as possible - Allow to undo setup_git_directory_gently() gracefully (and fix alias code) @@ -346,7 +273,7 @@ this with a confidence than fast-tracking it. - builtins: utilize startup_info->help where possible - run_builtin(): save "-h" detection result for later use - config: do not read .git/config if there is no repository - - apply: do not check sha1 when repository has not been found + - apply: do not check sha1 if there is no repository - Do not read .git/info/attributes if there is no repository - Do not read .git/info/exclude if there is no repository - git_config(): do not read .git/config if there is no repository @@ -364,7 +291,7 @@ this with a confidence than fast-tracking it. - merge-file: use RUN_SETUP_GENTLY - var: use RUN_SETUP_GENTLY - ls-remote: use RUN_SETUP_GENTLY - - help: use RUN_SETUP_GENTLY + - help: take note why this command is not applicable for RUN_SETUP_GENTLY - diff: use RUN_SETUP_GENTLY - bundle: use RUN_SETUP_GENTLY - apply: use RUN_SETUP_GENTLY @@ -380,21 +307,5 @@ this with a confidence than fast-tracking it. - builtin: Support RUN_SETUP_GENTLY to set up repository early if found - builtin: introduce startup_info struct --------------------------------------------------- -[Dropped] - -* cw/test-lib-relicense (2010-02-22) 1 commit - . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. - -I am hoping Carl or Michal Sojka can take the topic to completion without -my keeping an eye on it. Waiting for the one with full set of Acks. - -* hg/convert (2010-03-29) 5 commits - . convert: Added core.refilteronadd feature. - . convert: Inhibit contraction of foreign $Id$ during stats. - . convert: Use the enum constant SAFE_CRLF_FALSE. - . convert: Keep foreign $Id$ on checkout. - . convert: Safer handling of $Id$ contraction. - -The first two looked sensible but later one looked more like showing that -it may not have been a good idea in the first place. +Rerolled. I need to look at this series during the feature freeze so that +we can decide to (or not to) include it in 'next' early in post 1.7.1 cycle.