What's cooking (2009/09 #05)
Junio C Hamano committed
Sep 22, 2009 at 23:51 UTC
be72130d014831f407935123a426ffb7e84dd9ec
1 file changed
+91
-47
whats-cooking.txt
+91
-47
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2009, #04; Wed, 16)
3
-X-master-at: 8426f672fc65239135b1f1580bb79ecb16fd05f0
4
-X-next-at: 63b02d52a162438e5262062b3e6768beb3962be8
2
+Subject: What's cooking in git.git (Sep 2009, #05; Wed, 23)
3
+X-master-at: a6dbf8814f433a7fbfa9cde6333c98019f6db1e4
4
+X-next-at: a9dd6c4e8ab38f5c4af9c0710381d3844f1d904f
5
6
-What's cooking in git.git (Sep 2009, #04; Wed, 16)
6
+What's cooking in git.git (Sep 2009, #05; Wed, 23)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -54,32 +54,50 @@ backward compatible. Currently planeed changes are:
54
We are in pre-release feature freeze. 'next' will hold topics meant for
55
1.6.6 and 1.7.0.
56
57
-Except for possibly gfi-options series from Sverre, and updates to
58
-subsystems (svn, gitk, gui, and gitweb) may still need to be merged in,
59
-but otherwise 'master' is ready for -rc2. I am still hoping that I can
60
-tag the final before I take a vacation starting on 24th for a week, but we
61
-may have to give the final -rc a week to shake out any possible last
62
-minute regressions and release 1.6.5 at the beginning of next month.
63
-
64
---------------------------------------------------
65
-[Graduated to "master"]
66
-
67
-* rc/maint-http-no-head-pack-check (2009-09-14) 2 commits.
68
- + http.c: avoid freeing an uninitialized pointer
69
- + http.c: remove verification of remote packs
70
-
71
-Graduated to master and maint but then needed a small fixup.
57
+Tonight's tip of 'master' is 1.6.5-rc2, and I'll disappear for about a
58
+week. Hopefully when I come back in early October all the regressions are
59
+found and already squashed ;-)
60
61
--------------------------------------------------
62
[New Topics]
63
76
-* jc/maint-blank-at-eof (2009-09-15) 0 commits.
77
- (this branch uses jc/maint-1.6.0-blank-at-eof.)
78
-
79
-The series does not have a commit of its own but is a preparation for
80
-merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
81
-'master'. It is a fix for longstanding bug and 1.6.5 will likely to ship
82
-without this topic.
64
+* jc/fix-tree-walk (2009-09-14) 9 commits
65
+ - read-tree --debug-unpack
66
+ - unpack-trees.c: look ahead in the index
67
+ - unpack-trees.c: prepare for looking ahead in the index
68
+ - traverse_trees(): handle D/F conflict case sanely
69
+ - more D/F conflict tests
70
+ - tests: move convenience regexp to match object names to test-lib.sh
71
+ - unpack_callback(): use unpack_failed() consistently
72
+ - unpack-trees: typofix
73
+ - diff-lib.c: fix misleading comments on oneway_diff()
74
+
75
+This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
76
+is not so much as a counter-proposal; I originally thought it might make
77
+sense to walk the index and drive the walker to return the entries from
78
+trees to match entries from the index, but I ended up doing pretty much
79
+what Linus outlined --- walk the trees, and have the index walker follow
80
+it. It turned out that the index side also needed some hairy look-ahead,
81
+and I am only half satisfied with the current status of the series.
82
+
83
+To fix the resolve merge regression seen in t6035, git-merge-resolve needs
84
+to be rewritten not to use the one-path-at-a-time "git merge-index".
85
+
86
+* jp/fetch-tag-match (2009-09-17) 1 commit
87
+ - fetch: Speed up fetch by rewriting find_non_local_tags
88
+
89
+I did not have much energy left while dealing with the "fix-tree-walk"
90
+series, so I just queued this without reading nor thinking about it very
91
+much. I personally liked my version that had far smaller number of lines
92
+changed (which means I can be fairly certain that it did not introduce any
93
+regression), but perhaps the majorly rewritten logic this patch gives us
94
+may be easier to follow and maintain. We'll see.
95
+
96
+* jg/log-format-body-indent (2009-09-19) 1 commit
97
+ - [NEEDSWORK: tests] git-log --format: Add %B tag with %B(x) option
98
+
99
+* jl/submodule-add-noname (2009-09-22) 1 commit
100
+ - git submodule add: make the <path> parameter optional
101
102
--------------------------------------------------
103
[Stalled]
@@ -88,11 +106,11 @@ without this topic.
106
(merged to 'next' on 2009-08-30 at b6455c2)
107
+ send-email: confirm on empty mail subjects
108
91
-The existing tests to covers the positive case (i.e. as long as the user
92
-says "yes" to the "do you really want to send this message that lacks
93
-subject", the message is sent) of this feature, but the feature itself
94
-needs its own test to verify the negative case (i.e. does it correctly
95
-stop if the user says "no"?)
109
+The existing tests cover the positive case (i.e. as long as the user says
110
+"yes" to the "do you really want to send this message that lacks subject",
111
+the message is sent) of this feature, but the feature itself needs its own
112
+test to verify the negative case (i.e. does it correctly stop if the user
113
+says "no"?)
114
115
* jh/cvs-helper (2009-08-18) 8 commits
116
- More fixes to the git-remote-cvs installation procedure
@@ -108,19 +126,28 @@ stop if the user says "no"?)
126
Builds on db/vcs-helper. There is a re-roll planned.
127
128
* ne/rev-cache (2009-09-07) 7 commits
111
- . support for commit grafts, slight change to general mechanism
112
- . support for path name caching in rev-cache
113
- . full integration of rev-cache into git, completed test suite
114
- . administrative functions for rev-cache, start of integration into git
115
- . support for non-commit object caching in rev-cache
116
- . basic revision cache system, no integration or features
117
- . man page and technical discussion for rev-cache
129
+ - support for commit grafts, slight change to general mechanism
130
+ - support for path name caching in rev-cache
131
+ - full integration of rev-cache into git, completed test suite
132
+ - administrative functions for rev-cache, start of integration into git
133
+ - support for non-commit object caching in rev-cache
134
+ - basic revision cache system, no integration or features
135
+ - man page and technical discussion for rev-cache
136
119
-Replaced but I do not think this is ready for 'pu' yet.
137
+Tonight's 'pu' ships with this and this series seems to break a few
138
+tests. I didn't debug.
139
140
--------------------------------------------------
141
[Cooking]
142
143
+* jc/maint-blank-at-eof (2009-09-15) 0 commits.
144
+ (this branch uses jc/maint-1.6.0-blank-at-eof.)
145
+
146
+The series does not have a commit of its own but is a preparation for
147
+merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
148
+'master'. It is a fix for longstanding bug and 1.6.5 will not contain
149
+this topic.
150
+
151
* db/vcs-helper-rest (2009-09-03) 6 commits
152
- Allow helpers to report in "list" command that the ref is unchanged
153
- Add support for "import" helper command
@@ -155,15 +182,9 @@ Rerolled and queued.
182
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
183
184
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
158
- - Prepare 'traverse_trees()' for D/F conflict lookahead
185
+ . Prepare 'traverse_trees()' for D/F conflict lookahead
186
160
-Beginning of the fix to a rather nasty longstanding issue of merging trees
161
-with ("a" "a-b"), ("a/b" "a-b") and just ("a-b"), but my reading of it is
162
-that it is just the first step to demonstrate one-entry lookahead and not
163
-a full solution yet.
164
-
165
-I started writing a replacement series but the progress is a bit slower
166
-than I would have liked.
187
+Ejected from 'pu' (see jc/fix-tree-walk above).
188
189
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
190
(merged to 'next' on 2009-09-15 at 9cbfa00)
@@ -299,3 +320,26 @@ Maybe some people care about this. I dunno.
320
. Add initial support for pathname conversion to UTF-8
321
. read_directory(): infrastructure for pathname character set conversion
322
. Add 'fill_directory()' helper function for directory traversal
323
+
324
+* cc/reset-merge (2009-09-16) 4 commits
325
+ . reset: add test cases for "--merge-safe" option
326
+ . reset: add option "--merge-safe" to "git reset"
327
+ . reset: use "unpack_trees()" directly instead of "git read-tree"
328
+ . reset: add a few tests for "git reset --merge"
329
+
330
+* cc/sequencer-rebase-i (2009-08-28) 15 commits
331
+ . rebase -i: use "git sequencer--helper --cherry-pick"
332
+ . sequencer: add "--cherry-pick" option to "git sequencer--helper"
333
+ . sequencer: add "do_commit()" and related functions working on "next_commit"
334
+ . pick: libify "pick_help_msg()"
335
+ . revert: libify cherry-pick and revert functionnality
336
+ . rebase -i: use "git sequencer--helper --fast-forward"
337
+ . sequencer: let "git sequencer--helper" callers set "allow_dirty"
338
+ . sequencer: add "--fast-forward" option to "git sequencer--helper"
339
+ . sequencer: add "do_fast_forward()" to perform a fast forward
340
+ . rebase -i: use "git sequencer--helper --reset-hard"
341
+ . sequencer: add "--reset-hard" option to "git sequencer--helper"
342
+ . sequencer: add "reset_almost_hard()" and related functions
343
+ . rebase -i: use "git sequencer--helper --make-patch"
344
+ . sequencer: add "make_patch" function to save a patch
345
+ . sequencer: add "builtin-sequencer--helper.c"