To: git@vger.kernel.org
-Subject: What's cooking in git.git (Sep 2009, #01; Sat, 05)
-X-master-at: 79b4fde573eb5e86a8109d100ad182be1eb5fc54
-X-next-at: 85dc3ec32928a03c0f4996b00d7a74f5a8f9045e
+Subject: What's cooking in git.git (Sep 2009, #02; Mon, 07)
+X-master-at: 5ad9dce7e691106fecde413de8cc321b937367a6
+X-next-at: 5f6b0ffff13f5cd762d0a5a4e1c4dede58e8a537
-What's cooking in git.git (Sep 2009, #01; Sat, 05)
+What's cooking in git.git (Sep 2009, #02; Mon, 07)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
-After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
-out the planned "push safety" change. 1.7.0 would be a good time to
-introduce "justifiable" changes that are not strictly backward compatible.
+In 1.7.0, we plan to correct handful of warts in the interfaces everybody
+agrees that they were mistakes. The resulting system may not be strictly
+backward compatible. Currently planeed changes are:
+
+ * refuse push to update the checked out branch in a non-bare repo by
+ default
+
+ Make "git push" into a repository to update the branch that is checked
+ out fail by default. You can countermand this default by setting a
+ configuration variable in the receiving repository.
+
+ http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+
+ * refuse push to delete the current branch by default
+
+ Make "git push $there :$killed" to delete the branch that is pointed at
+ by its HEAD fail by default. You can countermand this default by
+ setting a configuration variable in the receiving repository.
+
+ http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
+
+ * git-send-email won't make deep threads by default
+
+ Many people said that by default when sending more than 2 patches the
+ threading git-send-email makes by default is hard to read, and they
+ prefer the default be one cover letter and each patch as a direct
+ follow-up to the cover letter. You can countermand this by setting a
+ configuration variable.
+
+ http://article.gmane.org/gmane.comp.version-control.git/109790
+
+ * git-status won't be "git-commit --dry-run" anymore
+
+ http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
+
+ * "git-diff -w --exit-code" will exit success if only differences it
+ found are whitespace changes that are stripped away from the output.
+
+ http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
-I will probably do 1.6.5-rc0 this weekend, leaving some topics still
-cooking in 'next'.
+I tagged and pushed out 1.6.5-rc0. There are still some topics cooking in
+'next' I would rather not leave out, but I've been hoping to keep this
+cycle short, and I'm also hoping to tag the real 1.6.5 before I vanish for
+about a week and half later in the month. so in the worst case there may
+have to be a 1.6.6 to include the leftover topics.
--------------------------------------------------
[Graduated to "master"]
-* lt/approxidate (2009-08-30) 6 commits
- (merged to 'next' on 2009-08-30 at e016e3d)
- + fix approxidate parsing of relative months and years
- + tests: add date printing and parsing tests
- + refactor test-date interface
- + Add date formatting and parsing functions relative to a given time
- (merged to 'next' on 2009-08-26 at 62853f9)
- + Further 'approxidate' improvements
- + Improve on 'approxidate'
-
-* mr/gitweb-snapshot (2009-08-25) 3 commits
- (merged to 'next' on 2009-08-30 at e4edd0b)
- + gitweb: add t9501 tests for checking HTTP status codes
- + gitweb: split test suite into library and tests
- + gitweb: improve snapshot error handling
-
-* tf/diff-whitespace-incomplete-line (2009-08-23) 2 commits.
- (merged to 'next' on 2009-08-26 at 4fc7784)
- + xutils: Fix xdl_recmatch() on incomplete lines
- + xutils: Fix hashing an incomplete line with whitespaces at the end
+* np/maint-1.6.3-deepen (2009-09-03) 2 commits
+ (merged to 'next' on 2009-09-06 at d597fba)
+ + pack-objects: free preferred base memory after usage
+ + make shallow repository deepening more network efficient
+
+Further optimization and fixing of the object transfer around the "shallow
+repository" codepaths.
+
+* js/stash-dwim (2009-07-27) 1 commit.
+ (merged to 'next' on 2009-08-16 at 67896c4)
+ + Make 'git stash -k' a short form for 'git stash save --keep-index'
+ (this branch is used by tr/reset-checkout-patch.)
+
+* tr/reset-checkout-patch (2009-08-18) 10 commits.
+ (merged to 'next' on 2009-09-03 at d4f2ed7)
+ + stash: simplify defaulting to "save" and reject unknown options
+ (merged to 'next' on 2009-08-27 at d314281)
+ + Make test case number unique
+ (merged to 'next' on 2009-08-18 at e465bb3)
+ + tests: disable interactive hunk selection tests if perl is not available
+ (merged to 'next' on 2009-08-16 at 67896c4)
+ + DWIM 'git stash save -p' for 'git stash -p'
+ + Implement 'git stash save --patch'
+ + Implement 'git checkout --patch'
+ + Implement 'git reset --patch'
+ + builtin-add: refactor the meat of interactive_add()
+ + Add a small patch-mode testing library
+ + git-apply--interactive: Refactor patch mode code
+ (this branch uses js/stash-dwim.)
+
+DWIMmery of the two series tightened for safety a few days ago. Otherwise
+the same as what have been cooking in 'next' for a few weeks.
+
+* jc/upload-pack-hook (2009-08-28) 2 commits
+ (merged to 'next' on 2009-08-31 at f9933a5)
+ + upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
+ + upload-pack: add a trigger for post-upload-pack hook
+
+* jk/clone-b (2009-08-26) 1 commit
+ (merged to 'next' on 2009-08-30 at 10a68d1)
+ + clone: add --branch option to select a different HEAD
+
+* jc/mailinfo-scissors (2009-08-26) 5 commits
+ (merged to 'next' on 2009-08-30 at 5fc6248)
+ + mailinfo.scissors: new configuration
+ + am/mailinfo: Disable scissors processing by default
+ + Documentation: describe the scissors mark support of "git am"
+ + Teach mailinfo to ignore everything before -- >8 -- mark
+ + builtin-mailinfo.c: fix confusing internal API to mailinfo()
+
+I didn't pick up the patch to simplify the definition of scissors. I do
+not have strong opinion on it either way, and nobody on the list seemed to
+care too much either.
--------------------------------------------------
[New Topics]
-* pk/fast-import-tars (2009-09-03) 1 commit
- - import-tars: Allow per-tar author and commit message.
-
-* jc/maint-1.6.0-blank-at-eof (2009-09-04) 9 commits.
- - diff --color: color blank-at-eof
- - diff --whitespace=warn/error: fix blank-at-eof check
- - diff --whitespace=warn/error: obey blank-at-eof
- - diff.c: the builtin_diff() deals with only two-file comparison
- - apply --whitespace: warn blank but not necessarily empty lines at EOF
- - apply --whitespace=warn/error: diagnose blank at EOF
- - apply.c: split check_whitespace() into two
- - apply --whitespace=fix: detect new blank lines at eof correctly
- - apply --whitespace=fix: fix handling of blank lines at the eof
+* cb/maint-1.6.3-grep-relative-up (2009-09-05) 2 commits.
+ (merged to 'next' on 2009-09-07 at f9b5b48)
+ + grep: accept relative paths outside current working directory
+ + grep: fix exit status if external_grep() punts
+
+1.6.5 material.
+
+* jk/1.7.0-status (2009-09-05) 5 commits
+ - docs: note that status configuration affects only long format
+ (merged to 'next' on 2009-09-07 at 8a7c563)
+ + commit: support alternate status formats
+ + status: add --porcelain output format
+ + status: refactor format option parsing
+ + status: refactor short-mode printing to its own function
+ (this branch uses jc/1.7.0-status.)
+
+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".
+
+It might be a good idea to make the --short format part of 1.6.6 without
+waiting for 1.7.0; it would require some branch shuffling to bring the
+short-status patch earlier than the one that makes "status" different from
+"commit --dry-run", though.
+
+* jk/unwanted-advices (2009-09-06) 2 commits
+ - status: make "how to stage" messages optional
+ - push: make non-fast-forward help message configurable
+
+Post 1.3.0 "newbie friendliness drive" introduced a lot of "helpful"
+advice messages that are sometimes found to be irritating once the user
+got used to working with git. This series introduces a general mechanism
+to allow us to make them less loud using the config mechanism. The config
+option hierarchy in these two are "message.*" but it is planned to be
+renamed to "advice.*".
+
+* jn/gitweb-show-size (2009-09-07) 1 commit
+ - gitweb: Add 'show-sizes' feature to show blob sizes in tree view
+
+* jt/pushinsteadof (2009-09-07) 2 commits
+ - Add url.<base>.pushInsteadOf: URL rewriting for push only
+ - Wrap rewrite globals in a struct in preparation for adding another set
+
+Probably 1.6.5 material.
+
+* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
+ - Prepare 'traverse_trees()' for D/F conflict lookahead
+
+Beginning of the fix to a rather nasty longstanding issue of merging trees
+with ("a" "a-b"), ("a/b" "a-b") and just ("a-b").
+
+* ne/rev-cache (2009-09-07) 7 commits
+ . support for commit grafts, slight change to general mechanism
+ . support for path name caching in rev-cache
+ . full integration of rev-cache into git, completed test suite
+ . administrative functions for rev-cache, start of integration into git
+ . support for non-commit object caching in rev-cache
+ . basic revision cache system, no integration or features
+ . man page and technical discussion for rev-cache
+
+Replaced but I do not think this is ready for 'pu' yet.
--------------------------------------------------
[Stalled]
I heard the cvs-helper series depends on this one. It seems that the
fan-out strategy is being rethought?
---------------------------------------------------
-[Cooking]
+* je/send-email-no-subject (2009-08-05) 1 commit
+ (merged to 'next' on 2009-08-30 at b6455c2)
+ + send-email: confirm on empty mail subjects
+
+The existing tests to covers the positive case (i.e. as long as the user
+says "yes" to the "do you really want to send this message that lacks
+subject", 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"?)
* db/vcs-helper (2009-09-03) 16 commits
- Allow helpers to report in "list" command that the ref is unchanged
+ 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 branch is used by jh/cvs-helper)
+ (this branch is used by jh/cvs-helper.)
+
+I'd really want to have this in 1.6.5 so that we can eject -lcurl from the
+main "git" binary. The patches in 'pu' got some review comments, and I
+thought Daniel's responses were sensible. Comments?
* jh/cvs-helper (2009-08-18) 8 commits
- More fixes to the git-remote-cvs installation procedure
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
- (this branch uses db/vcs-helper)
+ (this branch uses db/vcs-helper.)
Builds on db/vcs-helper. There is a re-roll planned.
-* pk/fast-import-dirs (2009-09-03) 1 commit
- - Add script for importing bits-and-pieces to Git.
-
-With an updated key-value quoting rules, which I haven't carefully looked
-at. Aren't there standard libraries to do this sort of thing without us
-having to hand-roll these logic every time, I have to wonder...
-
-* jn/gitweb-blame (2009-09-01) 5 commits
- - gitweb: Minify gitweb.js if JSMIN is defined
- - gitweb: Create links leading to 'blame_incremental' using JavaScript
- - gitweb: Colorize 'blame_incremental' view during processing
- - gitweb: Incremental blame (using JavaScript)
- - gitweb: Add optional "time to generate page" info in footer
-
-Ajax-y blame. The first part should be in 'next' shortly.
-
-* js/stash-dwim (2009-07-27) 1 commit.
- (merged to 'next' on 2009-08-16 at 67896c4)
- + Make 'git stash -k' a short form for 'git stash save --keep-index'
- (this branch is used by tr/reset-checkout-patch.)
-
-* tr/reset-checkout-patch (2009-08-18) 10 commits.
- (merged to 'next' on 2009-09-03 at d4f2ed7)
- + stash: simplify defaulting to "save" and reject unknown options
- (merged to 'next' on 2009-08-27 at d314281)
- + Make test case number unique
- (merged to 'next' on 2009-08-18 at e465bb3)
- + tests: disable interactive hunk selection tests if perl is not available
- (merged to 'next' on 2009-08-16 at 67896c4)
- + DWIM 'git stash save -p' for 'git stash -p'
- + Implement 'git stash save --patch'
- + Implement 'git checkout --patch'
- + Implement 'git reset --patch'
- + builtin-add: refactor the meat of interactive_add()
- + Add a small patch-mode testing library
- + git-apply--interactive: Refactor patch mode code
- (this branch uses js/stash-dwim.)
-
-DWIMmery of the two series tightened for safety. This should be ready for
-1.6.5.
-
-* jc/upload-pack-hook (2009-08-28) 2 commits
- (merged to 'next' on 2009-08-31 at f9933a5)
- + upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
- + upload-pack: add a trigger for post-upload-pack hook
-
-* jk/clone-b (2009-08-26) 1 commit
- (merged to 'next' on 2009-08-30 at 10a68d1)
- + clone: add --branch option to select a different HEAD
-
-* je/send-email-no-subject (2009-08-05) 1 commit
- (merged to 'next' on 2009-08-30 at b6455c2)
- + send-email: confirm on empty mail subjects
-
-The existing tests to covers the positive case (i.e. as long as the user
-says "yes" to the "do you really want to send this message that lacks
-subject", 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"?)
-
-* jc/mailinfo-scissors (2009-08-26) 5 commits
- (merged to 'next' on 2009-08-30 at 5fc6248)
- + mailinfo.scissors: new configuration
- + am/mailinfo: Disable scissors processing by default
- + Documentation: describe the scissors mark support of "git am"
- + Teach mailinfo to ignore everything before -- >8 -- mark
- + builtin-mailinfo.c: fix confusing internal API to mailinfo()
-
-I didn't pick up the patch to simplify the definition of scissors. I do
-not have strong opinion on it either way, but the list would hopefully
-decide it before too long.
-
* cc/sequencer-rebase-i (2009-08-28) 15 commits
- rebase -i: use "git sequencer--helper --cherry-pick"
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
- sequencer: add "builtin-sequencer--helper.c"
Migrating "rebase -i" bit by bit to C.
+Not a 1.6.5 material yet.
+
+--------------------------------------------------
+[Cooking]
+
+* pk/fast-import-tars (2009-09-03) 1 commit
+ (merged to 'next' on 2009-09-07 at 8fbf027)
+ + import-tars: Allow per-tar author and commit message.
+
+* jc/maint-1.6.0-blank-at-eof (2009-09-05) 10 commits.
+ (merged to 'next' on 2009-09-07 at 165dc3c)
+ + core.whitespace: split trailing-space into blank-at-{eol,eof}
+ + diff --color: color blank-at-eof
+ + diff --whitespace=warn/error: fix blank-at-eof check
+ + diff --whitespace=warn/error: obey blank-at-eof
+ + diff.c: the builtin_diff() deals with only two-file comparison
+ + apply --whitespace: warn blank but not necessarily empty lines at EOF
+ + apply --whitespace=warn/error: diagnose blank at EOF
+ + apply.c: split check_whitespace() into two
+ + apply --whitespace=fix: detect new blank lines at eof correctly
+ + apply --whitespace=fix: fix handling of blank lines at the eof
+
+Hopefully in 1.6.5
-* sr/gfi-options (2009-09-02) 6 commits
- - 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 option parsing code in separate functions
+* pk/fast-import-dirs (2009-09-03) 1 commit
+ (merged to 'next' on 2009-09-07 at 836cba2)
+ + Add script for importing bits-and-pieces to Git.
+
+With an updated key-value quoting rules, which I haven't carefully looked
+at. I have to wonder if there are standard libraries to do this sort of
+thing without having to hand-roll these logic every time. But perhaps I
+shouldn't be too picky on contrib/ material.
-Re-rolled again.
+* jn/gitweb-blame (2009-09-01) 5 commits
+ - gitweb: Minify gitweb.js if JSMIN is defined
+ - gitweb: Create links leading to 'blame_incremental' using JavaScript
+ (merged to 'next' on 2009-09-07 at 3622199)
+ + gitweb: Colorize 'blame_incremental' view during processing
+ + gitweb: Incremental blame (using JavaScript)
+ + gitweb: Add optional "time to generate page" info in footer
+
+Ajax-y blame.
+
+* sr/gfi-options (2009-09-06) 6 commits
+ (merged to 'next' on 2009-09-07 at 5f6b0ff)
+ + 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 option parsing code in separate functions
+
+Perhaps 1.6.5 material but I wasn't sure.
* nd/sparse (2009-08-20) 19 commits
- sparse checkout: inhibit empty worktree
--------------------------------------------------
[For 1.7.0]
-* jc/1.7.0-status (2009-08-15) 3 commits
+* jc/1.7.0-status (2009-09-05) 4 commits
+ (merged to 'next' on 2009-09-06 at 19d4beb)
+ + status: typo fix in usage
(merged to 'next' on 2009-08-22 at b3507bb)
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
+ (this branch is used by jk/1.7.0-status.)
-With this, "git status" is no longer "git commit --preview".
+With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
(merged to 'next' on 2009-08-22 at 5106de8)
Maybe some people care about this. I dunno.
-* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 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
-
-* jc/merge-convert (2009-01-26) 1 commit.
- . git-merge-file: allow converting the results for the work tree
-
* lt/read-directory (2009-05-15) 3 commits.
. Add initial support for pathname conversion to UTF-8
. read_directory(): infrastructure for pathname character set conversion
. Add 'fill_directory()' helper function for directory traversal
-
-* ps/blame (2009-03-12) 1 commit.
- . blame.c: start libifying the blame infrastructure
-
-* pb/tracking (2009-07-16) 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
-
-Has been ejected from 'pu' for some time, expecting a reroll.
-
-* ne/rev-cache (2009-08-21) 6 commits
- . support for path name caching in rev-cache
- . full integration of rev-cache into git, completed test suite
- . administrative functions for rev-cache, start of integration into git
- . support for non-commit object caching in rev-cache
- . basic revision cache system, no integration or features
- . man page and technical discussion for rev-cache
-
-Updated but seems to break upload-pack tests when merged to 'pu'; given
-what this series touches, breakages in that area are expected.
-May discard if a working reroll comes, to give it a fresh start.
projects / thirdparty / git.git / commitdiff
