What's cooking (2008/09 #01)

index f9deac2958..e398e38b2e 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,8 +1,8 @@ -Subject: What's cooking in git.git (Aug 2008, #09; Sun, 31) -X-master-at: 7f314565fe20e324e8db1a7c233e43ca4e3683f0 -X-next-at: 007e493846da7bb03b026e90ac0af8bdea9d0d0c +Subject: What's cooking in git.git (Sep 2008, #01; Sat, 06) +X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6 +X-next-at: d2470dbfc97c972e54913e3d3c622118526c9cc2 -What's cooking in git.git (Aug 2008, #09; Sun, 31) +What's cooking in git.git (Sep 2008, #01; Sat, 06) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -15,14 +15,42 @@ meant to be merged to the maintenance series have "maint-" in their names. ---------------------------------------------------------------- [New Topics] -Most of them are expected to spend only short amount of time on 'next' -before graduating to 'master'. +* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits + + t5300: improve SHA1 collision test + + pack-objects: don't include missing preferred base objects + + sha1write: don't copy full sized buffers + + Merge branch 'np/maint-safer-pack' into np/pack -* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit - + checkout: do not check out unmerged higher stages randomly +* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit + + diff --dirstat-by-file: count changed files, not lines -* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit - - git-am: Pass the --directory option through to git-apply +* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit + - for-each-ref: `:short` format for `refname` + +* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit + + safe_create_leading_directories(): make it about "leading" + directories + +* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit + + daemon.c: avoid setlinebuf() + +* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits + + diff --quiet: make it synonym to --exit-code >/dev/null + + diff Porcelain: do not disable auto index refreshing on -C -C + +* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit + - git-apply:--include=pathspec + +* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits + + add '%d' pretty format specifier to show decoration + + move load_ref_decorations() to log-tree.c and export it + + log: add load_ref_decorations() + +* pb/commit-where (Fri Sep 5 19:13:05 2008 +0200) 1 commit + - Builtin-commit: show on which branch a commit was added + +---------------------------------------------------------------- +[Graduated to "master"] * np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits + fixup_pack_header_footer(): use nicely aligned buffer sizes @@ -31,44 +59,9 @@ before graduating to 'master'. + improve reliability of fixup_pack_header_footer() + pack-objects: improve returned information from write_one() -* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit - + diff: Help "less" hide ^M from the output - -* jc/better-conflict-resolution (Sun Aug 31 20:36:32 2008 -0700) 15 commits - . git-merge documentation: describe how conflict is presented - . checkout --conflict=<style>: recreate merge in a non-default style - + checkout -m: recreate merge when checking out of unmerged index - + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict- - resolution' - + git-merge-recursive: learn to honor merge.conflictstyle - + merge.conflictstyle: choose between "merge" and "diff3 -m" styles - + rerere: understand "diff3 -m" style conflicts with the original - + rerere.c: use symbolic constants to keep track of parsing states - + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or - less - + xmerge.c: minimum readability fixups - + xdiff-merge: optionally show conflicts in "diff3 -m" style - + xdl_fill_merge_buffer(): separate out a too deeply nested function - + checkout --ours/--theirs: allow checking out one side of a - conflicting merge - + checkout -f: allow ignoring unmerged paths when checking out of - the index - + checkout: do not check out unmerged higher stages randomly - -* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 5 commits - + t6013: replace use of 'tac' with equivalent Perl - + rev-list: fix --reverse interaction with --parents - + Topo-sort before --simplify-merges - + revision traversal: show full history with merge simplification - + revision.c: whitespace fix - * rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit + builtin-help: fallback to GIT_MAN_VIEWER before man -* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits - + Add help.autocorrect to enable/disable autocorrecting - + git wrapper: DWIM mistyped commands - * ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits + 'git foo' program identifies itself without dash in die() messages + Start conforming code to "git subcmd" style @@ -88,28 +81,6 @@ before graduating to 'master'. The last two fail test suite. ----------------------------------------------------------------- -[Stalled -- Needs Action to Proceed (or to be dropped)] - -* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits - - Use xdiff caching to improve git blame performance - - Allow xdiff machinery to cache hash results for a file - - Always initialize xpparam_t to 0 - - Bypass textual patch generation and parsing in git blame - - Allow alternate "low-level" emit function from xdl_diff - -Réne had good comments on how the callback should be structured. - -* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits - - configure: auto detect dynamic library path switches - - Makefile: Allow CC_LD_DYNPATH to be overriden - -Needs success reports from people who do use user-defined dynamic library -path when they build their "git" before this series can go anywhere. - ----------------------------------------------------------------- -[Will be merged to "master" soon] - * tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits + Merge branch 'tr/rev-list-docs' into tr/filter-branch + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch @@ -132,9 +103,74 @@ This now merges up all (and only) the necessary pieces from the post-simplify topic and the documentation updates, ready to be merged to "master". +---------------------------------------------------------------- +[Stalled -- Needs Action to Proceed (or to be dropped)] + +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits + - Use xdiff caching to improve git blame performance + - Allow xdiff machinery to cache hash results for a file + - Always initialize xpparam_t to 0 + - Bypass textual patch generation and parsing in git blame + - Allow alternate "low-level" emit function from xdl_diff + +Réne had good comments on how the callback should be structured. + +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit + - git-am: Pass the --directory option through to git-apply + +---------------------------------------------------------------- +[Will be merged to "master" soon] + +* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit + + diff: Help "less" hide ^M from the output + +* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit + + checkout: do not check out unmerged higher stages randomly + +This is the same one as the bottom of "better conflict resolution" series; +it is a bugfix meant to be applied on 'maint'. + +* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits + + configure: auto detect dynamic library path switches + + Makefile: Allow CC_LD_DYNPATH to be overriden + +I decided to push this forward; it might break minority configurations, +but it appears nobody pays attention until it actually hurts, so let's see +what happens when this hits 'master'. + +* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits + + Add help.autocorrect to enable/disable autocorrecting + + git wrapper: DWIM mistyped commands + ---------------------------------------------------------------- [Actively Cooking] +* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits + + t6013: replace use of 'tac' with equivalent Perl + + rev-list: fix --reverse interaction with --parents + +* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 16 commits + + Fix AsciiDoc errors in merge documentation + + git-merge documentation: describe how conflict is presented + + checkout --conflict=<style>: recreate merge in a non-default style + + checkout -m: recreate merge when checking out of unmerged index + + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict- + resolution' + + git-merge-recursive: learn to honor merge.conflictstyle + + merge.conflictstyle: choose between "merge" and "diff3 -m" styles + + rerere: understand "diff3 -m" style conflicts with the original + + rerere.c: use symbolic constants to keep track of parsing states + + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or + less + + xmerge.c: minimum readability fixups + + xdiff-merge: optionally show conflicts in "diff3 -m" style + + xdl_fill_merge_buffer(): separate out a too deeply nested function + + checkout --ours/--theirs: allow checking out one side of a + conflicting merge + + checkout -f: allow ignoring unmerged paths when checking out of + the index + + checkout: do not check out unmerged higher stages randomly + * lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit + date/time: do not get confused by fractional seconds @@ -154,15 +190,25 @@ case insensitive filesystems. I dunno. Teaches "git add" to record only the intent to add a path later. I rerolled this without the fake empty blob object. -* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits +* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits + + bisect: remove "checkout_done" variable used when checking merge + bases + bisect: only check merge bases when needed + bisect: test merge base if good rev is not an ancestor of bad rev -* mv/merge-recursive (Thu Aug 28 15:43:00 2008 +0200) 4 commits - - builtin-merge: avoid run_command_v_opt() for recursive and subtree - - merge-recursive: introduce merge_options - - merge-recursive.c: Add more generic merge_recursive_generic() - - Split out merge_recursive() to merge-recursive.c +* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits + + builtin-merge: release the lockfile in try_merge_strategy() + + merge-recursive: get rid of virtual_id + + merge-recursive: move current_{file,directory}_set to struct + merge_options + + merge-recursive: move the global obuf to struct merge_options + + merge-recursive: get rid of the index_only global variable + + merge-recursive: move call_depth to struct merge_options + + cherry-pick/revert: make direct internal call to merge_tree() + + builtin-merge: avoid run_command_v_opt() for recursive and subtree + + merge-recursive: introduce merge_options + + merge-recursive.c: Add more generic merge_recursive_generic() + + Split out merge_recursive() to merge-recursive.c * jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit + diff: vary default prefix depending on what are compared @@ -228,15 +274,49 @@ hit due to tcl/tk's limitation, so I am holding this back for now. ---------------------------------------------------------------- [Graduated to "master"] -* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit - + git-p4: Fix checkout bug when using --import-local. +* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits + + fixup_pack_header_footer(): use nicely aligned buffer sizes + + index-pack: use fixup_pack_header_footer()'s validation mode + + pack-objects: use fixup_pack_header_footer()'s validation mode + + improve reliability of fixup_pack_header_footer() + + pack-objects: improve returned information from write_one() + +* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit + + builtin-help: fallback to GIT_MAN_VIEWER before man + +* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits + + 'git foo' program identifies itself without dash in die() messages + + Start conforming code to "git subcmd" style + +* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit + + git commit --author=$name: look $name up in existing commits -* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits - + daemon.c: minor style fixup - + git-daemon: rewrite kindergarden, new option --max-connections - + git-daemon: Simplify dead-children reaping logic - + git-daemon: use LOG_PID, simplify logging code - + git-daemon: call logerror() instead of error() +* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit + + cast pid_t's to uintmax_t to improve portability + +* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits + - setup_git_directory(): fix move to worktree toplevel directory + - update-index: fix worktree setup + + read-tree: setup worktree if merge is required + + grep: fix worktree setup + + diff*: fix worktree setup -* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit - + pack-objects: Allow missing base objects when creating thin packs +The last two fail test suite. + +* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits + + Merge branch 'tr/rev-list-docs' into tr/filter-branch + + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch + + revision --simplify-merges: make it a no-op without pathspec + + revision --simplify-merges: do not leave commits unprocessed + + revision --simplify-merges: use decoration instead of commit->util + field + + Documentation: rev-list-options: move --simplify-merges + documentation + + Merge branch 'jc/post-simplify' into tr/rev-list-docs + + filter-branch: use --simplify-merges + + Merge branch 'jc/post-simplify' into tr/filter-branch + + filter-branch: fix ref rewriting with --subdirectory-filter + + filter-branch: Extend test to show rewriting bug + + Topo-sort before --simplify-merges + + revision traversal: show full history with merge simplification + + revision.c: whitespace fix