diff --git a/whats-cooking.txt b/whats-cooking.txt index 2501076eda..5bf0a043b7 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,28 +1,88 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Feb 2011, #02; Mon, 7) -X-master-at: 7811d9600f02e70c9f835719c71156c967a684f7 -X-next-at: 3b781df0a25d5ba23bd2603b0e3e9bb4731369df +Subject: What's cooking in git.git (Feb 2011, #03; Wed, 9) +X-master-at: 1a9fe453263137be7d42e6fbfc041b5b2d9521d7 +X-next-at: 3d0bb1aecb5960274bb37fb5692cb0f4b10d7706 -What's cooking in git.git (Feb 2011, #02; Mon, 7) +What's cooking in git.git (Feb 2011, #03; Wed, 9) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. +The 'maint' branch has accumulated enough minor fixes to produce 1.7.4.1, +perhaps by the end of this week. + -------------------------------------------------- [New Topics] -* pw/p4 (2011-02-05) 8 commits - - git-p4: support clone --bare - - git-p4: decode p4 wildcard characters - - git-p4: better message for "git-p4 sync" when not cloned - - git-p4: reinterpret confusing p4 message - - git-p4: accommodate new move/delete type in p4 - - git-p4: add missing newline in initial import message - - git-p4: fix key error for p4 problem - - git-p4: test script +* jh/merge-sans-branch (2011-02-08) 3 commits + - merge: optionally merge from upstream when run without argument + - builtin/merge.c: Add function per_branch_config + - builtin/merge.c: Add setup_merge_commit function -Will be re-rolled after collecting comments (Petw Wyckoff, 2011-02-07). +* js/checkout-untracked-symlink (2011-02-05) 2 commits + - (weatherbaloon) needs in-code explanation updates + - Demonstrate breakage: checkout overwrites untracked symlink with directory + +* lp/config-vername-check (2011-01-21) 2 commits + - Documentation fixes in git-config + - Sanity-check config variable names + +* mz/rerere-remaining (2011-02-07) 1 commit + - mergetool: don't skip modify/remove conflicts + (this branch uses jc/rerere-remaining.) + +* nd/hash-object-sanity (2011-02-05) 1 commit + - Make hash-object more robust against malformed objects + +-------------------------------------------------- +[Graduated to "master"] + +* ae/better-template-failure-report (2010-12-18) 1 commit + (merged to 'next' on 2011-02-03 at 3b269c9) + + Improve error messages when temporary file creation fails + +* cb/setup (2010-12-27) 1 commit + (merged to 'next' on 2011-02-03 at 073980f) + + setup: translate symlinks in filename when using absolute paths + +* ef/alias-via-run-command (2011-01-07) 1 commit + (merged to 'next' on 2011-02-03 at 4ce47ce) + + alias: use run_command api to execute aliases + +* jc/fsck-fixes (2011-01-26) 2 commits + (merged to 'next' on 2011-02-03 at 98e1c63) + + fsck: do not give up too early in fsck_dir() + + fsck: drop unused parameter from traverse_one_object() + +* jc/unpack-trees (2010-12-22) 2 commits + (merged to 'next' on 2011-02-03 at 5bd48f8) + + unpack_trees(): skip trees that are the same in all input + + unpack-trees.c: cosmetic fix + +* jn/cherry-pick-strategy-option (2010-12-10) 1 commit + (merged to 'next' on 2011-02-03 at 1c10f16) + + cherry-pick/revert: add support for -X/--strategy-option + +* jn/unpack-lstat-failure-report (2011-01-12) 2 commits + (merged to 'next' on 2011-02-03 at 76586d2) + + unpack-trees: handle lstat failure for existing file + + unpack-trees: handle lstat failure for existing directory + +* rr/fi-import-marks-if-exists (2011-01-15) 1 commit + (merged to 'next' on 2011-02-03 at 8c9d4ce) + + fast-import: Introduce --import-marks-if-exists + +* tr/diff-words-test (2011-01-18) 4 commits + (merged to 'next' on 2011-02-03 at d346665) + + t4034 (diff --word-diff): add a minimum Perl drier test vector + + t4034 (diff --word-diff): style suggestions + + userdiff: simplify word-diff safeguard + + t4034: bulk verify builtin word regex sanity + +* tr/merge-unborn-clobber (2010-08-22) 1 commit + (merged to 'next' on 2011-02-03 at ccfc03d) + + Exhibit merge bug that clobbers index&WT -------------------------------------------------- [Stalled] @@ -63,12 +123,6 @@ IIRC, this was a weather-baloon "if you wanted to, this may be how you would do it" without test updates. People who care need to help moving things forward. -* jc/rerere-remaining (2011-01-06) 1 commit - - rerere "remaining" - -Just a handful of weatherballoon patches without proper tests, in response -to feature/minor fix requests. - * ab/p4 (2011-01-11) 1 commit - git-p4: correct indenting and formatting @@ -288,111 +342,72 @@ Needs a bit more minor work to get the basic code structure right. -------------------------------------------------- [Cooking] -* hv/mingw-fs-funnies (2011-02-07) 5 commits - - mingw_rmdir: set errno=ENOTEMPTY when appropriate - - mingw: add fallback for rmdir in case directory is in use - - mingw: make failures to unlink or move raise a question - - mingw: work around irregular failures of unlink on windows - - mingw: move unlink wrapper to mingw.c +* jc/rerere-remaining (2011-01-06) 1 commit + - rerere "remaining" + (this branch is used by mz/rerere-remaining.) -Rerolled and seems ready to move forward. Will merge to 'next'. +Just a handful of weatherballoon patches without proper tests, in response +to feature/minor fix requests. + +* pw/p4 (2011-02-05) 8 commits + - git-p4: support clone --bare + - git-p4: decode p4 wildcard characters + - git-p4: better message for "git-p4 sync" when not cloned + - git-p4: reinterpret confusing p4 message + - git-p4: accommodate new move/delete type in p4 + - git-p4: add missing newline in initial import message + - git-p4: fix key error for p4 problem + - git-p4: test script + +Will be re-rolled after collecting comments (Petw Wyckoff, 2011-02-07). + +* hv/mingw-fs-funnies (2011-02-07) 5 commits + (merged to 'next' on 2011-02-09 at 3d0bb1a) + + mingw_rmdir: set errno=ENOTEMPTY when appropriate + + mingw: add fallback for rmdir in case directory is in use + + mingw: make failures to unlink or move raise a question + + mingw: work around irregular failures of unlink on windows + + mingw: move unlink wrapper to mingw.c + +Rerolled and seems ready to move forward. * nd/struct-pathspec (2011-01-31) 22 commits - - t6004: add pathspec globbing test for log family - - t7810: overlapping pathspecs and depth limit - - grep: drop pathspec_matches() in favor of tree_entry_interesting() - - grep: use writable strbuf from caller for grep_tree() - - grep: use match_pathspec_depth() for cache/worktree grepping - - grep: convert to use struct pathspec - - Convert ce_path_match() to use match_pathspec_depth() - - Convert ce_path_match() to use struct pathspec - - struct rev_info: convert prune_data to struct pathspec - - pathspec: add match_pathspec_depth() - - tree_entry_interesting(): optimize wildcard matching when base is matched - - tree_entry_interesting(): support wildcard matching - - tree_entry_interesting(): fix depth limit with overlapping pathspecs - - tree_entry_interesting(): support depth limit - - tree_entry_interesting(): refactor into separate smaller functions - - diff-tree: convert base+baselen to writable strbuf - - glossary: define pathspec - - Move tree_entry_interesting() to tree-walk.c and export it - - tree_entry_interesting(): remove dependency on struct diff_options - - Convert struct diff_options to use struct pathspec - - diff-no-index: use diff_tree_setup_paths() - - Add struct pathspec + (merged to 'next' on 2011-02-09 at b1e64ee) + + t6004: add pathspec globbing test for log family + + t7810: overlapping pathspecs and depth limit + + grep: drop pathspec_matches() in favor of tree_entry_interesting() + + grep: use writable strbuf from caller for grep_tree() + + grep: use match_pathspec_depth() for cache/worktree grepping + + grep: convert to use struct pathspec + + Convert ce_path_match() to use match_pathspec_depth() + + Convert ce_path_match() to use struct pathspec + + struct rev_info: convert prune_data to struct pathspec + + pathspec: add match_pathspec_depth() + + tree_entry_interesting(): optimize wildcard matching when base is matched + + tree_entry_interesting(): support wildcard matching + + tree_entry_interesting(): fix depth limit with overlapping pathspecs + + tree_entry_interesting(): support depth limit + + tree_entry_interesting(): refactor into separate smaller functions + + diff-tree: convert base+baselen to writable strbuf + + glossary: define pathspec + + Move tree_entry_interesting() to tree-walk.c and export it + + tree_entry_interesting(): remove dependency on struct diff_options + + Convert struct diff_options to use struct pathspec + + diff-no-index: use diff_tree_setup_paths() + + Add struct pathspec (this branch is used by en/object-list-with-pathspec.) * en/object-list-with-pathspec (2010-09-20) 2 commits - - Add testcases showing how pathspecs are handled with rev-list --objects - - Make rev-list --objects work together with pathspecs + (merged to 'next' on 2011-02-09 at ccf6c6a) + + Add testcases showing how pathspecs are handled with rev-list --objects + + Make rev-list --objects work together with pathspecs (this branch uses nd/struct-pathspec.) -The above two were rebased on 1.7.4; will merge to 'next'. - -* tr/merge-unborn-clobber (2010-08-22) 1 commit - (merged to 'next' on 2011-02-03 at ccfc03d) - + Exhibit merge bug that clobbers index&WT - -* jc/unpack-trees (2010-12-22) 2 commits - (merged to 'next' on 2011-02-03 at 5bd48f8) - + unpack_trees(): skip trees that are the same in all input - + unpack-trees.c: cosmetic fix - -* jc/fsck-fixes (2011-01-26) 2 commits - (merged to 'next' on 2011-02-03 at 98e1c63) - + fsck: do not give up too early in fsck_dir() - + fsck: drop unused parameter from traverse_one_object() - -* tr/diff-words-test (2011-01-18) 4 commits - (merged to 'next' on 2011-02-03 at d346665) - + t4034 (diff --word-diff): add a minimum Perl drier test vector - + t4034 (diff --word-diff): style suggestions - + userdiff: simplify word-diff safeguard - + t4034: bulk verify builtin word regex sanity - -I thought this was Ok; further comments, anybody? - -* rr/fi-import-marks-if-exists (2011-01-15) 1 commit - (merged to 'next' on 2011-02-03 at 8c9d4ce) - + fast-import: Introduce --import-marks-if-exists - -Looked reasonable. - -* jn/unpack-lstat-failure-report (2011-01-12) 2 commits - (merged to 'next' on 2011-02-03 at 76586d2) - + unpack-trees: handle lstat failure for existing file - + unpack-trees: handle lstat failure for existing directory - -Looked reasonable. - -* ef/alias-via-run-command (2011-01-07) 1 commit - (merged to 'next' on 2011-02-03 at 4ce47ce) - + alias: use run_command api to execute aliases - -Will merge to 'master' shortly. - -* uk/checkout-ambiguous-ref (2011-02-07) 2 commits - - NEEDS TESTS: commit: document --detach synonym for "git checkout foo^{commit}" +* uk/checkout-ambiguous-ref (2011-02-08) 4 commits + - checkout: rearrange update_refs_for_switch for clarity + - checkout: introduce --detach synonym for "git checkout foo^{commit}" + - checkout: split off a function to peel away branchname arg (merged to 'next' on 2011-02-03 at 9044724) + checkout: fix bug with ambiguous refs -Will merge the first one to 'master' shortly. - -* cb/setup (2010-12-27) 1 commit - (merged to 'next' on 2011-02-03 at 073980f) - + setup: translate symlinks in filename when using absolute paths - -Will merge to 'master' shortly. - -* ae/better-template-failure-report (2010-12-18) 1 commit - (merged to 'next' on 2011-02-03 at 3b269c9) - + Improve error messages when temporary file creation fails - -Will merge to 'master' shortly. - -* jn/cherry-pick-strategy-option (2010-12-10) 1 commit - (merged to 'next' on 2011-02-03 at 1c10f16) - + cherry-pick/revert: add support for -X/--strategy-option - -Will merge to 'master' shortly. - +The topic has become about "checkout --detach" ;-).