What's cooking (2008/10 #04)

index 0829ac1b15..78e0fade69 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,8 +1,8 @@ -Subject: What's cooking in git.git (Oct 2008, #03; Tue, 14) -X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0 -X-next-at: f1ba443bf7f7fae740f81058fca0bcff3613d999 +Subject: What's cooking in git.git (Oct 2008, #04; Sat, 18) +X-master-at: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344 +X-next-at: 8f0e41f379d486dd27766d84d994eb1da5b8319d -What's cooking in git.git (Oct 2008, #03; Tue, 14) +What's cooking in git.git (Oct 2008, #04; Sat, 18) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -12,19 +12,53 @@ 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. -This round I haven't added anything new yet. Just getting my development -repository back into shape and in sync with what I received from Shawn. - ---------------------------------------------------------------- [New Topics] -* js/maint-fetch-update-head (Mon Oct 13 11:36:52 2008 +0200) 1 commit - - Fix fetch/pull when run without --update-head-ok +* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit + + Fix reading of cloud tags + +* rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits + + make alloc_ref_from_str() the new alloc_ref() + + use alloc_ref_from_str() everywhere + + add alloc_ref_with_prefix() + +* jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit + - reset --hard/read-tree --reset -u: remove unmerged new paths + +* jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits + + Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other + + refactor handling of "other" files in ls-files and status + +* jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits + - Fix checkout not to clobber the branch when using symlinked HEAD + upon detaching + - Enhance hold_lock_file_for_{update,append}() API + - demonstrate breakage of detached checkout with symbolic link HEAD + - Fix "checkout --track -b newbranch" on detached HEAD + +* jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit + + refactor handling of "other" files in ls-files and status + +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit + + merge: remove deprecated summary and diffstat options and config + variables -This looked sane to me. +* np/index-pack (Fri Oct 17 15:57:58 2008 -0400) 2 commits + + index-pack: smarter memory usage during delta resolution + + index-pack: rationalize delta resolution code + +---------------------------------------------------------------- +[Graduated to "master"] + +* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits + + tutorial: update output of git commit + + reformat informational commit message + + git commit: Reformat output somewhat + + builtin-commit.c: show on which branch a commit was added ---------------------------------------------------------------- -[Stuck Topics] +[Needs review] * nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits - grep: skip files outside sparse checkout area @@ -39,18 +73,22 @@ This looked sane to me. - Introduce CE_NO_CHECKOUT bit - Extend index to save more flags -Recently updated with a repost. Shawn says he's been too swamped at -day-job to actively review the series. There has been some discussion on -list about it so its not stalled, but it needs more eyeballs. - ---------------------------------------------------------------- -[Stalled -- Needs Action to Proceed (or to be dropped)] +[Dropped] * pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit - - t7400: Add short "git submodule add" testsuite + . t7400: Add short "git submodule add" testsuite -Still waiting for a reroll. Should be dropped next week if we don't -get one during this coming week. +Was waiting for a reroll. + +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit + . git-am: Pass the --directory option through to git-apply + +I think this is still buggy and drops the option when am stops with +conflicts. + +---------------------------------------------------------------- +[Stalled] * bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits - Use xdiff caching to improve git blame performance @@ -60,41 +98,21 @@ get one during this coming week. - 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 - -I think this is still buggy and drops the option when am stops with -conflicts. +Waiting for a reroll. ---------------------------------------------------------------- [Will be merged to 'master' soon] -* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits - + tutorial: update output of git commit - + reformat informational commit message - + git commit: Reformat output somewhat - + builtin-commit.c: show on which branch a commit was added - -Shawn thinks this topic is settled for now, and I see that the new output -format does not bother me very much, so please expect this to be merged -soon. - ----------------------------------------------------------------- -[Actively Cooking] - -* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits - + Documentation: Refer to git-rebase(1) to warn against rewriting - + Documentation: new upstream rebase recovery section in git-rebase - -Shawn says that an update came in recently, but they are not here yet. -I'd need to dig it up, but I haven't had time. +* js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits + + pull: allow "git pull origin $something:$current_branch" into an + unborn branch + + Fix fetch/pull when run without --update-head-ok -* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit +* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits + + rebase: Document --no-verify option to bypass pre-rebase hook + rebase --no-verify -This adds --no-verify to git rebase, to avoid the pre-rebase hook. Lacks -documentation but otherwise looks sound. +This adds --no-verify to git rebase, to avoid the pre-rebase hook. * mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit + builtin-commit: use reduce_heads() only when appropriate @@ -104,68 +122,28 @@ Fixes "git merge --no-ff --no-commit". * ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit + rebase: Support preserving merges in non-interactive mode -* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits - - rebase-i-p: if todo was reordered use HEAD as the rewritten parent - - rebase-i-p: do not include non-first-parent commits touching - UPSTREAM - - rebase-i-p: only list commits that require rewriting in todo - - rebase-i-p: fix 'no squashing merges' tripping up non-merges - - rebase-i-p: delay saving current-commit to REWRITTEN if squashing - - rebase-i-p: use HEAD for updating the ref instead of mapping - OLDHEAD - - rebase-i-p: test to exclude commits from todo based on its parents +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit + + Do not rename read-only files during a push -Changes the `rebase -i -p` behavior to behave like git sequencer's -rewrite of `rebase -i` would behave. - -* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit - . rebase--interactive: fix parent rewriting for dropped commits - -Tentatively dropped from everwhere, waiting for a reroll together with -sh/rebase-i-p. - -* pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits - - (squash): index-pack: do not unconditionally make packfile read- - only - - Do not rename read-only files during a push - -Supposedly fixes pack file renames on Windows. The (squash) patch is my -attempt to fix its breakage. +Fixes pack file renames on Windows. * sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit - - describe: Make --tags and --all match lightweight tags more often + + describe: Make --tags and --all match lightweight tags more often When the user gives --tags, the request is asking to treat lightweight and annotated tags at equal weight, and if lightweight ones are closer, they should be used. -* gb/formatpatch-autonbr (Sun Oct 12 22:18:02 2008 -0700) 2 commits - - (squash) adjust test vector for new behaviour of format-patch - - format-patch: autonumber by default +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit + + format-patch: autonumber by default -* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits - - diff: add filter for converting binary to text - - diff: introduce diff.<driver>.binary - - diff: unify external diff and funcname parsing code - - t4012: use test_cmp instead of cmp - -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'. - -* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits +* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits + + git-check-attr(1): use 'verse' for multi-line synopsis sections + check-attr: Add --stdin option + check-attr: add an internal check_attr() function Batch attr lookup via --stdin, for gitk and git-gui. -* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit - + Implement git clone -v - -Does what it says it does. This may be ready for master soon, -its a pretty trivial change. - * gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit + gitweb: refactor input parameters parse/validation @@ -174,9 +152,50 @@ Future gitweb patches to add more arguments into the PATH_INFO depend upon this initial cleanup work. * ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit - - compat/cygwin.c - Use cygwin's stat if core.filemode == true + + compat/cygwin.c - Use cygwin's stat if core.filemode == true -Is ready for 'next'. +* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit + + Implement git clone -v + +Does what it says it does. This may be ready for master soon, +its a pretty trivial change. + +---------------------------------------------------------------- +[Actively Cooking] + +* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits + + Documentation: Refer to git-rebase(1) to warn against rewriting + + Documentation: new upstream rebase recovery section in git-rebase + +Expecting an update. + +* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit + + rebase--interactive: fix parent rewriting for dropped commits + +* sh/rebase-i-p (Wed Oct 15 02:44:40 2008 -0500) 8 commits + - rebase-i-p: if todo was reordered use HEAD as the rewritten parent + - rebase-i-p: do not include non-first-parent commits touching + UPSTREAM + - rebase-i-p: only list commits that require rewriting in todo + - rebase-i-p: fix 'no squashing merges' tripping up non-merges + - rebase-i-p: delay saving current-commit to REWRITTEN if squashing + - rebase-i-p: use HEAD for updating the ref instead of mapping + OLDHEAD + - rebase-i-p: test to exclude commits from todo based on its parents + + rebase--interactive: fix parent rewriting for dropped commits + +Changes the `rebase -i -p` behavior to behave like git sequencer's +rewrite of `rebase -i` would behave. + +* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits + + diff: add filter for converting binary to text + + diff: introduce diff.<driver>.binary + + diff: unify external diff and funcname parsing code + + t4012: use test_cmp instead of cmp + +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. * jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit - gitweb: Better processing format string in custom links in navbar @@ -193,15 +212,6 @@ Waiting for some sort of response from Pasky. I started making this incremental but the progress is not so great. -* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits - . git-am --forge: add Signed-off-by: line for the author - . git-am: clean-up Signed-off-by: lines - . stripspace: add --log-clean option to clean up signed-off-by: - lines - . stripspace: use parse_options() - . Add "git am -s" test - . git-am: refactor code to add signed-off-by line for the committer - * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit - "git push": tellme-more protocol extension