From 3ac8b34396ebaef504327bc7dfacd0789e059069 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 5 Aug 2009 14:49:16 -0700 Subject: [PATCH] What's cooking (2009/08 #01) --- whats-cooking.txt | 256 +++++++++++++++++++++++----------------------- 1 file changed, 127 insertions(+), 129 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 1fc61219b2..abfcc4cae8 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 (Jul 2009, #03; Wed, 29) -X-master-at: e6580020057afd207b7cfb9c96905f99e13cfe4d -X-next-at: 4719968c98d7ad8352bb14916c65c094842a980d +Subject: What's cooking in git.git (Aug 2009, #01; Wed, 05) +X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110 +X-next-at: 2981fa5b8f20e8ff086aceb252c0e693fa2d0c75 -What's cooking in git.git (Jul 2009, #03; Wed, 29) +What's cooking in git.git (Aug 2009, #01; Wed, 05) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -19,47 +19,70 @@ out the planned "push safety" change. 1.7.0 would be a good time to introduce "justifiable" changes that are not strictly backward compatible. During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0. -I've already merged the "diff --exit-code --ignore-whitespace" change and -"push safety" change. -I'll rewind 'next' sometime this weekend. +---------------------------------------------------------------- +[New Topics] + +* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit + - git apply: option to ignore whitespace differences + +* db/vcs-helper (Wed Aug 5 01:02:25 2009 -0400) 13 commits + - Changes for new vcs-helper series + - Add simple test cases of git-vcs-cvs functionality + - First draft of CVS importer using the foreign-scm machinery + - Allow helpers to request marks for fast-import + - Allow helpers to report in "list" command that the ref is + unchanged + - Add support for "import" helper command + - Add a config option for remotes to specify a foreign vcs + - Allow programs to not depend on remotes having urls + - Allow fetch to modify refs + - Use a function to determine whether a remote is valid + - git-http-fetch: not a builtin + - Use an external program to implement fetching with curl + - Add support for external programs for handling native fetches + +This consolidates various previous rounds from Daniel and Johan. + +* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit + - send-email: confirm on empty mail subjects + +* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit + - gitweb: parse_commit_text encoding fix + +* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit + - clean: require double -f options to nuke nested git repository and + work tree + +* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 5 commits + - shortstatus: a new command + - status: show worktree status of conflicted paths separately + - wt-status.c: rework the way changes to the index and work tree are + summarized + - diff-index: keep the original index intact + - diff-index: report unmerged new entries + +* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits + - Allow mailsplit (and hence git-am) to handle mails with CRLF line- + endings + - builtin-mailsplit.c: remove read_line_with_nul() since it is no + longer used + - builtin-mailinfo,builtin-mailsplit: use strbufs + - strbuf: add new function strbuf_getwholeline() + +* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit + - merge-recursive: don't segfault while handling rename clashes ---------------------------------------------------------------- -[In 'next'] +[Graduated to "master"] * ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit + Shift object enumeration out of upload-pack -* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits - + receive-pack: remove unnecessary run_status report - + run_command: report failure to execute the program, but optionally - don't - + run_command: encode deadly signal number in the return value - + run_command: report system call errors instead of returning error - codes - + run_command: return exit code as positive value - + MinGW: simplify waitpid() emulation macros - * sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits + pull: support rebased upstream + fetch + pull --rebase + t5520-pull: Test for rebased upstream + fetch + pull --rebase -* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits - + diff: Rename QUIET internal option to QUICK - + diff: change semantics of "ignore whitespace" options - -This changes exit code from "git diff --ignore-whitespace" and friends -when there is no actual output. It is a backward incompatible change, but -we could argue that it is a bugfix. - -* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits - + Refuse deleting the current branch via push - + Refuse updating the current branch in a non-bare repository via - push - -This is old 'jc/deny-delete-current-1.7.0' and 'jc/1.7.0-push-safety' -topics redone. - * sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits + read-tree: migrate to parse-options + read-tree: convert unhelpful usage()'s to helpful die()'s @@ -70,11 +93,42 @@ topics redone. + verify-tag: migrate to parse-options + write-tree: migrate to parse-options -Parse-options migration; should be in 'master' soonish. +* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit + + git init: optionally allow a directory argument + +Straightforward usability change. + +* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit + + init-db: migrate to parse-options + +* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits + + show: add space between multiple items + + show: suppress extra newline when showing annotated tag + +* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit + + apply: notice creation/removal patches produced by GNU diff + +---------------------------------------------------------------- +[In 'next'] + +* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits + + run-command.c: squelch a "use before assignment" warning + + receive-pack: remove unnecessary run_status report + + run_command: report failure to execute the program, but optionally + don't + + run_command: encode deadly signal number in the return value + + run_command: report system call errors instead of returning error + codes + + run_command: return exit code as positive value + + MinGW: simplify waitpid() emulation macros + +Will merge soon. * mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit + grep: Add --max-depth option. +Will merge soon. + * cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits + t6050: check pushing something based on a replaced commit + Documentation: add documentation for "git replace" @@ -96,60 +150,46 @@ Does not seem to hurt normal operation without "replace". The basic idea should be easier and safer to use than the graft mechanism. I haven't tried the replacement myself, though. -* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit - + git init: optionally allow a directory argument +* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits + + git-checkout: be careful about untracked symlinks + + lstat_cache: guard against full match of length of 'name' + parameter + + Demonstrate bugs when a directory is replaced with a symlink -Straightforward usability change. Should be in 'master' soonish. +James's test scripts to expose corner case bugs in the merge and branch +switching machinery, and a few fix-ups. -* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit - + init-db: migrate to parse-options +* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits + + gitweb: Create links leading to 'blame_incremental' using + JavaScript + + gitweb: Incremental blame (proof of concept) + + gitweb: Add optional "time to generate page" info in footer + + gitweb: Add -partial_query option to href() subroutine + + gitweb: Use light/dark for class names also in 'blame' view + + gitweb: Add author initials in 'blame' view, a la "git gui blame" + + gitweb: Mark commits with no "previous" in 'blame' view + + gitweb: Use "previous" header of git-blame -p in 'blame' view + + gitweb: Mark boundary commits in 'blame' view + + gitweb: Make .error style generic + +Will merge soon. -* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits - + show: add space between multiple items - + show: suppress extra newline when showing annotated tag +* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits + + diff: Rename QUIET internal option to QUICK + + diff: change semantics of "ignore whitespace" options -* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit - + apply: notice creation/removal patches produced by GNU diff +This changes exit code from "git diff --ignore-whitespace" and friends +when there is no actual output. It is a backward incompatible change, but +we could argue that it is a bugfix. -Better acceptance of some "GNU patch" output to create or remove files. +* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits + + Refuse deleting the current branch via push + + Refuse updating the current branch in a non-bare repository via + push ---------------------------------------------------------------- [In 'pu'] -* jp/symlink-dirs (Sun Jun 14 15:08:28 2009 +0200) 2 commits - - lstat_cache: guard against full match of length of 'name' - parameter - - Demonstrate bugs when a directory is replaced with a symlink - -James's test scripts to expose corner case bugs in the merge and branch -switching machinery. - -* jh/vcs-cvs (Mon Jul 27 03:04:17 2009 +0200) 15 commits - - Introduce a 'marks ' feature to the foreign transport - code - - Teach foreign transport code to perform the "capabilities" command - - Preliminary clarifications to git-vcs documentation - - fast-import: Add support for importing commit notes - - Add a transport implementation using git-vcs-* helpers - - Allow programs to not depend on remotes having urls - - Use a function to determine whether a remote is valid - - Add specification of git-vcs-* helper programs - - Merge branch 'db/transport-shim' into jh/vcs-cvs - - git-http-fetch: not a builtin - - Use an external program to implement fetching with curl - - Add support for external programs for handling native fetches - - Add option for using a foreign VCS - - Document details of transport function APIs - - Allow late reporting of fetched hashes - -With its 6th patch replaced to keep the pathname syntax of the fast-import -language, but without the commits near the tip of the old series. - -* db/transport-shim (Tue Jul 28 02:08:53 2009 -0400) 3 commits - - git-http-fetch: not a builtin - - Use an external program to implement fetching with curl - - Add support for external programs for handling native fetches - * jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits - t3302-notes-index-expensive: Speed up create_repo() - fast-import: Add support for importing commit notes @@ -160,71 +200,29 @@ language, but without the commits near the tip of the old series. - Add a script to edit/inspect notes - Introduce commit notes -jh/vcs-cvs topic needs to be rebuilt, merging this instead of having its -own copy of "fast-import: Add support for importing commit notes". - -* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits - - Add option for using a foreign VCS - - Document details of transport function APIs - - Allow late reporting of fetched hashes - * cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits - rebase -i: use "git sequencer--helper --make-patch" - sequencer: free memory used in "make_patch" function - sequencer: add "make_patch" function to save a patch - sequencer: add "builtin-sequencer--helper.c" -I do not know how this will interact with what Dscho has been doing. - * jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit - mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker -* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits - - gitweb: Create links leading to 'blame_incremental' using - JavaScript - - gitweb: Incremental blame (proof of concept) - - gitweb: Add optional "time to generate page" info in footer - - gitweb: Add -partial_query option to href() subroutine - - gitweb: Use light/dark for class names also in 'blame' view - - gitweb: Add author initials in 'blame' view, a la "git gui blame" - - gitweb: Mark commits with no "previous" in 'blame' view - - gitweb: Use "previous" header of git-blame -p in 'blame' view - - gitweb: Mark boundary commits in 'blame' view - - gitweb: Make .error style generic - -There may have been updates during 1.6.4-rc period that I missed. - -* tr/reset-checkout-patch (Tue Jul 28 23:20:11 2009 +0200) 5 commits +* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits + - DWIM 'git stash save -p' for 'git stash -p' + - Merge branch 'js/stash-dwim' into tr/reset-checkout-patch + - Make 'git stash -k' a short form for 'git stash save --keep-index' - Implement 'git stash save --patch' - Implement 'git checkout --patch' - Implement 'git reset --patch' - builtin-add: refactor the meat of interactive_add() - git-apply--interactive: Refactor patch mode code +* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit + - Make 'git stash -k' a short form for 'git stash save --keep-index' + * jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit - Allow --date=local --date=other-format to work as expected -* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits - - branch.c: if remote is not config'd for branch, don't try delete - push config - - branch, checkout: introduce autosetuppush - - move deletion of merge configuration to branch.c - - remote: add per-remote autosetupmerge and autosetuprebase - configuration - - introduce a struct tracking_config - - branch: install_branch_config and struct tracking refactoring - - config: allow false and true values for branch.autosetuprebase - -This has been reverted from 'next' for now to give it a fresh start. - ----------------------------------------------------------------- -[Dropped] - -* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits - . Fix for a merge where a branch has an F->D transition - . Add a reminder test case for a merge with F/D transition - -The fix the author hinted iffy is dropped for now, but the test case is -already in 'master' to remind us. - -- 2.47.3