What's cooking (2008/08 #05)
Junio C Hamano committed
Aug 19, 2008 at 02:00 UTC
1cc542637a767e28e13720d0bebfb42178362ba7
1 file changed
+174
-115
whats-cooking.txt
+174
-115
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Aug 2008, #04; Sun, 17)
2
-X-master-at: 053fd0c1c3da20474c4ff175c56ea4c1d6eeda11
3
-X-next-at: d4dfb3b89c69c0c009978a2948b4f87dee11a648
1
+Subject: What's cooking in git.git (Aug 2008, #05; Tue, 19)
2
+X-master-at: c6670b348cb19c74a6d7f6943df4871eb0d8295f
3
+X-next-at: 2fad1ef69ea50e7d9a61a65603ad04bcc079ac0e
4
5
-What's cooking in git.git (Aug 2008, #04; Sun, 17)
5
+What's cooking in git.git (Aug 2008, #05; Tue, 19)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -12,40 +12,67 @@ in 'next'.
12
The topics list the commits in reverse chronological order. The topics
13
meant to be merged to the maintenance series have "maint-" in their names.
14
15
+Tonight's 'pu' does not pass tests because test vectors have not been
16
+adjusted for the changes brought in by the jc/diff-prefix topic.
17
+
18
----------------------------------------------------------------
19
[New Topics]
20
18
-* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
19
- - configure: auto detect dynamic library path switches
20
- - Makefile: Allow CC_LD_DYNPATH to be overriden
21
+* js/mingw-stat (Mon Aug 18 22:01:06 2008 +0200) 2 commits
22
+ - Revert "Windows: Use a customized struct stat that also has the
23
+ st_blocks member."
24
+ - compat: introduce on_disk_bytes()
25
22
-* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
23
- + index: future proof for "extended" index entries
26
+This gets rid of use of st_blocks member (which is XSI but not POSIX
27
+proper), which was originally prompted by recent Haiku port but it turns
28
+out MinGW has the same issue as well. Queued on 'pu' just to have a
29
+chance to make sure I munged the version j6t sent me correctly before
30
+merging it upwards.
31
25
-* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
26
- + Make push more verbose about illegal combination of options
32
+* ml/submodule-foreach (Sun Aug 10 19:10:04 2008 -0400) 1 commit
33
+ + git-submodule - Add 'foreach' subcommand
34
28
-* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
29
- + count-objects: Add total pack size to verbose output
35
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
36
+ - git-am --forge: add Signed-off-by: line for the author
37
+ - git-am: clean-up Signed-off-by: lines
38
+ - stripspace: add --log-clean option to clean up signed-off-by:
39
+ lines
40
+ - stripspace: use parse_options()
41
+ - Add "git am -s" test
42
+ - git-am: refactor code to add signed-off-by line for the committer
43
31
-This one is without the human readable bits.
44
+* pm/log-exit-code (Mon Aug 11 08:46:25 2008 +0200) 2 commits
45
+ + Teach git log --exit-code to return an appropriate exit code
46
+ + Teach git log --check to return an appropriate exit code
47
33
-* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
34
- - date/time: do not get confused by fractional seconds
48
+* sb/commit-tree-minileak (Tue Aug 12 00:35:11 2008 +0200) 1 commit
49
+ + Fix commit_tree() buffer leak
50
36
-Linus hints further enhancements as "the right way", so let's see if
37
-somebody else steps up and tries it before merging this to 'next'.
51
+* pb/reflog-dwim (Sun Aug 10 22:22:21 2008 +0200) 1 commit
52
+ + builtin-reflog: Allow reflog expire to name partial ref
53
39
-* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
40
- - git-daemon: rewrite kindergarden, new option --max-connections
41
- - git-daemon: Simplify dead-children reaping logic
42
- - git-daemon: use LOG_PID, simplify logging code
43
- - git-daemon: call logerror() instead of error()
54
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
55
+ - "git push": tellme-more protocol extension
56
45
-Can somebody who actually runs the daemon standalone comment on this one?
57
+* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
58
+ - WIP: start teaching the --whitespace=fix to merge machinery
59
+
60
+* lw/gitweb (Mon Aug 18 21:39:49 2008 +0200) 3 commits
61
+ - gitweb: use new Git::Repo API, and add optional caching
62
+ - add new Perl API: Git::Repo, Git::Commit, Git::Tag, and
63
+ Git::RepoRoot
64
+ - gitweb: add test suite with Test::WWW::Mechanize::CGI
65
+
66
+* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
67
+ - diff: vary default prefix depending on what are compared
68
+
69
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
70
+ - blame: show "previous" information in --porcelain/--incremental
71
+ format
72
+ - git-blame: refactor code to emit "porcelain format" output
73
74
----------------------------------------------------------------
48
-[On Hold and/or Cooking]
75
+[Graduated to "master"]
76
77
* ak/p4 (Thu Aug 14 23:40:39 2008 +0100) 14 commits
78
+ Utilise our new p4_read_pipe and p4_write_pipe wrappers
@@ -67,38 +94,16 @@ Can somebody who actually runs the daemon standalone comment on this one?
94
+ Create a specific version of the read_pipe_lines command for p4
95
invocations
96
70
-Warmly received by the primary contributor of git-p4; I do not mind
71
-merging this before 1.6.0 (final call for "Yays").
72
-
73
-* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
74
- - Make builtin-revert.c use merge_recursive_generic()
75
- - merge-recursive.c: Add more generic merge_recursive_generic()
76
- - Split out merge_recursive() to merge-recursive.c
77
-
78
-I do not think builtlin-revert should use "recursive", but these patches
79
-give a good starting point to separate the bulk of the "rename-aware
80
-three-way merge" into library form.
81
-
82
-* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
83
- + Documentation: rev-list-options: move --simplify-merges
84
- documentation
97
+Warmly received by the primary contributors of git-p4; this was merged as
98
+part of 1.6.0.
99
86
-* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
87
- + pack-objects: Allow missing base objects when creating thin packs
88
-
89
-* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
90
- + filter-branch: use --simplify-merges
91
- + Merge branch 'jc/post-simplify' into tr/filter-branch
92
- + filter-branch: fix ref rewriting with --subdirectory-filter
93
- + filter-branch: Extend test to show rewriting bug
100
+----------------------------------------------------------------
101
+[Will merge to master soon]
102
103
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
104
+ checkout --track: make up a sensible branch name if '-b' was
105
omitted
106
99
-I like this low-impact usability enhancement; will most likely be in
100
-master soon after 1.6.0, but not before.
101
-
107
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
108
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
109
the caller
@@ -111,58 +116,6 @@ to lower level of xdiff machinery so that we do not even have to generate
116
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
117
would be a separate topic.
118
114
-* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
115
- + Make cherry-pick use rerere for conflict resolution.
116
-
117
-* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
118
- + tests: use $TEST_DIRECTORY to refer to the t/ directory
119
-
120
-* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
121
- + Add test for diff-tree --stdin with two trees
122
- + Teach git diff-tree --stdin to diff trees
123
- + diff-tree: Note that the commit ID is printed with --stdin
124
- + Refactoring: Split up diff_tree_stdin
125
-
126
-* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits
127
- + Enable parallel tests
128
- + tests: Clarify dependencies between tests, 'aggregate-results' and
129
- 'clean'
130
- + t9700: remove useless check
131
-
132
-* xx/post-1.6.0 (Mon Aug 11 21:45:52 2008 -0400) 7 commits
133
- + git-submodule foreach - Include output and clarify usage.
134
- + Fix commit_tree() buffer leak
135
- + Teach git log --exit-code to return an appropriate exit code
136
- + Teach git log --check to return an appropriate exit code
137
- + git-submodule - Add 'foreach' subcommand
138
- + builtin-reflog: Allow reflog expire to name partial ref
139
- + git-am: ignore --binary option
140
-
141
-Random collection of patches to queue for post-1.6.0 development.
142
-
143
-* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 7 commits
144
- - revision --simplify-merges: incremental simplification
145
- - revision --simplify-merges: prepare for incremental simplification
146
- - revision --simplify-merges: make it a no-op without pathspec
147
- + revision --simplify-merges: use decoration instead of commit->util
148
- field
149
- + Topo-sort before --simplify-merges
150
- + revision traversal: show full history with merge simplification
151
- + revision.c: whitespace fix
152
-
153
-"log --full-history" is with too much clutter, "log" itself is too cleverer
154
-than some people, and here is the middle level of merge simplification.
155
-
156
-I started making this incremental but the progress is not so great.
157
-
158
-* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
159
- - [do not merge -- original version] Add Git-aware CGI for Git-aware
160
- smart HTTP transport
161
- - Add backdoor options to receive-pack for use in Git-aware CGI
162
-
163
-The "magic" detection protocol was revised to use POST to info/refs; the
164
-top one queued is from before that discussion.
165
-
119
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
120
+ add: refuse to add working tree items beyond symlinks
121
+ update-index: refuse to add working tree items beyond symlinks
@@ -192,6 +145,23 @@ the path the contents comes from.
145
+ builtin-help: make some internal functions available to other
146
builtins
147
148
+* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
149
+ + Add test for diff-tree --stdin with two trees
150
+ + Teach git diff-tree --stdin to diff trees
151
+ + diff-tree: Note that the commit ID is printed with --stdin
152
+ + Refactoring: Split up diff_tree_stdin
153
+
154
+* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
155
+ + count-objects: Add total pack size to verbose output
156
+
157
+This one is without the human readable bits.
158
+
159
+* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
160
+ + Make push more verbose about illegal combination of options
161
+
162
+* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
163
+ + index: future proof for "extended" index entries
164
+
165
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
166
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
167
stepwise merge
@@ -213,14 +183,6 @@ Some people seem to prefer having this feature available also with gnutls.
183
Such an enhancement can be done in-tree on top of this series if they are
184
so inclined.
185
216
-* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
217
- - bisect: only check merge bases when needed
218
- - bisect: test merge base if good rev is not an ancestor of bad rev
219
-
220
-The first one alone does not pass its self-test but combined together they
221
-seem to. It does not build confidence as the latter one is supposed to be
222
-an optimization only.
223
-
186
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
187
+ builtin-add.c: optimize -A option and "git add ."
188
+ builtin-add.c: restructure the code for maintainability
@@ -236,6 +198,105 @@ status from git is lost from the caller.
198
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
199
+ Enable threaded delta search on *BSD and Linux.
200
201
+* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
202
+ + Make cherry-pick use rerere for conflict resolution.
203
+
204
+* js/parallel-test (Mon Aug 18 12:25:40 2008 -0400) 4 commits
205
+ + Update t/.gitignore to ignore all trash directories
206
+ + Enable parallel tests
207
+ + tests: Clarify dependencies between tests, 'aggregate-results' and
208
+ 'clean'
209
+ + t9700: remove useless check
210
+
211
+* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
212
+ + tests: use $TEST_DIRECTORY to refer to the t/ directory
213
+
214
+This does not actually move "t/test directory" any deeper, but fixes test
215
+scripts that assume they run immediately below "t/" to use TEST_DIRECTORY
216
+variable.
217
+
218
+----------------------------------------------------------------
219
+[Actively Cooking]
220
+
221
+* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
222
+ + pack-objects: Allow missing base objects when creating thin packs
223
+
224
+* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 3 commits
225
+ + filter-branch: use --simplify-merges
226
+ + filter-branch: fix ref rewriting with --subdirectory-filter
227
+ + filter-branch: Extend test to show rewriting bug
228
+
229
+Fixes a longstanding filter branch bug.
230
+
231
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
232
+ - revision --simplify-merges: incremental simplification
233
+ - revision --simplify-merges: prepare for incremental simplification
234
+ - revision --simplify-merges: make it a no-op without pathspec
235
+ + revision --simplify-merges: do not leave commits unprocessed
236
+ + revision --simplify-merges: use decoration instead of commit->util
237
+ field
238
+ + Topo-sort before --simplify-merges
239
+ + revision traversal: show full history with merge simplification
240
+ + revision.c: whitespace fix
241
+
242
+"log --full-history" is with too much clutter, "log" itself is too cleverer
243
+than some people, and here is the middle level of merge simplification.
244
+
245
+I started making this incremental but the progress is not so great.
246
+
247
+* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
248
+ + Documentation: rev-list-options: move --simplify-merges
249
+ documentation
250
+
251
+----------------------------------------------------------------
252
+[On Hold]
253
+
254
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
255
+ - date/time: do not get confused by fractional seconds
256
+
257
+Linus hints further enhancements as "the right way", so let's see if
258
+somebody else steps up and tries it before merging this to 'next'.
259
+
260
+* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
261
+ - configure: auto detect dynamic library path switches
262
+ - Makefile: Allow CC_LD_DYNPATH to be overriden
263
+
264
+Needs success reports from people who do use user-defined dynamic library
265
+path when they build their "git" before this series can go anywhere.
266
+
267
+* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
268
+ - git-daemon: rewrite kindergarden, new option --max-connections
269
+ - git-daemon: Simplify dead-children reaping logic
270
+ - git-daemon: use LOG_PID, simplify logging code
271
+ - git-daemon: call logerror() instead of error()
272
+
273
+Can somebody who actually runs the daemon standalone comment on this one?
274
+
275
+* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
276
+ - Make builtin-revert.c use merge_recursive_generic()
277
+ - merge-recursive.c: Add more generic merge_recursive_generic()
278
+ - Split out merge_recursive() to merge-recursive.c
279
+
280
+I do not think builtlin-revert should use "recursive", but these patches
281
+give a good starting point to separate the bulk of the "rename-aware
282
+three-way merge" into library form.
283
+
284
+* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
285
+ - [do not merge -- original version] Add Git-aware CGI for Git-aware
286
+ smart HTTP transport
287
+ - Add backdoor options to receive-pack for use in Git-aware CGI
288
+
289
+The "magic" detection protocol was revised to use POST to info/refs; the
290
+top one queued is from before that discussion.
291
+
292
+* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
293
+ - bisect: only check merge bases when needed
294
+ - bisect: test merge base if good rev is not an ancestor of bad rev
295
+
296
+The first one alone does not pass its self-test but combined together they
297
+seem to. It does not build confidence as the latter one is supposed to be
298
+an optimization only. Resend of fixed-up series is needed.
299
+
300
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
301
+ merge: remove deprecated summary and diffstat options and config
302
variables
@@ -245,10 +306,8 @@ that the synonyms to the ones this one deletes are fairly new invention
306
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
307
in 1.7.0.
308
248
-* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
249
- + Revert "Make clients ask for "git program" over ssh and local
250
- transport"
251
- + Make clients ask for "git program" over ssh and local transport
309
+* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
310
+ - Make clients ask for "git program" over ssh and local transport
311
312
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
313
timeframe.