From 764dfde554fb5403750dcb5a9ae8fa7702cbf7b4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Oct 2008 09:57:41 -0700 Subject: [PATCH] What's cooking (2008/10 #01) --- whats-cooking.txt | 445 ++++++++++++++++++++++++---------------------- 1 file changed, 230 insertions(+), 215 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 67fd2eb4bd..511f371092 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,8 +1,8 @@ -Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29) -X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1 -X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458 +Subject: What's cooking in git.git (Oct 2008, #01; Mon, 06) +X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed +X-next-at: 395ff9bd88b9cf14617c5e2f461878c4969726f3 -What's cooking in git.git (Sep 2008, #05; Mon, 29) +What's cooking in git.git (Oct 2008, #01; Mon, 06) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -12,203 +12,211 @@ in 'next'. The topics list the commits in reverse chronological order. The topics meant to be merged to the maintenance series have "maint-" in their names. -If I have dropped anything recently its not because I don't want -to apply it, it just slipped through the cracks. Please feel free -to give me a gentle prod (and a patch resend or a pointer to the -series on gmane). Thanks. +Topics aren't sorted by name; I have tried to cluster them together +to tell the story of how 'next' and 'pu' have evolved this past week. ---------------------------------------------------------------- [New Topics] -* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits - - gitweb: generate parent..current URLs - - gitweb: parse parent..current syntax from pathinfo - - gitweb: generate project/action/hash URLs - - gitweb: parse project/action/hash_base:filename PATH_INFO +* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit + . docs: Improve the description of describe --tags -This series just came in today. I haven't had a chance to look at -it beyond stashing in `pu`. +I'm probably going to drop this topic if I can ever get around to +formally writing and posting sp/describe-lwtag for review. -* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits - - send-email: signedoffcc -> signedoffbycc, but handle both - - Docs: send-email: Create logical groupings for man text - - Docs: send-email: Remove unnecessary config variable description - - Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to - - send-email: change --no-validate to boolean --[no-]validate - - Docs: send-email: Man page option ordering - - Docs: send-email usage text much sexier - - Docs: send-email's usage text and man page mention same options +* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit + - [WIP] Change meaning of --tags and --all -This series has already gone through 3 iterations before I could -start to carry it in-tree. I haven't had a chance to read it yet -myself, so its sitting around in `pu` for futher review. +Modifies "git describe --tags" to allow matching against lightweight +tags even when an annotated tag is found in the history. Its not +in next because I haven't formally written a commit message and +posted the patch for discussion on the list. -* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits - - gitweb: Sort the list of forks on the summary page by age - - gitweb: Clean-up sorting of project list +This is a fairly significant change in behavior. Its most certainly +1.6.1 material, but many argue the change is the _correct_ behavior +and the current behavior in 1.6.0 is buggy. -I forgot to look at this series today. I meant to review and try -to merge it to `next` before publishing. Will do that tomorrow. +* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits + - diff: add filter for converting binary to text + - diff: introduce diff..binary + - diff: unify external diff and funcname parsing code + - t4012: use test_cmp instead of cmp -* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits - - git pull: Support --preserve-merges as a flag to rebase - - git rebase: Support non-interactive merge-preserving rebase - - Prepare for non-interactive merge-preserving rebase +A general cleanup on how diff drivers are implemented. Its still +missing documentation updates and tests but doesn't break anything +current as far as I can tell. It needs more review before it can +be slated for 'next'. -Andreas says there's some issues in here. I'm waiting for a respin -on the series before I look at it futher. +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit + - Do not rename read-only files during a push -* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit - - make prune report removed objects on -v +Supposedly fixes pack file renames on Windows, but it makes the +test suite fail on Linux. I haven't debugged why yet. Its very +likely we need a replacement patch before this can move forward. -Just came in today. Looks sane. I'll drop it onto `next` tomorrow. +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit + - format-patch: autonumber by default ----------------------------------------------------------------- -[Graduated to "master"] - -* 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 - -(Tip at 4271666) - -* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit - + diff --dirstat-by-file: count changed files, not lines - -(Tip at fd33777) - -* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit - + safe_create_leading_directories(): make it about "leading" - directories - -(Tip at 5f0bdf5) - -* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit - + git-apply:--include=pathspec - -(Tip at 6ecb1ee) - -* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits - + t7603: add new testcases to ensure builtin-commit uses - reduce_heads() - + builtin-commit: use commit_tree() - + commit_tree(): add a new author parameter - -(Tip at 7a172b0) - -* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit - + git wrapper: also use aliases to correct mistyped commands - -(Tip at 746c221) - -* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits - + Fix AsciiDoc errors in merge documentation - + git-merge documentation: describe how conflict is presented - + checkout --conflict=