What's cooking (2009/12 #02)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 382f6555bfaf3e22261e72c204f484fdfe21d05c..3d08932c01694674af4c7bd90a0a87f19c8c02ff 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,9 +1,9 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Dec 2009, #01; Tue, 01)
-X-master-at: c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e
-X-next-at: e913581093e7da8bef58b143c6da65c845d9fea3
+Subject: What's cooking in git.git (Dec 2009, #02; Sat, 05)
+X-master-at: 9a424b276c409a3510e7735b6ecc012f50dc2a49
+X-next-at: d8fe1b5dc75e54be82e59239a8d5a430ae072fd8
 
-What's cooking in git.git (Dec 2009, #01; Tue, 01)
+What's cooking in git.git (Dec 2009, #02; Sat, 05)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -56,91 +56,34 @@ backward compatible.  Currently planned changes are:
 
    http://thread.gmane.org/gmane.comp.version-control.git/133256
 
---------------------------------------------------
-[Graduated to "master"]
-
-* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.
- + format-patch: add test for parsing of "--"
- + format-patch: fix parsing of "--" on the command line
-
-* bw/diff-color-hunk-header (2009-11-27) 2 commits
-  (merged to 'next' on 2009-11-29 at c446977)
- + Give the hunk comment its own color
-  (merged to 'next' on 2009-11-27 at 42ab131)
- + emit_line(): don't emit an empty <SET><RESET> followed by a newline
-
-* jc/maint-am-keep (2009-11-27) 1 commit.
-  (merged to 'next' on 2009-11-27 at 7663874)
- + Remove dead code from "git am"
-
-* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
- + prepare send-email for smoother change of --chain-reply-to default
-  (this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
-
-This starts warning about the change to --no-chain-reply-to
-in 1.7.0 for smoother transition.
-
-* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- - shortlog: respect commit encoding
-
-* fc/send-email-envelope (2009-11-26) 2 commits.
-  (merged to 'next' on 2009-11-27 at 2d0257d)
- + send-email: automatic envelope sender
- + t9001: test --envelope-sender option of send-email
-
-* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
-  (merged to 'next' on 2009-11-25 at 09d498f)
- + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
-
-Jim Meyering sent a patch to do a subset of what this does; to allow
-keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
-to also teach "am" to pass the new -b option, but that is independent of
-what Jim showed the need in real-world, so I think this can go in as-is.
-
-* jn/gitweb-blame (2009-11-24) 8 commits.
-  (merged to 'next' on 2009-11-25 at 0a5b649)
- + gitweb.js: fix padLeftStr() and its usage
- + gitweb.js: Harden setting blamed commit info in incremental blame
- + gitweb.js: fix null object exception in initials calculation
- + gitweb: Minify gitweb.js if JSMIN is defined
- + gitweb: Create links leading to 'blame_incremental' using JavaScript
-  (merged to 'next' on 2009-10-11 at 73c4a83)
- + gitweb: Colorize 'blame_incremental' view during processing
- + gitweb: Incremental blame (using JavaScript)
- + gitweb: Add optional "time to generate page" info in footer
-
-With two more changes to disable this by default to make it
-suitable as "new feature with known breakages" for 1.6.6
-
-* em/commit-claim (2009-11-04) 1 commit
-  (merged to 'next' on 2009-11-23 at b5df6fd)
- + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
-
-* cc/bisect-doc (2009-11-08) 1 commit
-  (merged to 'next' on 2009-11-27 at c46d648)
- + Documentation: add "Fighting regressions with git bisect" article
-
-* jc/pretty-lf (2009-10-04) 1 commit.
-  (merged to 'next' on 2009-11-27 at 73651c4)
- + Pretty-format: %[+-]x to tweak inter-item newlines
-
 --------------------------------------------------
 [New Topics]
 
-* ap/merge-backend-opts (2008-07-18) 6 commits
- - Document that merge strategies can now take their own options
- - Extend merge-subtree tests to test -Xsubtree=dir.
- - Make "subtree" part more orthogonal to the rest of merge-recursive.
- - Teach git-pull to pass -X<option> to git-merge
- - git merge -X<option>
- - git-merge-file --ours, --theirs
+Note: Ilari's vcs-helper series hasn't been queued yet, as its first round
+generated a healthy amount of discussion and he made it clear that the
+second round is being prepared, addressing the comments given on the list.
+Hopefully trivial coding style issues in the first round will also be
+fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis
+of the condition) in the second round.
 
-"git pull" patch needs sq-then-eval fix but otherwise seemed good.
+* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
+  (merged to 'next' on 2009-12-03 at 2ced03c)
+ + pull: clarify advice for the unconfigured error case
 
-* mo/bin-wrappers (2009-11-29) 3 commits
- - INSTALL: document a simpler way to run uninstalled builds
- - run test suite without dashed git-commands in PATH
- - build dashless "bin-wrappers" directory similar to installed bindir
+Replaces old 'jn/rfc-pull-rebase-error-message' topic.
+
+* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
+ - General --quiet improvements
+
+* mv/commit-date (2009-12-03) 2 commits
+ - Document date formats accepted by parse_date()
+ - builtin-commit: add --date option
+
+* mh/rebase-fixup (2009-12-05) 4 commits
+ - [squash to Add a command "fix"] Avoid "\(alternatives\|choices\)" in sed script
+ - Add a command "fix" to rebase --interactive.
+ - t3404: set a couple more tags in the original repository
+ - t3404: Better document the original repository layout
 
 --------------------------------------------------
 [Stalled]
@@ -155,15 +98,14 @@ the message is sent) of this feature, but the feature itself needs its own
 test to verify the negative case (i.e. does it correctly stop if the user
 says "no"?)
 
-* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- - git-pull.sh --rebase: overhaul error handling when no candidates are found
+* jc/checkout-merge-base (2009-11-20) 2 commits
+ - "rebase --onto A...B" replays history on the merge base between A and B
+ - "checkout A...B" switches to the merge base between A and B
 
-I heard this needs at least retitling among other changes?
+I've been using the first one for a while myself but do not see many users
+want this (yet); the new feature is not urgent anyway.
 
-* jh/notes (2009-11-20) 10 commits
- - Add more testcases to test fast-import of notes
- - Rename t9301 to t9350, to make room for more fast-import tests
- - fast-import: Proper notes tree manipulation using the notes API
+* jh/notes (2009-12-02) 11 commits
  - Refactor notes concatenation into a flexible interface for combining notes
  - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
  - Notes API: for_each_note(): Traverse the entire notes tree with a callback
@@ -171,8 +113,12 @@ I heard this needs at least retitling among other changes?
  - Notes API: add_note(): Add note objects to the internal notes tree structure
  - Notes API: init_notes(): Initialize the notes tree from the given notes ref
  - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
+ - Minor style fixes to notes.c
+ - Add more testcases to test fast-import of notes
+ - Rename t9301 to t9350, to make room for more fast-import tests
+ - fast-import: Proper notes tree manipulation
 
-Johan waits for an Ack from Shawn on "fast-import" one.
+Rerolled (waiting for Acks).
 
 * tr/maint-merge-ours-clarification (2009-11-15) 1 commit
   (merged to 'next' on 2009-11-21 at fadaf7b)
@@ -199,24 +145,52 @@ This has some stupid bugs and reverted from 'next' until I can fix it, but
 the "temporarily" turned out to be very loooong.  Sigh.  We won't have a
 proper fix in 1.6.6.
 
-* sr/gfi-options (2009-09-06) 6 commits.
+* jc/grep-full-tree (2009-11-24) 1 commit.
+ - grep: --full-tree
+
+The interaction with this option and pathspecs need to be worked out
+better.  I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
+all the header files in the tree, for example.
+
+--------------------------------------------------
+[Cooking]
+
+* sr/gfi-options (2009-12-04) 7 commits
+ - fast-import: add (non-)relative-marks feature
+ - fast-import: allow for multiple --import-marks= arguments
  - fast-import: test the new option command
  - fast-import: add option command
- - fast-import: test the new feature command
  - fast-import: add feature command
- - fast-import: put marks reading in it's own function
+ - fast-import: put marks reading in its own function
  - fast-import: put option parsing code in separate functions
 
-Sverre is working on a re-roll to address comments from Shawn.
+Rerolled.
 
---------------------------------------------------
-[Cooking]
+* ap/merge-backend-opts (2008-07-18) 6 commits
+ - Document that merge strategies can now take their own options
+ - Extend merge-subtree tests to test -Xsubtree=dir.
+ - Make "subtree" part more orthogonal to the rest of merge-recursive.
+ - Teach git-pull to pass -X<option> to git-merge
+ - git merge -X<option>
+ - git-merge-file --ours, --theirs
+
+"git pull" patch needs sq-then-eval fix to protect it from $IFS
+but otherwise seemed good.
+
+* mo/bin-wrappers (2009-12-02) 3 commits
+ - INSTALL: document a simpler way to run uninstalled builds
+ - run test suite without dashed git-commands in PATH
+ - build dashless "bin-wrappers" directory similar to installed bindir
 
-* tr/http-updates (2009-11-27) 2 commits
+Rerolled.
+
+* tr/http-updates (2009-12-01) 3 commits
+ - Allow curl to rewind the RPC read buffer
  - Add an option for using any HTTP authentication scheme, not only basic
  - http: maintain curl sessions
 
-It seems that this is still under discussion...
+There was a discussion on a better structure not to require rewinding in
+the first place?  I didn't follow it closely...
 
 * jc/diff-whitespace-prepare (2009-11-28) 2 commits
  - diff: flip the default diff.bwoutputonly to true
@@ -226,7 +200,9 @@ It seems that this is still under discussion...
 This is to redo the two -b/-w semantic changes to prepare the migration of
 existing users before 1.7.0 happens.
 
-* sr/vcs-helper (2009-11-18) 12 commits
+* sr/vcs-helper (2009-12-04) 13 commits
+  (merged to 'next' on 2009-12-03 at e45b562)
+ + builtin-push: don't access freed transport->url
   (merged to 'next' on 2009-11-27 at 83268ab)
  + Add Python support library for remote helpers
  + Basic build infrastructure for Python scripts
@@ -243,20 +219,6 @@ existing users before 1.7.0 happens.
 
 Should be among the first to graduate after 1.6.6 final.
 
-* jc/grep-full-tree (2009-11-24) 1 commit.
- - grep: --full-tree
-
-The interaction with this option and pathspecs need to be worked out
-better.  I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
-all the header files in the tree, for example.
-
-* jc/checkout-merge-base (2009-11-20) 2 commits
- - "rebase --onto A...B" replays history on the merge base between A and B
- - "checkout A...B" switches to the merge base between A and B
-
-I've been using the first one for a while myself but do not see many users
-want this (yet); the new feature is not urgent anyway.
-
 * tr/reset-checkout-patch (2009-11-19) 1 commit.
   (merged to 'next' on 2009-11-22 at b224950)
  + {checkout,reset} -p: make patch direction configurable
@@ -296,7 +258,10 @@ Fix-up expected.
 --------------------------------------------------
 [For 1.7.0]
 
-* jk/1.7.0-status (2009-11-27) 7 commits.
+* jk/1.7.0-status (2009-12-05) 9 commits.
+  (merged to 'next' on 2009-12-05 at 44dcefd)
+ + status -s: obey color.status
+ + builtin-commit: refactor short-status code into wt-status.c
   (merged to 'next' on 2009-11-27 at 91691ec)
  + t7508-status.sh: Add tests for status -s
  + status -s: respect the status.relativePaths option
@@ -368,11 +333,10 @@ And this is to actually flip the default and eventually remove the warning.
 
 And this is to actually flip the default in 1.7.0.
 
-
 --------------------------------------------------
 [Reverted from 'next']
 
-* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
+* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.
   (merged to 'next' on 2009-11-25 at 8aa62a0)
  + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
   (merged to 'next' on 2009-11-22 at 4ba5880)
@@ -397,6 +361,11 @@ topic.
 --------------------------------------------------
 [I have been too busy to purge these]
 
+* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
+ . git-pull.sh --rebase: overhaul error handling when no candidates are found
+
+Replaced.
+
 * jc/log-tz (2009-03-03) 1 commit.
  - Allow --date=local --date=other-format to work as expected