From 875fc311541f6361964239ced9c4d22534558044 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 10 Sep 2010 12:03:14 -0700 Subject: [PATCH] What's cooking (2010/09 #03) --- whats-cooking.txt | 503 +++++++++++++++++++--------------------------- 1 file changed, 211 insertions(+), 292 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 4c8f30c2b9..a71afe3bfa 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 (Sep 2010, #02; Mon, 6) -X-master-at: 4682693e9ccc04252d0fad6f5627fc056abcdbba -X-next-at: dbf0d4b6cc543fc5bf9b1b20149324fff6736c38 +Subject: What's cooking in git.git (Sep 2010, #03; Fri, 10) +X-master-at: 3b3a8ed4beadf5d9437597108355b23c7143bc81 +X-next-at: 6997c032819c723ef892e89b21b9bf245420086d -What's cooking in git.git (Sep 2010, #02; Mon, 6) +What's cooking in git.git (Sep 2010, #03; Fri, 10) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -11,229 +11,104 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -There are a few leftover bits in 'next' that need to be merged to 'master' -before we declare a real -rc cycle, so tonight's pushout is -rc0. +We have in 'master' is more-or-less the final 1.7.3; it is tagged as rc1. + +Please give it a good beating to find regressions. -------------------------------------------------- -[Graduated to "master"] +[New Topics] + +* jl/fix-test (2010-09-07) 7 commits + (merged to 'next' on 2010-09-10 at 849b1bb) + + t1020: Get rid of 'cd "$HERE"' at the start of each test + + t2016 (checkout -p): add missing && + + t1302 (core.repositoryversion): style tweaks + + t2105 (gitfile): add missing && + + t1450 (fsck): remove dangling objects + + tests: subshell indentation stylefix + + Merge branch 'jl/maint-fix-test' + (this branch uses jl/maint-fix-test.) + +* jl/maint-fix-test (2010-09-06) 1 commit + + Several tests: cd inside subshell instead of around + (this branch is used by jl/fix-test.) + +* nd/index-doc (2010-09-06) 1 commit + (merged to 'next' on 2010-09-10 at 2ab8572) + + doc: technical details about the index file format + +Half-written but it is a good start. + +* tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit + - send-email: Refuse to send cover-letter template subject + +* bc/describe-not-dirty-for-untracked-paths-in-submodule (2010-09-09) 1 commit + - builtin/describe.c: ignore untracked changes in submodules + +* bc/fortran-userdiff (2010-09-10) 1 commit + (merged to 'next' on 2010-09-10 at b76b831) + + userdiff.c: add builtin fortran regex patterns + +* en/rename-d-f (2010-09-08) 2 commits + - merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir + - t3509: Add rename + D/F conflict testcase that recursive strategy fails + +* jk/read-tree-empty (2010-09-10) 1 commit + (merged to 'next' on 2010-09-10 at 2f3a995) + + read-tree: deprecate syntax without tree-ish args -* ab/compat-regex (2010-08-26) 9 commits - (merged to 'next' on 2010-08-26 at c5cc9d2) - + Fix compat/regex ANSIfication on MinGW - (merged to 'next' on 2010-08-22 at 40bce7c) - + autoconf: regex library detection typofix - (merged to 'next' on 2010-08-21 at 632d60f) - + autoconf: don't use platform regex if it lacks REG_STARTEND - + t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND - + compat/regex: get rid of old-style definition - + compat/regex: define out variables only used under RE_ENABLE_I18N - + 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 - -This may need a yet another fix-up for MinGW. - -* ab/test-2 (2010-08-30) 51 commits - (merged to 'next' on 2010-08-31 at 9d56f47) - + tests: factor HOME=$(pwd) in test-lib.sh - + test-lib: use subshell instead of cd $new && .. && cd $old - + tests: simplify "missing PREREQ" message - + 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 ../ - + test: Introduce $GIT_BUILD_DIR - (merged to 'next' on 2010-08-18 at f88bdb1) - + cvs tests: do not touch test CVS repositories shipped with source - + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite - + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite - + t/t7105-reset-patch.sh: Add a PERL prerequisite - + t/t9001-send-email.sh: convert setup code to tests - + t/t9001-send-email.sh: change from skip_all=* to prereq skip - + t/t9001-send-email.sh: Remove needless PROG=* assignment - + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip - + lib-patch-mode tests: change from skip_all=* to prereq skip - + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip - + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh - + t/Makefile: Create test-results dir for smoke target - + git-notes: Run partial expensive test everywhere - + t/t3300-funny-names: change from skip_all=* to prereq skip - + t/t3902-quoted: change from skip_all=* to prereq skip - + t/t4016-diff-quote: change from skip_all=* to prereq skip - + t/t5503-tagfollow: change from skip_all=* to prereq skip - + t/t7005-editor: change from skip_all=* to prereq skip - + t/t5705-clone-2gb: change from skip_all=* to prereq skip - + t/t1304-default-acl: change from skip_all=* to prereq skip - + t/README: Update "Skipping tests" to align with best practices - + t/t7800-difftool.sh: Skip with prereq on no PERL - + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4 - + t/t4004-diff-rename-symlink.sh: use three-arg - + tests: implicitly skip SYMLINKS tests using - + Makefile: make gcov invocation configurable - + t/README: Add a note about the dangers of coverage chasing - + t/README: A new section about test coverage - + Makefile: Add cover_db_html target - + Makefile: Add cover_db target - + Makefile: Split out the untested functions target - + Makefile: Include subdirectories in "make cover" reports - + gitignore: Ignore files generated by "make coverage" - + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target - + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh - + t/README: Document the Smoke testing - + tests: Infrastructure for Git smoke testing - + test-lib: Multi-prereq support only checked the last prereq - + tests: A SANITY test prereq for testing if we're root - + t/README: Document the predefined test prerequisites - + test-lib: Print missing prerequisites in test output - + test-lib: Add support for multiple test prerequisites - + test-lib: Don't write test-results when HARNESS_ACTIVE - -* cb/maint-mergetool-no-tty (2010-08-20) 1 commit - (merged to 'next' on 2010-08-26 at b14989a) - + mergetool: Remove explicit references to /dev/tty - -* eb/double-convert-before-merge (2010-07-02) 3 commits - + Don't expand CRLFs when normalizing text during merge - + Try normalizing files to avoid delete/modify conflicts when merging - + Avoid conflicts when merging branches with mixed normalization - (this branch is used by jf/merge-ignore-ws and jn/merge-renormalize.) - -* jc/maint-doc-em-dash (2010-08-23) 1 commit - (merged to 'next' on 2010-08-24 at 2e4d30b) - + Work around em-dash handling in newer AsciiDoc - -* jl/submodule-ignore-diff (2010-08-28) 3 commits - (merged to 'next' on 2010-08-31 at 4f21f92) - + checkout: Use submodule.*.ignore settings from .git/config and .gitmodules - + checkout: Add test for diff.ignoreSubmodules - (merged to 'next' on 2010-08-26 at af1c819) - + checkout: respect diff.ignoreSubmodules setting - -* jn/apply-filename-with-sp (2010-08-18) 3 commits - (merged to 'next' on 2010-08-26 at 4f60840) - + apply: handle traditional patches with space in filename - + tests: exercise "git apply" with weird filenames - + apply: split quoted filename handling into new function - -* jn/doc-backslash (2010-08-20) 17 commits - (merged to 'next' on 2010-08-23 at 8c364b2) - + Documentation: remove stray backslash in show-branch discussion - + Documentation: remove stray backslashes from "Fighting regressions" article - + Documentation: do not convert ... operator to ellipses - + Documentation: avoid stray backslash in user manual - + Documentation: avoid stray backslashes in core tutorial - + Documentation: remove stray backslashes in rev-parse manual - + Documentation: remove backslash before ~ in fast-import manual - + Documentation: remove stray backslash from "git bundle" manual - + Documentation/technical: avoid stray backslash in parse-options API docs - + Documentation: remove backslashes in manpage synopses - + Documentation: clarify quoting in gitignore docs - + Documentation: clarify quoting in "git rm" example - + Documentation: add missing quotes to "git grep" examples - + Documentation: clarify quoting in "git add" example - + Documentation: unbreak regex in show-ref manual - + Documentation: quoting trouble in "git rm" discussion - + Documentation: tweak description of log.date - -* jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits - (merged to 'next' on 2010-08-26 at e9084af) - + docs: fix Makefile dependency for user manual - + Documentation: set a !DOCTYPE for user manual - -* jn/merge-custom-no-trivial (2010-08-23) 3 commits - (merged to 'next' on 2010-08-24 at d9e5b2d) - + t7606: Avoid using head as a file name - (merged to 'next' on 2010-08-21 at 674498b) - + merge: let custom strategies intervene in trivial merges - + t7606 (merge-theirs): modernize style - -* jn/merge-renormalize (2010-08-05) 12 commits - (merged to 'next' on 2010-08-18 at d9aa77b) - + merge-recursive --renormalize - + rerere: never renormalize - + rerere: migrate to parse-options API - + t4200 (rerere): modernize style - + ll-merge: let caller decide whether to renormalize - + ll-merge: make flag easier to populate - + Documentation/technical: document ll_merge - + merge-trees: let caller decide whether to renormalize - + merge-trees: push choice to renormalize away from low level - + t6038 (merge.renormalize): check that it can be turned off - + t6038 (merge.renormalize): try checkout -m and cherry-pick - + t6038 (merge.renormalize): style nitpicks - (this branch is used by jf/merge-ignore-ws and jf/merge-ignore-ws; uses eb/double-convert-before-merge.) - -* jn/update-contrib-example-merge (2010-08-17) 24 commits - (merged to 'next' on 2010-08-21 at 41b5c4d) - + 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