What's cooking (2011/08 #07)
Junio C Hamano committed
Aug 24, 2011 at 16:42 UTC
4bee7490f9dab6e968086f7c3f1f2cc02caf91f3
1 file changed
+225
-150
whats-cooking.txt
+225
-150
@@ -1,82 +1,14 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2011, #06; Tue, 23)
3
-X-master-at: 8d9185bc12650a9839dff45a8754f05618cdb3f5
4
-X-next-at: b87361146165b920a11ae9bb995856575d51be9a
2
+Subject: What's cooking in git.git (Aug 2011, #07; Wed, 24)
3
+X-master-at: b7fcd007153b5021ed70ddc0a224127f14601bbc
4
+X-next-at: aa5cf7ba43e1b74c3a0aae0ca2989879d9a46233
5
6
-What's cooking in git.git (Aug 2011, #06; Tue, 23)
6
+What's cooking in git.git (Aug 2011, #07; Wed, 24)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-I was very tempted to cut 1.7.7-rc0 today, but we have quite a few topics
13
-that deserve to be in the upcoming release and are still in 'next'. I'll
14
-probably merge most if not all of what are in 'next' as of today sometime
15
-later this week, tag a 1.7.7-rc0 release and declare feature freeze for
16
-this cycle.
17
-
18
---------------------------------------------------
19
-[Graduated to "master"]
20
-
21
-* cb/maint-ls-files-error-report (2011-08-11) 1 commit
22
- (merged to 'next' on 2011-08-15 at 69f41cf)
23
- + ls-files: fix pathspec display on error
24
-
25
-* jn/maint-test-return (2011-08-11) 3 commits
26
- (merged to 'next' on 2011-08-15 at 5a42301)
27
- + t3900: do not reference numbered arguments from the test script
28
- + test: cope better with use of return for errors
29
- + test: simplify return value of test_run_
30
-
31
-* rt/zlib-smaller-window (2011-08-11) 2 commits
32
- (merged to 'next' on 2011-08-15 at e05b26b)
33
- + test: consolidate definition of $LF
34
- + Tolerate zlib deflation with window size < 32Kb
35
-
36
---------------------------------------------------
37
-[New Topics]
38
-
39
-* fk/use-kwset-pickaxe-grep-f (2011-08-20) 5 commits
40
- (merged to 'next' on 2011-08-23 at 93ba509)
41
- + Use kwset in grep
42
- + Use kwset in pickaxe
43
- + Adapt the kwset code to Git
44
- + Add string search routines from GNU grep
45
- + Add obstack.[ch] from EGLIBC 2.10
46
-
47
-* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit
48
- (merged to 'next' on 2011-08-23 at 18cee02)
49
- + commit: reduce use of redundant global variables
50
-
51
-* bw/doc-repo-layout (2011-08-22) 2 commits
52
- - Mark http-fetch without -a as deprecated
53
- - Documentation: Grammar correction, wording fixes and cleanup
54
-
55
-* ci/forbid-unwanted-current-branch-update (2011-08-22) 2 commits
56
- - Show interpreted branch name in error messages
57
- - Prevent force-updating of the current branch
58
-
59
-* di/fast-import-blob-tweak (2011-08-22) 2 commits
60
- - fast-import: treat cat-blob as a delta base hint for next blob
61
- - fast-import: count and report # of calls to diff_delta in stats
62
-
63
-* jc/combine-diff-callback (2011-08-20) 1 commit
64
- - combine-diff: support format_callback
65
- (this branch is used by fg/submodule-ff-check-before-push.)
66
-
67
-* jc/maint-clone-alternates (2011-08-23) 2 commits
68
- (merged to 'next' on 2011-08-23 at 7280deb)
69
- + clone: clone from a repository with relative alternates
70
- + clone: allow more than one --reference
71
-
72
-* nd/maint-clone-gitdir (2011-08-22) 2 commits
73
- - clone: allow to clone from .git file
74
- - read_gitfile_gently(): rename misnamed function to read_gitfile()
75
-
76
-* di/fast-import-tagging (2011-08-23) 2 commits
77
- - fast-import: allow to tag newly created objects
78
- - fast-import: add tests for tagging blobs
79
-
12
--------------------------------------------------
13
[Stalled]
14
@@ -90,17 +22,6 @@ this cycle.
22
23
Needs documentation updates.
24
93
-* jc/merge-reword (2011-05-25) 2 commits
94
- - merge: mark the final "Merge made by..." message for l10n
95
- - merge: reword the final message
96
-
97
-Probably the topmost commit should be dropped.
98
-
99
-* nk/branch-v-abbrev (2011-07-01) 1 commit
100
- - branch -v: honor core.abbrev
101
-
102
-Perhaps needs an updated commit log message?
103
-
25
* jh/receive-count-limit (2011-05-23) 10 commits
26
- receive-pack: Allow server to refuse pushes with too many objects
27
- pack-objects: Estimate pack size; abort early if pack size limit is exceeded
@@ -147,18 +68,136 @@ I think a further refactoring (no, not my suggestion) was offered?
68
--------------------------------------------------
69
[Cooking]
70
71
+* jc/merge-reword (2011-05-25) 1 commit
72
+ (merged to 'next' on 2011-08-24 at aa5cf7b)
73
+ + merge: reword the final message
74
+
75
+Will merge to "master".
76
+
77
+* nk/branch-v-abbrev (2011-07-01) 1 commit
78
+ (merged to 'next' on 2011-08-24 at e9152cf)
79
+ + branch -v: honor core.abbrev
80
+
81
+Will merge to "master".
82
+
83
+* jk/pager-with-external-command (2011-08-19) 1 commit
84
+ (merged to 'next' on 2011-08-24 at 083f5da)
85
+ + support pager.* for external commands
86
+ (this branch is used by jk/pager-with-alias and jk/pager-with-alias; uses jk/color-and-pager.)
87
+
88
+Up to this part (but not "alias") the topic looked unconditionally a good
89
+thing to do.
90
+
91
+Will aim to merge to "master" by -rc1.
92
+
93
+* fk/use-kwset-pickaxe-grep-f (2011-08-20) 5 commits
94
+ (merged to 'next' on 2011-08-23 at 93ba509)
95
+ + Use kwset in grep
96
+ + Use kwset in pickaxe
97
+ + Adapt the kwset code to Git
98
+ + Add string search routines from GNU grep
99
+ + Add obstack.[ch] from EGLIBC 2.10
100
+
101
+Will aim to merge to "master" by -rc1.
102
+
103
+* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit
104
+ (merged to 'next' on 2011-08-23 at 18cee02)
105
+ + commit: reduce use of redundant global variables
106
+
107
+Will merge to "master".
108
+
109
+* bw/doc-repo-layout (2011-08-23) 2 commits
110
+ (merged to 'next' on 2011-08-24 at 605c730)
111
+ + Mark http-fetch without -a as deprecated
112
+ + Documentation: Grammar correction, wording fixes and cleanup
113
+
114
+Will merge to "master".
115
+
116
+* ci/forbid-unwanted-current-branch-update (2011-08-22) 2 commits
117
+ (merged to 'next' on 2011-08-24 at 1e93b67)
118
+ + Show interpreted branch name in error messages
119
+ + Prevent force-updating of the current branch
120
+
121
+Will aim to merge to "master" by -rc1.
122
+
123
+* di/fast-import-blob-tweak (2011-08-22) 2 commits
124
+ (merged to 'next' on 2011-08-24 at 52eef2a)
125
+ + fast-import: treat cat-blob as a delta base hint for next blob
126
+ + fast-import: count and report # of calls to diff_delta in stats
127
+
128
+Will aim to merge to "master" by -rc1.
129
+
130
+* di/fast-import-tagging (2011-08-23) 2 commits
131
+ (merged to 'next' on 2011-08-24 at 67e0937)
132
+ + fast-import: allow to tag newly created objects
133
+ + fast-import: add tests for tagging blobs
134
+
135
+Will aim to merge to "master" by -rc1.
136
+
137
+* di/fast-import-deltified-tree (2011-08-14) 2 commits
138
+ (merged to 'next' on 2011-08-23 at ee30265)
139
+ + fast-import: prevent producing bad delta
140
+ + fast-import: add a test for tree delta base corruption
141
+
142
+Will aim to merge to "master" by -rc1.
143
+
144
+* di/fast-import-ident (2011-08-11) 5 commits
145
+ (merged to 'next' on 2011-08-23 at 9b86391)
146
+ + fsck: improve committer/author check
147
+ + fsck: add a few committer name tests
148
+ + fast-import: check committer name more strictly
149
+ + fast-import: don't fail on omitted committer name
150
+ + fast-import: add input format tests
151
+
152
+Will aim to merge to "master" by -rc1.
153
+
154
+* di/fast-import-doc (2011-08-17) 1 commit
155
+ (merged to 'next' on 2011-08-23 at dab4088)
156
+ + doc/fast-import: document feature import-marks-if-exists
157
+
158
+Will merge to "master".
159
+
160
+* jc/combine-diff-callback (2011-08-20) 1 commit
161
+ (merged to 'next' on 2011-08-24 at 9f9b42d)
162
+ + combine-diff: support format_callback
163
+ (this branch is used by fg/submodule-ff-check-before-push.)
164
+
165
+Will merge to "master".
166
+
167
+* jc/maint-clone-alternates (2011-08-23) 2 commits
168
+ (merged to 'next' on 2011-08-23 at 7280deb)
169
+ + clone: clone from a repository with relative alternates
170
+ + clone: allow more than one --reference
171
+
172
+Will aim to merge to "master" by -rc1.
173
+
174
+* nd/maint-clone-gitdir (2011-08-22) 2 commits
175
+ (merged to 'next' on 2011-08-24 at cbf052b)
176
+ + clone: allow to clone from .git file
177
+ + read_gitfile_gently(): rename misnamed function to read_gitfile()
178
+
179
+Will aim to merge to "master" by -rc1.
180
+
181
* jc/traverse-commit-list (2011-08-22) 3 commits
151
- - revision.c: update show_object_with_name() without using malloc()
152
- - revision.c: add show_object_with_name() helper function
153
- - rev-list: fix finish_object() call
182
+ (merged to 'next' on 2011-08-24 at df50dd7)
183
+ + revision.c: update show_object_with_name() without using malloc()
184
+ + revision.c: add show_object_with_name() helper function
185
+ + rev-list: fix finish_object() call
186
+
187
+Not urgent; will not be in 1.7.7.
188
189
* rc/diff-cleanup-records (2011-08-17) 2 commits
190
(merged to 'next' on 2011-08-23 at b8414f5)
191
+ Merge branch 'rc/histogram-diff' into HEAD
192
+ xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
193
194
+Will aim to merge to "master" by -rc1.
195
+
196
* fk/make-auto-header-dependencies (2011-08-18) 1 commit
161
- - Makefile: Use computed header dependencies if the compiler supports it
197
+ (merged to 'next' on 2011-08-24 at 3da2c25)
198
+ + Makefile: Use computed header dependencies if the compiler supports it
199
+
200
+Not urgent; will not be in 1.7.7.
201
202
* jk/color-and-pager (2011-08-19) 10 commits
203
(merged to 'next' on 2011-08-23 at cbb9495)
@@ -172,12 +211,15 @@ I think a further refactoring (no, not my suggestion) was offered?
211
+ t7006: use test_config helpers
212
+ test-lib: add helper functions for config
213
+ t7006: modernize calls to unset
175
- (this branch is used by jk/pager-with-alias.)
214
+ (this branch is used by jk/pager-with-alias and jk/pager-with-external-command.)
215
+
216
+Will aim to merge to "master" by -rc1.
217
177
-* jk/pager-with-alias (2011-08-19) 2 commits
218
+* jk/pager-with-alias (2011-08-19) 1 commit
219
- support pager.* for aliases
179
- - support pager.* for external commands
180
- (this branch uses jk/color-and-pager.)
220
+ (this branch uses jk/color-and-pager, jk/pager-with-external-command and jk/pager-with-external-command.)
221
+
222
+Perhaps will drop.
223
224
* nd/decorate-grafts (2011-08-19) 5 commits
225
(merged to 'next' on 2011-08-23 at 475d27e)
@@ -187,21 +229,29 @@ I think a further refactoring (no, not my suggestion) was offered?
229
+ Add for_each_commit_graft() to iterate all grafts
230
+ decoration: do not mis-decorate refs with same prefix
231
232
+Will aim to merge to "master" by -rc1.
233
+
234
* va/p4-branch-import (2011-08-22) 4 commits
191
- - git-p4: Add simple test case for branch import
192
- - git-p4: Allow branch definition with git config
193
- - git-p4: Allow filtering Perforce branches by user
194
- - git-p4: Correct branch base depot path detection
235
+ (merged to 'next' on 2011-08-24 at f67f8af)
236
+ + git-p4: Add simple test case for branch import
237
+ + git-p4: Allow branch definition with git config
238
+ + git-p4: Allow filtering Perforce branches by user
239
+ + git-p4: Correct branch base depot path detection
240
(this branch uses va/p4-rename-copy.)
241
242
+Will merge to "master".
243
+
244
* va/p4-rename-copy (2011-08-22) 5 commits
198
- - git-p4: Process detectCopiesHarder with --bool
199
- - git-p4: Add test case for copy detection
200
- - git-p4: Add test case for rename detection
201
- - git-p4: Add description of rename/copy detection options
202
- - git-p4: Allow setting rename/copy detection threshold
245
+ (merged to 'next' on 2011-08-24 at f1faa94)
246
+ + git-p4: Process detectCopiesHarder with --bool
247
+ + git-p4: Add test case for copy detection
248
+ + git-p4: Add test case for rename detection
249
+ + git-p4: Add description of rename/copy detection options
250
+ + git-p4: Allow setting rename/copy detection threshold
251
(this branch is used by va/p4-branch-import.)
252
253
+Will merge to "master".
254
+
255
* da/difftool-mergtool-refactor (2011-08-19) 4 commits
256
(merged to 'next' on 2011-08-23 at a1cc3be)
257
+ mergetools/meld: Use '--output' when available
@@ -209,32 +259,21 @@ I think a further refactoring (no, not my suggestion) was offered?
259
+ mergetool--lib: Make style consistent with git
260
+ difftool--helper: Make style consistent with git
261
262
+Will merge to "master".
263
+
264
* mg/branch-set-upstream-previous (2011-08-19) 1 commit
265
(merged to 'next' on 2011-08-23 at acef0b6)
266
+ branch.c: use the parsed branch name
267
216
-* di/fast-import-doc (2011-08-17) 1 commit
217
- (merged to 'next' on 2011-08-23 at dab4088)
218
- + doc/fast-import: document feature import-marks-if-exists
219
-
220
-* di/fast-import-deltified-tree (2011-08-14) 2 commits
221
- (merged to 'next' on 2011-08-23 at ee30265)
222
- + fast-import: prevent producing bad delta
223
- + fast-import: add a test for tree delta base corruption
224
-
225
-* di/fast-import-ident (2011-08-11) 5 commits
226
- (merged to 'next' on 2011-08-23 at 9b86391)
227
- + fsck: improve committer/author check
228
- + fsck: add a few committer name tests
229
- + fast-import: check committer name more strictly
230
- + fast-import: don't fail on omitted committer name
231
- + fast-import: add input format tests
268
+Will merge to "master".
269
270
* di/parse-options-split (2011-08-11) 2 commits
271
(merged to 'next' on 2011-08-23 at 6cd667f)
272
+ Reduce parse-options.o dependencies
273
+ parse-options: export opterr, optbug
274
275
+Will merge to "master".
276
+
277
* mh/attr (2011-08-14) 7 commits
278
(merged to 'next' on 2011-08-23 at 22faa6e)
279
+ Unroll the loop over passes
@@ -245,6 +284,8 @@ I think a further refactoring (no, not my suggestion) was offered?
284
+ Document struct match_attr
285
+ Add a file comment
286
287
+Will aim to merge to "master" by -rc1.
288
+
289
* mh/iterate-refs (2011-08-14) 6 commits
290
- Retain caches of submodule refs
291
- Store the submodule name in struct cached_refs
@@ -253,18 +294,26 @@ I think a further refactoring (no, not my suggestion) was offered?
294
- Access reference caches only through new function get_cached_refs()
295
- Extract a function clear_cached_refs()
296
256
-I did not see anything wrong per-se, but it was unclear what the benefit
257
-of these changes are.
297
+I did not see anything fundamentally wrong with this series, but it was
298
+unclear what the benefit of these changes are. If the series were to read
299
+parts of the ref hierarchy (like refs/heads/) lazily, the story would
300
+have been different, though.
301
+
302
+Not urgent; will not be in 1.7.7.
303
304
* jn/plug-empty-tree-leak (2011-08-16) 2 commits
305
(merged to 'next' on 2011-08-23 at aee2184)
306
+ merge-recursive: take advantage of hardcoded empty tree
307
+ revert: plug memory leak in "cherry-pick root commit" codepath
308
309
+Will merge to "master".
310
+
311
* ac/describe-dirty-refresh (2011-08-11) 1 commit
312
(merged to 'next' on 2011-08-23 at b873611)
313
+ describe: Refresh the index when run with --dirty
314
315
+Will merge to "master".
316
+
317
* en/merge-recursive-2 (2011-08-14) 57 commits
318
(merged to 'next' on 2011-08-23 at ba6ad0d)
319
+ merge-recursive: Don't re-sort a list whose order we depend upon
@@ -325,24 +374,37 @@ of these changes are.
374
+ t6042: Add failing testcase for rename/modify/add-source conflict
375
+ t6042: Add a testcase where git deletes an untracked file
376
377
+Will aim to merge to "master" by -rc1.
378
+
379
* fg/submodule-ff-check-before-push (2011-08-20) 2 commits
329
- - push: teach --recurse-submodules the on-demand option
330
- - push: Don't push a repository with unpushed submodules
380
+ (merged to 'next' on 2011-08-24 at 398e764)
381
+ + push: teach --recurse-submodules the on-demand option
382
+ + push: Don't push a repository with unpushed submodules
383
(this branch uses jc/combine-diff-callback.)
384
385
+Will aim to merge to "master" by -rc1.
386
+
387
* hv/submodule-update-none (2011-08-11) 2 commits
334
- - add update 'none' flag to disable update of submodule by default
335
- - submodule: move update configuration variable further up
388
+ (merged to 'next' on 2011-08-24 at 5302fc1)
389
+ + add update 'none' flag to disable update of submodule by default
390
+ + submodule: move update configuration variable further up
391
337
-Will merge to "next".
392
+Not urgent; will not be in 1.7.7.
393
394
* jc/lookup-object-hash (2011-08-11) 6 commits
340
- - object hash: replace linear probing with 4-way cuckoo hashing
341
- - object hash: we know the table size is a power of two
342
- - object hash: next_size() helper for readability
343
- - pack-objects --count-only
344
- - object.c: remove duplicated code for object hashing
345
- - object.c: code movement for readability
395
+ (merged to 'next' on 2011-08-24 at 5825411)
396
+ + object hash: replace linear probing with 4-way cuckoo hashing
397
+ + object hash: we know the table size is a power of two
398
+ + object hash: next_size() helper for readability
399
+ + pack-objects --count-only
400
+ + object.c: remove duplicated code for object hashing
401
+ + object.c: code movement for readability
402
+
403
+I do not think there is anything fundamentally wrong with this series, but
404
+the risk of breakage far outweighs observed performance gain in one
405
+particular workload. Will keep it in 'next' at least for one cycle.
406
+
407
+Not urgent; will not be in 1.7.7.
408
409
* js/i18n-scripts (2011-08-08) 5 commits
410
(merged to 'next' on 2011-08-23 at a1b5529)
@@ -352,11 +414,19 @@ Will merge to "next".
414
+ git-am: take advantage of gettextln and eval_gettextln.
415
+ gettext: add gettextln, eval_gettextln to encode common idiom
416
417
+Will merge to "master".
418
+
419
* fg/submodule-git-file-git-dir (2011-08-22) 2 commits
420
(merged to 'next' on 2011-08-23 at 762194e)
421
+ Move git-dir for submodules
422
+ rev-parse: add option --resolve-git-dir <path>
423
424
+I do not think there is anything fundamentally wrong with this series, but
425
+the risk of breakage outweighs any benefit for having this new
426
+feature. Will keep it in 'next' at least for one cycle.
427
+
428
+Not urgent; will not be in 1.7.7.
429
+
430
* jk/http-auth-keyring (2011-08-03) 13 commits
431
(merged to 'next' on 2011-08-03 at b06e80e)
432
+ credentials: add "getpass" helper
@@ -375,26 +445,31 @@ Will merge to "next".
445
446
Looked mostly reasonable except for the limitation that it is not clear
447
how to deal with a site at which a user needs to use different passwords
378
-for different repositories.
448
+for different repositories. Will keep it in "next" at least for one cycle,
449
+until we start hearing real-world success reports on the list.
450
+
451
+Not urgent; will not be in 1.7.7.
452
453
* rr/revert-cherry-pick-continue (2011-08-08) 18 commits
381
- - revert: Propagate errors upwards from do_pick_commit
382
- - revert: Introduce --continue to continue the operation
383
- - revert: Don't implicitly stomp pending sequencer operation
384
- - revert: Remove sequencer state when no commits are pending
385
- - reset: Make reset remove the sequencer state
386
- - revert: Introduce --reset to remove sequencer state
387
- - revert: Make pick_commits functionally act on a commit list
388
- - revert: Save command-line options for continuing operation
389
- - revert: Save data for continuing after conflict resolution
390
- - revert: Don't create invalid replay_opts in parse_args
391
- - revert: Separate cmdline parsing from functional code
392
- - revert: Introduce struct to keep command-line options
393
- - revert: Eliminate global "commit" variable
394
- - revert: Rename no_replay to record_origin
395
- - revert: Don't check lone argument in get_encoding
396
- - revert: Simplify and inline add_message_to_msg
397
- - config: Introduce functions to write non-standard file
398
- - advice: Introduce error_resolve_conflict
399
-
400
-Will merge to "next".
454
+ (merged to 'next' on 2011-08-24 at 712c115)
455
+ + revert: Propagate errors upwards from do_pick_commit
456
+ + revert: Introduce --continue to continue the operation
457
+ + revert: Don't implicitly stomp pending sequencer operation
458
+ + revert: Remove sequencer state when no commits are pending
459
+ + reset: Make reset remove the sequencer state
460
+ + revert: Introduce --reset to remove sequencer state
461
+ + revert: Make pick_commits functionally act on a commit list
462
+ + revert: Save command-line options for continuing operation
463
+ + revert: Save data for continuing after conflict resolution
464
+ + revert: Don't create invalid replay_opts in parse_args
465
+ + revert: Separate cmdline parsing from functional code
466
+ + revert: Introduce struct to keep command-line options
467
+ + revert: Eliminate global "commit" variable
468
+ + revert: Rename no_replay to record_origin
469
+ + revert: Don't check lone argument in get_encoding
470
+ + revert: Simplify and inline add_message_to_msg
471
+ + config: Introduce functions to write non-standard file
472
+ + advice: Introduce error_resolve_conflict
473
+
474
+Will keep it in 'next' at least for one cycle.
475
+Not urgent; will not be in 1.7.7.