From ae619fc723ae063ec7e79785fcba9d4d63a310e2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Sep 2010 00:32:01 -0700 Subject: [PATCH] What's cooking (2010/09 #02) --- whats-cooking.txt | 641 ++++++++++++++++------------------------------ 1 file changed, 222 insertions(+), 419 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index b652245c63..4c8f30c2b9 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, #01; Wed, 1) -X-master-at: 7e42332e476a6f47ccc5a62cc8b93bcb4d758f7c -X-next-at: a0aa1d989c889829c2f1571f9c7760a8b2fda6b9 +Subject: What's cooking in git.git (Sep 2010, #02; Mon, 6) +X-master-at: 4682693e9ccc04252d0fad6f5627fc056abcdbba +X-next-at: dbf0d4b6cc543fc5bf9b1b20149324fff6736c38 -What's cooking in git.git (Sep 2010, #01; Wed, 1) +What's cooking in git.git (Sep 2010, #02; Mon, 6) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -11,162 +11,27 @@ 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. -As I didn't want to worry about the early parts of ab/i18n topic, which -was accidentally merged to 'next' due to my lazyness (another topic, -ab/test, seemed to be ready for the upcoming release, but a patch to that -topic had interaction with ab/i18n, which made ab/test unmergeable to -'master' without dragging 'ab/i18n'), I reverted ab/i18n topic from 'next' -and merged a rebuilt ab/test topic to 'next'. The i18n topic is merged -to 'pu'. - -I am hoping to tag -rc0 for the 1.7.3 release this weekend. +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. -------------------------------------------------- [Graduated to "master"] -* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit - (merged to 'next' on 2010-08-21 at b09ee46) - + reset: suggest what to do upon "git reset --mixed " +* 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 -* cb/binary-patch-id (2010-08-15) 1 commit - (merged to 'next' on 2010-08-21 at ff38c3e) - + hash binary sha1 into patch id - -* cc/revert (2010-07-21) 5 commits - (merged to 'next' on 2010-08-14 at a910d5a) - + t3508: add check_head_differs_from() helper function and use it - + revert: improve success message by adding abbreviated commit sha1 - + revert: don't print "Finished one cherry-pick." if commit failed - + revert: refactor commit code into a new run_git_commit() function - + revert: report success when using option --strategy - (this branch is used by jn/cherry-revert-message-clean-up.) - -* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit - (merged to 'next' on 2010-08-21 at e96772a) - + submodule sync: Update "submodule..url" - -* dj/fetch-tagopt (2010-08-11) 1 commit - (merged to 'next' on 2010-08-21 at 737dfec) - + fetch: allow command line --tags to override config - -* en/d-f-conflict-fix (2010-08-20) 12 commits - (merged to 'next' on 2010-08-20 at af7f2b0) - + merge-recursive: Avoid excessive output for and reprocessing of renames - (merged to 'next' on 2010-08-18 at 6be0f13) - + merge-recursive: Fix multiple file rename across D/F conflict - + t6031: Add a testcase covering multiple renames across a D/F conflict - + merge-recursive: Fix typo - (merged to 'next' on 2010-08-14 at 1c9b0f5) - + Mark tests that use symlinks as needing SYMLINKS prerequisite - (merged to 'next' on 2010-08-03 at 7f78604) - + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test - + fast-import: Improve robustness when D->F changes provided in wrong order - + fast-export: Fix output order of D/F changes - + merge_recursive: Fix renames across paths below D/F conflicts - + merge-recursive: Fix D/F conflicts - + Add a rename + D/F conflict testcase - + Add additional testcases for D/F conflicts - -* en/fast-export-fix (2010-07-17) 2 commits - (merged to 'next' on 2010-08-18 at 9fdaf27) - + fast-export: Add a --full-tree option - + fast-export: Fix dropping of files with --import-marks and path limiting - -* hv/autosquash-config (2010-07-14) 1 commit - (merged to 'next' on 2010-08-18 at 03a8eec) - + add configuration variable for --autosquash option of interactive rebase - -* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits - (merged to 'next' on 2010-08-21 at 09b123c) - + 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/maint-setup-fix (2010-07-24) 11 commits - (merged to 'next' on 2010-08-18 at ded5f4d) - + setup: split off a function to handle ordinary .git directories - + Revert "rehabilitate 'git index-pack' inside the object store" - + setup: do not forget working dir from subdir of gitdir - + t4111 (apply): refresh index before applying patches to it - + setup: split off get_device_or_die helper - + setup: split off a function to handle hitting ceiling in repo search - + setup: split off code to handle stumbling upon a repository - + setup: split off a function to checks working dir for .git file - + setup: split off $GIT_DIR-set case from setup_git_directory_gently - + tests: try git apply from subdir of toplevel - + t1501 (rev-parse): clarify - (this branch is used by jn/paginate-fix.) - -* jn/paginate-fix (2010-08-16) 14 commits - (merged to 'next' on 2010-08-18 at bb04a13) - + t7006 (pager): add missing TTY prerequisites - + merge-file: run setup_git_directory_gently() sooner - + var: run setup_git_directory_gently() sooner - + ls-remote: run setup_git_directory_gently() sooner - + index-pack: run setup_git_directory_gently() sooner - + Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix - + config: run setup_git_directory_gently() sooner - + bundle: run setup_git_directory_gently() sooner - + apply: run setup_git_directory_gently() sooner - + grep: run setup_git_directory_gently() sooner - + shortlog: run setup_git_directory_gently() sooner - + git wrapper: allow setup_git_directory_gently() be called earlier - + setup: remember whether repository was found - + git wrapper: introduce startup_info struct - (this branch uses jn/maint-setup-fix.) - -* jn/svn-fe (2010-08-19) 17 commits - (merged to 'next' on 2010-08-19 at b1a242a) - + t/t9010-svn-fe.sh: add an +x bit to this test - (merged to 'next' on 2010-08-18 at 24ab19e) - + t9010 (svn-fe): avoid symlinks in test - + t9010 (svn-fe): use Unix-style path in URI - + vcs-svn: Avoid %z in format string - + vcs-svn: Rename dirent pool to build on Windows - + compat: add strtok_r() - + treap: style fix - + vcs-svn: remove build artifacts on "make clean" - + svn-fe manual: Clarify warning about deltas in dump files - + Update svn-fe manual - + SVN dump parser - + Infrastructure to write revisions in fast-export format - + Add stream helper library - + Add string-specific memory pool - + Add treap implementation - + Add memory pool library - + Introduce vcs-svn lib - -* np/maint-huge-delta-generation (2010-08-21) 1 commit - (merged to 'next' on 2010-08-21 at 5af7003) - + fix >4GiB source delta assertion failure - -* sg/rerere-gc-old-still-used (2010-07-13) 2 commits - (merged to 'next' on 2010-08-18 at 8bc4635) - + rerere: fix overeager gc - + mingw_utime(): handle NULL times parameter - -* tr/maint-no-unquote-plus (2010-07-24) 1 commit - (merged to 'next' on 2010-08-18 at b811248) - + Do not unquote + into ' ' in URLs - -I think this one is safe in the context of git (namely smart-http -interface). - --------------------------------------------------- -[New Topics] - -* ch/filter-branch-deprecate-remap-to-ancestor (2010-08-27) 1 commit - - filter-branch: retire --remap-to-ancestor - -* ch/maint-cannot-create-bundle-error (2010-08-27) 1 commit - - bundle: detect if bundle file cannot be created - -* rr/format-patch-count-without-merges (2010-08-28) 2 commits - - format-patch: Don't go over merge commits - - t4014-format-patch: Call test_tick before committing +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) @@ -222,77 +87,153 @@ interface). + 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 - (this branch is used by ab/test.) -As I'd like to have this in the upcoming release, the tip of old ab/test -topic has been rebuilt without the merge from ab/i18n topic. +* 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 -* as/daemon-multi-listen (2010-08-29) 2 commits - - daemon: allow more than one host address given via --listen - - daemon: add helper function setup_named_sock() +* 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.) -I think the idea is sound. It came a bit late in the cycle for the next -release and probably needs a bit more polish. +* 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 -* jc/pickaxe-grep (2010-08-31) 4 commits - - diff/log -G: tests - - git log/diff: add -G that greps in the patch text - - diff: pass the entire diff-options to diffcore_pickaxe() - - gitdiffcore doc: update pickaxe description +* 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 -This is a re-roll of "grepping inside the log -p output" which is a -feature that is often asked for when people hear about -S option. +* 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 -* jh/error-removing-missing-note (2010-08-31) 1 commit - - notes: Don't create (empty) commit when removing non-existing notes +* 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 -Should be Ok to merge to 'next'; then will merge to 'master' shortly. +* 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 -* jk/test-must-fail-missing (2010-08-31) 4 commits - - tests: make test_might_fail fail on missing commands - - tests: make test_might_fail more verbose - - tests: make test_must_fail fail on missing commands - - tests: make test_must_fail more verbose +* 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 -Should be Ok to merge to 'next'; then will merge to 'master' shortly. +* 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.) -* jl/fetch-submodule-recursive (2010-08-30) 2 commits - - Submodules: Add the new "fetch" config option for fetch and pull - - fetch/pull: Recursively fetch populated submodules +* 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