From 1d0ee99c8287a0bab5fd202131f796d5a09be019 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 18 Aug 2010 15:26:02 -0700 Subject: [PATCH] What's cooking (2010/08 #04) --- whats-cooking.txt | 655 ++++++++++++++++++++++++++-------------------- 1 file changed, 365 insertions(+), 290 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 9857c30ab2..1afbb21b6d 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 (Aug 2010, #03; Sun, 15) -X-master-at: 3d045897585c4b1ca0dce6bb5a33331f1b48c2bf -X-next-at: f2a27ee4a32784537ae739b7c6668eec567dd60c +Subject: What's cooking in git.git (Aug 2010, #04; Wed, 18) +X-master-at: bd3a97a27a97485b130802d497214be312b737f9 +X-next-at: f88bdb1c315a588128fcf0b68cfd286e3e096110 -What's cooking in git.git (Aug 2010, #03; Sun, 15) +What's cooking in git.git (Aug 2010, #04; Wed, 18) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -12,78 +12,222 @@ marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -------------------------------------------------- -[New Topics] +[Graduated to "master"] -* ab/perl-install (2010-08-03) 1 commit - (merged to 'next' on 2010-08-14 at f2a27ee) - + perl/Makefile: Unset INSTALL_BASE when making perl.mak +* ab/report-corrupt-object-with-type (2010-06-10) 1 commit + (merged to 'next' on 2010-08-12 at 8a9e1d0) + + sha1_file: Show the the type and path to corrupt objects -* ab/test (2010-08-14) 6 commits - - t/Makefile: Create test-results dir for smoke target - - Merge branch 'ab/test-no-skip' - - Merge branch 'ab/test-coverage' - - Merge branch 'ab/test-smoke' - - Merge branch 'ab/test-prereq' - - Merge branch 'ab/omit-aggregate-test-result-under-tap-harness' - (this branch uses ab/omit-aggregate-test-result-under-tap-harness, ab/test-coverage, ab/test-no-skip, ab/test-prereq and ab/test-smoke.) +* ar/string-list-foreach (2010-07-03) 2 commits + (merged to 'next' on 2010-08-11 at 993dc02) + + Convert the users of for_each_string_list to for_each_string_list_item macro + + Add a for_each_string_list_item macro + (this branch is used by tf/string-list-init.) -All the test-related topics seem to be almost ready for 'next', so I made -a single aggregate of them in preparation for merging (there is one fix-up -already still on 'pu', which is good). +* cc/find-commit-subject (2010-07-22) 6 commits + (merged to 'next' on 2010-08-12 at ce38436) + + blame: use find_commit_subject() instead of custom code + + merge-recursive: use find_commit_subject() instead of custom code + + bisect: use find_commit_subject() instead of custom code + + revert: rename variables related to subject in get_message() + + revert: refactor code to find commit subject in find_commit_subject() + + revert: fix off by one read when searching the end of a commit subject -* jc/maint-follow-rename-fix (2010-08-13) 2 commits +* jc/maint-follow-rename-fix (2010-08-15) 3 commits + (merged to 'next' on 2010-08-15 at 2f41ea8) + + log: test for regression introduced in v1.7.2-rc0~103^2~2 (merged to 'next' on 2010-08-14 at 16706d6) + diff --follow: do call diffcore_std() as necessary + diff --follow: do not waste cycles while recursing -* dj/fetch-tagopt (2010-08-11) 1 commit - - fetch: allow command line --tags to override config +* jh/clean-exclude (2010-07-20) 2 commits + (merged to 'next' on 2010-08-12 at 9a63fd4) + + Add test for git clean -e. + + Add -e/--exclude to git-clean. -* po/userdiff-csharp (2010-08-11) 1 commit - - Userdiff patterns for C# +* jh/graph-next-line (2010-07-13) 2 commits + (merged to 'next' on 2010-08-11 at 333f9df) + + Enable custom schemes for column colors in the graph API + + Make graph_next_line() available in the graph.h API --------------------------------------------------- -[Graduated to "master"] +* jh/use-test-must-fail (2010-07-20) 1 commit + (merged to 'next' on 2010-08-12 at 16d4e11) + + Convert "! git" to "test_must_fail git" + +* jl/submodule-ignore-diff (2010-08-06) 4 commits + (merged to 'next' on 2010-08-12 at ffe84bb) + + Add tests for the diff.ignoreSubmodules config option + + Add the 'diff.ignoreSubmodules' config setting + + Submodules: Use "ignore" settings from .gitmodules too for diff and status + + Submodules: Add the new "ignore" config option for diff and status + +* jn/fast-import-subtree (2010-06-30) 1 commit + (merged to 'next' on 2010-08-11 at 5e19de0) + + Teach fast-import to import subtrees named by tree id + +* jn/fix-abbrev (2010-07-27) 3 commits + (merged to 'next' on 2010-08-12 at 2cf70df) + + examples/commit: use --abbrev for commit summary + + checkout, commit: remove confusing assignments to rev.abbrev + + archive: abbreviate substituted commit ids again + +* jn/maint-plug-leak (2010-08-09) 3 commits + (merged to 'next' on 2010-08-14 at ec2ba20) + + write-tree: Avoid leak when index refers to an invalid object + + read-tree: stop leaking tree objects + + core: Stop leaking ondisk_cache_entrys -* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits - (merged to 'next' on 2010-08-11 at 59dd30e) - + Makefile: make hard/symbolic links for non-builtins too - + Makefile: link builtins residing in bin directory to main git binary too +* jn/rebase-rename-am (2008-11-10) 5 commits + (merged to 'next' on 2010-08-12 at a6d25c4) + + rebase: protect against diff.renames configuration + + t3400 (rebase): whitespace cleanup + + Teach "apply --index-info" to handle rename patches + + t4150 (am): futureproof against failing tests + + t4150 (am): style fix -* jc/sha1-name-find-fix (2010-08-02) 1 commit - (merged to 'next' on 2010-08-11 at 51106a5) - + sha1_name.c: fix parsing of ":/token" syntax +* kf/post-receive-sample-hook (2010-07-16) 1 commit + (merged to 'next' on 2010-08-12 at 9b7e3c9) + + post-receive-email: optional message line count limit -* jn/doc-pull (2010-08-02) 1 commit - (merged to 'next' on 2010-08-11 at a223479) - + Documentation: flesh out “git pull” description +I do not particularly like the idea of counting number of lines in a shell +loop but this is an opt-in feature to a contrib/ item so it should be ok. -* jn/maint-gitweb-dynconf (2010-07-30) 1 commit - (merged to 'next' on 2010-08-11 at a94ce85) - + gitweb: allow configurations that change with each request +* ml/rebase-x-strategy (2010-07-29) 1 commit + (merged to 'next' on 2010-08-12 at 0aa2fdb) + + rebase: support -X to pass through strategy options -* jn/parse-date-basic (2010-07-15) 1 commit - (merged to 'next' on 2010-08-11 at ca9fef0) - + Export parse_date_basic() to convert a date string to timestamp - (this branch is used by rr/svn-export.) +* tc/checkout-B (2010-08-10) 4 commits + (merged to 'next' on 2010-08-11 at 5433b51) + + builtin/checkout: handle -B from detached HEAD correctly + + builtin/checkout: learn -B + + builtin/checkout: reword hint for -b + + add tests for checkout -b -* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit - (merged to 'next' on 2010-08-11 at 0a6369e) - + smart-http: Don't deadlock on server failure +* tf/string-list-init (2010-07-04) 1 commit + (merged to 'next' on 2010-08-14 at 193b4db) + + string_list: Add STRING_LIST_INIT macro and make use of it. -Will merge to 'maint' later. +* tr/xsize-bits (2010-07-28) 1 commit + (merged to 'next' on 2010-08-11 at bcc0271) + + xsize_t: check whether we lose bits -* tr/rfc-reset-doc (2010-07-18) 5 commits - (merged to 'next' on 2010-08-11 at 8e7c8d1) - + Documentation/reset: move "undo permanently" example behind "make topic" - + Documentation/reset: reorder examples to match description - + Documentation/reset: promote 'examples' one section up - + Documentation/reset: separate options by mode - + Documentation/git-reset: reorder modes for soft-mixed-hard progression +* vs/doc-spell (2010-07-20) 1 commit + (merged to 'next' on 2010-08-12 at 3fbd06c) + + Documentation: spelling fixes + +-------------------------------------------------- +[New Topics] + +* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit + - reset: Better warning message on git reset --mixed + +Probably needs a "better" title; the commit shouldn't advertise itself +being "better" (or "clean" for that matter), but say what it changed and +leave it to the readers to judge if it is better. + +* cb/binary-patch-id (2010-08-15) 1 commit + - hash binary sha1 into patch id + +* jj/icase-directory (2010-08-16) 6 commits + - Support case folding in git fast-import when core.ignorecase=true + - Support case folding for git add when core.ignorecase=true + - Add case insensitivity support when using git ls-files + - Add case insensitivity support for directories when using git status + - Case insensitivity support for .gitignore via core.ignorecase + - Add string comparison functions that respect the ignore_case variable. + +Depends on GNU extension to fnmatch(3). + +* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits + - tests: fix syntax error in "Use advise() for hints" test + - cherry-pick/revert: Use advise() for hints + - cherry-pick/revert: Use error() for failure message + - Introduce advise() to print hints + - Eliminate “Finished cherry-pick/revert” message + (this branch uses cc/revert.) + +* jn/merge-custom-no-trivial (2010-08-15) 2 commits + - merge: let custom strategies intervene in trivial merges + - t7606 (merge-theirs): modernize style + +* po/etc-gitattributes (2010-08-16) 1 commit + - Add global and system-wide gitattributes + +* ab/compat-regex (2010-08-17) 5 commits + - autoconf: don't use platform regex if it lacks REG_STARTEND + - t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND + - Change regerror() declaration from K&R style to ANSI C (C89) + - compat/regex: get the gawk regex engine to compile within git + - compat/regex: use the regex engine from gawk for compat + +* ab/test-1 (2010-08-18) 5 commits + . t/t0000-basic.sh: Run the passing TODO test inside its own test-lib + . test-lib: Allow overriding of TEST_DIRECTORY + . test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ + . test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ + . Merge branch 'ab/i18n' into ab/test-1 + (this branch uses ab/i18n and ab/test.) + +Not merged to 'pu' as it seemed to have broken something. + +* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit + - submodule sync: Update "submodule..url" + +Looked reasonable; will merge to 'next' soonish. + +* jn/update-contrib-example-merge (2010-08-17) 25 commits + - mergetool: Skip autoresolved paths + - merge script: learn --[no-]rerere-autoupdate + - merge script: notice @{-1} shorthand + - merge script: handle --no-ff --no-commit correctly + - merge script: --ff-only to disallow true merge + - merge script: handle many-way octopus + - merge script: handle -m --log correctly + - merge script: forbid merge -s index + - merge script: allow custom strategies + - merge script: merge -X