What's cooking (2009/11 #07)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 82ecc85d22ca811cd30e6f6235ee7ec1c4788aad..2651c451cd7b0d5da3f0449cf3eb8afa5d2d5d7b 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 (Nov 2009, #06; Wed, 25)
-X-master-at: ad7ace714d353ef49045bc37c1363e8fc904792d
-X-next-at: 71380f5fbda0088bc2b94876e2a3b3bf74d6651f
+Subject: What's cooking in git.git (Nov 2009, #07; Sun, 29)
+X-master-at: 66abce05dd5b9da9c889034781dc3de38b6e231b
+X-next-at: c4469778c3a4538c370b02fd190f6ed5a8139b58
 
-What's cooking in git.git (Nov 2009, #06; Wed, 25)
+What's cooking in git.git (Nov 2009, #07; Sun, 29)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -56,95 +56,54 @@ backward compatible.  Currently planned changes are:
 
    http://thread.gmane.org/gmane.comp.version-control.git/133256
 
---------------------------------------------------
-[Graduated to "master"]
-
-* bg/fetch-multi (2009-11-10) 9 commits.
-  (merged to 'next' on 2009-11-21 at 282f464)
- + Re-implement 'git remote update' using 'git fetch'
- + builtin-fetch: add --dry-run option
- + builtin-fetch: add --prune option
- + teach warn_dangling_symref to take a FILE argument
- + remote: refactor some logic into get_stale_heads()
- + Add missing test for 'git remote update --prune'
- + Add the configuration option skipFetchAll
- + Teach the --multiple option to 'git fetch'
- + Teach the --all option to 'git fetch'
-
-* bg/apply-doc (2009-11-22) 4 commits
-  (merged to 'next' on 2009-11-22 at b42fece)
- + apply: Use the term "working tree" consistently
- + apply: Format all options using back-quotes
- + apply: apply works outside a repository
- + Clarify and correct -z
-
-* cc/replace (2009-11-19) 3 commits
-  (merged to 'next' on 2009-11-21 at 2aaf84b)
- + Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
- + Documentation: fix typos and spelling in replace documentation
- + replace: use a GIT_NO_REPLACE_OBJECTS env variable
-
-* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
-  (merged to 'next' on 2009-11-22 at c0f64c2)
- + user-manual: Document that "git merge" doesn't like uncommited changes.
- + merge-recursive: point the user to commit when file would be overwritten.
-
-* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
-  (merged to 'next' on 2009-11-22 at 4ba5880)
- + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
- + git-count-objects: Fix a disk-space under-estimate on Cygwin
-
-* rs/color-escape-has-zero-width (2009-11-23) 1 commit
- + Teach %w() that color escape codes have zero width
-
-* jc/log-stdin (2009-11-23) 5 commits
-  (merged to 'next' on 2009-11-23 at ea71363)
- + Add trivial tests for --stdin option to log family
-  (merged to 'next' on 2009-11-21 at c3e2e52)
- + Make --stdin option to "log" family read also pathspecs
- + setup_revisions(): do not call get_pathspec() too early
- + Teach --stdin option to "log" family
- + read_revision_from_stdin(): use strbuf
-
-* mr/gitweb-snapshot (2009-11-07) 4 commits.
-  (merged to 'next' on 2009-11-21 at e825ad9)
- + gitweb: Smarter snapshot names
- + gitweb: Document current snapshot rules via new tests
- + t/gitweb-lib.sh: Split gitweb output into headers and body
-  (merged to 'next' on 2009-10-11 at 22ba047)
- + gitweb: check given hash before trying to create snapshot
-
-* rs/work-around-grep-opt-insanity (2009-11-23) 2 commits.
-  (merged to 'next' on 2009-11-25 at bf972d8)
- + Protect scripted Porcelains from GREP_OPTIONS insanity
- + mergetool--lib: simplify guess_merge_tool()
-
 --------------------------------------------------
 [New Topics]
 
-* 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)
- + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+* 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
 
-This is a revert of the tip one I merged prematurely to 'next'.  The real
-fix from Ramsay is already in 'master'.
+* 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/grep-full-tree (2009-11-24) 1 commit.
- - grep: --full-tree
+* jc/maint-am-keep (2009-11-27) 1 commit.
+  (merged to 'next' on 2009-11-27 at 7663874)
+ + Remove dead code from "git am"
 
-We probably would want test, doc and a configuration variable to make it
-default (or non-default) before we can merge it to 'master'.
+* tr/http-updates (2009-11-27) 2 commits
+ - Add an option for using any HTTP authentication scheme, not only basic
+ - http: maintain curl sessions
 
-* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- - shortlog: respect commit encoding
+* jc/diff-whitespace-prepare (2009-11-28) 2 commits
+ - diff: flip the default diff.bwoutputonly to true
+ - diff: optionally allow traditional "-b/-w affects only output" semantics
+ (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
 
-The fix is a maint material but the patch was against next, so I
-back-rebased it myself.  I tried to be careful but please double check the
-result.
+This is to redo the two -b/-w semantic changes to prepare the migration of
+existing users before 1.7.0 happens.
 
-Perhaps merge it to 'master' before 1.6.6-rc1?
+* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
+ - diff: disable diff.bwoutputonly warning
+ - diff: flip the diff.bwoutputonly default to false
+ (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
+
+And this is to actually flip the default and eventually remove the warning.
+
+* 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.)
+
+Similarly, this is to start warning about the change to --no-chain-reply-to
+in 1.7.0 for smoother transition.
+
+* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
+ - send-email: make --no-chain-reply-to the default
+ (this branch uses ns/send-email-no-chain-reply-to.)
+
+And this is to actually flip the default in 1.7.0.
 
 --------------------------------------------------
 [Stalled]
@@ -159,33 +118,11 @@ 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"?)
 
-* fc/send-email-envelope (2009-11-22) 1 commit.
- - t9001: test --envelope-sender option of send-email
-
-The new feature itself looked promising; this is just an unrelated test
-patch.
-
 * jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
  - git-pull.sh --rebase: overhaul error handling when no candidates are found
 
 I heard this needs at least retitling among other changes?
 
-* sr/vcs-helper (2009-11-18) 12 commits
- - Add Python support library for remote helpers
- - Basic build infrastructure for Python scripts
- - Allow helpers to report in "list" command that the ref is unchanged
- - Fix various memory leaks in transport-helper.c
- - Allow helper to map private ref names into normal names
- - Add support for "import" helper command
- - Allow specifying the remote helper in the url
- - Add a config option for remotes to specify a foreign vcs
- - Allow fetch to modify refs
- - Use a function to determine whether a remote is valid
- - Allow programs to not depend on remotes having urls
- - Fix memory leak in helper method for disconnect
-
-Replaced again, and looking good.  Perhaps Daniel has some comments?
-
 * 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
@@ -237,6 +174,44 @@ Sverre is working on a re-roll to address comments from Shawn.
 --------------------------------------------------
 [Cooking]
 
+* sr/vcs-helper (2009-11-18) 12 commits
+  (merged to 'next' on 2009-11-27 at 83268ab)
+ + Add Python support library for remote helpers
+ + Basic build infrastructure for Python scripts
+ + Allow helpers to report in "list" command that the ref is unchanged
+ + Fix various memory leaks in transport-helper.c
+ + Allow helper to map private ref names into normal names
+ + Add support for "import" helper command
+ + Allow specifying the remote helper in the url
+ + Add a config option for remotes to specify a foreign vcs
+ + Allow fetch to modify refs
+ + Use a function to determine whether a remote is valid
+ + Allow programs to not depend on remotes having urls
+ + Fix memory leak in helper method for disconnect
+
+* 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.
+
+* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
+ - shortlog: respect commit encoding
+
+The fix is a maint material but the patch was against next, so I
+back-rebased it myself.  I tried to be careful but please double check the
+result.
+
+Perhaps merge it to 'master' before 1.6.6-rc1?
+
+* 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
+
+Perhaps merge it to 'master' before 1.6.6-rc1?
+
 * 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
@@ -291,10 +266,8 @@ end users, but I think the code and feature is solid.
 Perhaps merge it to 'master' before 1.6.6-rc1?
 
 * cc/bisect-doc (2009-11-08) 1 commit
- - Documentation: add "Fighting regressions with git bisect" article
-
-Nobody seems to think this should go to Documentation/technical instead,
-so unless I hear otherwise, we will have it as-is in 'next' shortly.
+  (merged to 'next' on 2009-11-27 at c46d648)
+ + Documentation: add "Fighting regressions with git bisect" article
 
 Perhaps merge it to 'master' before 1.6.6-rc1?
 
@@ -323,15 +296,18 @@ Perhaps merge it to 'master' before 1.6.6-rc1?
  + update-index: refactor mark_valid() in preparation for new options
 
 * jc/pretty-lf (2009-10-04) 1 commit.
- - Pretty-format: %[+-]x to tweak inter-item newlines
+  (merged to 'next' on 2009-11-27 at 73651c4)
+ + Pretty-format: %[+-]x to tweak inter-item newlines
 
-Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before
-1.6.6?
+Perhaps merge it to 'master' before 1.6.6-rc1?
 
 --------------------------------------------------
 [For 1.7.0]
 
-* jk/1.7.0-status (2009-09-05) 5 commits.
+* jk/1.7.0-status (2009-11-27) 7 commits.
+  (merged to 'next' on 2009-11-27 at 91691ec)
+ + t7508-status.sh: Add tests for status -s
+ + status -s: respect the status.relativePaths option
   (merged to 'next' on 2009-11-21 at 884bb56)
  + docs: note that status configuration affects only long format
   (merged to 'next' on 2009-10-11 at 65c8513)
@@ -344,6 +320,10 @@ Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before
 Gives the --short output format to post 1.7.0 "git commit --dry-run" that
 is similar to that of post 1.7.0 "git status".
 
+Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
+few commits at the tip, as "docs: affects only long format" describes a
+limitation that will disappear soon.
+
 * jc/1.7.0-status (2009-09-05) 4 commits.
   (merged to 'next' on 2009-10-11 at 9558627)
  + status: typo fix in usage
@@ -364,20 +344,49 @@ With this, "git status" is no longer "git commit --dry-run".
  + Make test case number unique
  + diff: Rename QUIET internal option to QUICK
  + diff: change semantics of "ignore whitespace" options
+ (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
 
 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.
+when there is no actual output.  It is a backward incompatible change,
+and jc/diff-whitespace-prepare topic is meant to ease the transition.
 
-* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
+* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
   (merged to 'next' on 2009-11-21 at 3375bf4)
  + No diff -b/-w output for all-whitespace changes
+ (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
+
+Likewise.
 
 * jc/1.7.0-push-safety (2009-02-09) 2 commits.
   (merged to 'next' on 2009-10-11 at 81b8128)
  + Refuse deleting the current branch via push
  + Refuse updating the current branch in a non-bare repository via push
 
+--------------------------------------------------
+[Reverted from 'next']
+
+* 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)
+ + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+
+This is a revert of the tip one I merged prematurely to 'next'.  The real
+fix from Ramsay is already in 'master'.
+
+* ks/precompute-completion (2009-11-15) 4 commits.
+  (merged to 'next' on 2009-11-15 at 23cdb96)
+ + Revert ks/precompute-completion series
+  (merged to 'next' on 2009-10-28 at cd5177f)
+ + completion: ignore custom merge strategies when pre-generating
+  (merged to 'next' on 2009-10-22 at f46a28a)
+ + bug: precomputed completion includes scripts sources
+  (merged to 'next' on 2009-10-14 at adf722a)
+ + Speedup bash completion loading
+
+Reverted out of 'next', to be replaced with jn/faster-completion-startup
+topic.
+
 --------------------------------------------------
 [I have been too busy to purge these]
 
@@ -411,16 +420,3 @@ pass the tests when merged to 'pu', so it has been ejected for now.
 
 I picked these up but didn't queue as Warthog9's comments made certain
 amount of sense to me.
-
-* ks/precompute-completion (2009-11-15) 4 commits.
-  (merged to 'next' on 2009-11-15 at 23cdb96)
- + Revert ks/precompute-completion series
-  (merged to 'next' on 2009-10-28 at cd5177f)
- + completion: ignore custom merge strategies when pre-generating
-  (merged to 'next' on 2009-10-22 at f46a28a)
- + bug: precomputed completion includes scripts sources
-  (merged to 'next' on 2009-10-14 at adf722a)
- + Speedup bash completion loading
-
-Reverted out of 'next', to be replaced with jn/faster-completion-startup
-topic.