diff --git a/whats-cooking.txt b/whats-cooking.txt index 84e7671f30..b652245c63 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, #06; Thu, 26) -X-master-at: 515cc0101943b766fde7aa894827119e332ec033 -X-next-at: 7180a87c9a993afee64514d82f1e85dbacc8e120 +Subject: What's cooking in git.git (Sep 2010, #01; Wed, 1) +X-master-at: 7e42332e476a6f47ccc5a62cc8b93bcb4d758f7c +X-next-at: a0aa1d989c889829c2f1571f9c7760a8b2fda6b9 -What's cooking in git.git (Aug 2010, #06; Thu, 26) +What's cooking in git.git (Sep 2010, #01; Wed, 1) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -11,167 +11,70 @@ 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. --------------------------------------------------- -[New Topics] +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'. -* mg/doc-bundle (2010-08-23) 3 commits - (merged to 'next' on 2010-08-23 at 2251a51) - + git-bundle.txt: Clarify rev-list-args restrictions - + git-bundle.txt: whitespace cleanup - + git-bundle.txt: Cleanup - -* jc/builtin-binsearch (2010-08-05) 2 commits - . git.c: binary search in the built-in command list - . git.c: sort the list of built-in command names - -* bc/maint-fetch-url-only (2010-08-25) 2 commits - - builtin/fetch.c: ignore merge config when not fetching from branch's remote - - t/t5510: demonstrate failure to fetch when current branch has merge ref - -* 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 - -* jf/merge-ignore-ws (2010-08-26) 4 commits - - merge-recursive: options to ignore whitespace changes - - merge-recursive --patience - - ll-merge: replace flag argument with options struct - - merge-recursive: expose merge options for builtin merge - (this branch uses eb/double-convert-before-merge, jn/merge-renormalize and jn/merge-renormalize.) - -* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits - - do not pass "git -c foo=bar" params to transport helpers - - pass "git -c foo=bar" params through environment - -* jl/submodule-ignore-diff (2010-08-25) 1 commit - (merged to 'next' on 2010-08-26 at af1c819) - + checkout: respect diff.ignoreSubmodules setting - -* js/maint-reflog-beyond-horizon (2010-08-24) 3 commits - (merged to 'next' on 2010-08-26 at 4281562) - + rev-parse: tests git rev-parse --verify master@{n}, for various n - + sha1_name.c: use warning in preference to fprintf(stderr - + rev-parse: exit with non-zero status if ref@{n} is not valid. - -* rr/fmt-merge-msg (2010-08-25) 3 commits - - merge: Make 'merge.log' an integer or boolean option - - merge: Make '--log' an integer option for number of shortlog entries - - fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len - (this branch uses jn/update-contrib-example-merge.) - -* tr/merge-unborn-clobber (2010-08-22) 1 commit - - Exhibit merge bug that clobbers index&WT - -* en/object-list-with-pathspec (2010-08-26) 2 commits - - Make rev-list --objects work together with pathspecs - - Add testcases showing how pathspecs are ignored with rev-list --objects - -* en/tree-walk-optim (2010-08-26) 4 commits - - diff_tree(): Skip skip_uninteresting() when all remaining paths interesting - - tree_entry_interesting(): Make return value more specific - - tree-walk: Correct bitrotted comment about tree_entry() - - Document pre-condition for tree_entry_interesting +I am hoping to tag -rc0 for the 1.7.3 release this weekend. -------------------------------------------------- -[Stalled] - -* jc/log-grep (2010-08-23) 1 commit - - git log: add -G that greps in the patch text - -This is broken, but haven't found any time to revisit it yet. - -* zl/mailinfo-recode-patch (2010-06-14) 2 commits - - add --recode-patch option to git-am - - add --recode-patch option to git-mailinfo - -I recall there was another round of re-roll planned for this one. - -* jk/tag-contains (2010-07-05) 4 commits - - Why is "git tag --contains" so slow? - - default core.clockskew variable to one day - - limit "contains" traversals based on commit timestamp - - tag: speed up --contains calculation - --------------------------------------------------- -[Cooking] - -* 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 - -* 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 - -* 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 - -* nd/clone-depth-zero (2010-08-23) 1 commit - (merged to 'next' on 2010-08-26 at b4491c3) - + clone: warn users --depth is ignored in local clones - -* cb/ignored-paths-are-precious (2010-08-21) 1 commit - - checkout/merge: optionally fail operation when ignored files need to be overwritten - -I fixed up a trivial error in the configuration parser (which didn't -return immediately after parsing), and while at it flipped the default -value of the configuration and the command line option to false. - -This probably needs tests; also we know of longstanding bugs in related -area that needs to be addressed---they do not have to be part of this -series but their reproduction recipe would belong to the test script for -this topic. - -* 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 - -Will merge to 'master' shortly. - -* 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 +[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 " -Will merge to 'master' shortly. - * cb/binary-patch-id (2010-08-15) 1 commit (merged to 'next' on 2010-08-21 at ff38c3e) + hash binary sha1 into patch id -Will merge to 'master' shortly. +* 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.) -* jj/icase-directory (2010-08-16) 6 commits - (merged to 'next' on 2010-08-26 at 9d8e1bc) - + 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. +* 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) @@ -182,74 +85,99 @@ Will merge to 'master' shortly. + Eliminate “Finished cherry-pick/revert” message (this branch uses cc/revert.) -Will merge to 'master' shortly. +* 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/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/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.) -* po/etc-gitattributes (2010-08-16) 1 commit - - Add global and system-wide gitattributes +* 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 -* 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 +* 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 -* 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" +* 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 -Will merge to 'master' shortly. +* 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 -* 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