What's cooking (2011/08 #03)
Junio C Hamano committed
Aug 11, 2011 at 13:18 UTC
9b0f49aaf67bb6a6065c9cfe30eec2f2b8ae40c6
1 file changed
+159
-194
whats-cooking.txt
+159
-194
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2011, #02; Mon, 8)
3
-X-master-at: 1421fd9df4f1e3ed232bd1c683c6e264a464a41e
4
-X-next-at: 917d73bc85e756fc5d627c398a3b2aaebc3cf157
2
+Subject: What's cooking in git.git (Aug 2011, #03; Thu, 11)
3
+X-master-at: b91766295f2b873bbd4ef79c06de05aff27f8e12
4
+X-next-at: 6c94a45e9f00a1b3c623d79d889f6b1c0b4db93d
5
6
-What's cooking in git.git (Aug 2011, #02; Mon, 8)
6
+What's cooking in git.git (Aug 2011, #03; Thu, 11)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,126 +14,65 @@ authors have a choice to just say "that fix looks good, squash it in!"
14
instead of going through an extra round.
15
16
--------------------------------------------------
17
-[Graduated to "master"]
18
-
19
-* jc/diff-index-refactor (2011-07-13) 2 commits
20
- (merged to 'next' on 2011-08-01 at 98d8b08)
21
- + diff-lib: refactor run_diff_index() and do_diff_cache()
22
- + diff-lib: simplify do_diff_cache()
23
-
24
-* jc/pack-order-tweak (2011-07-08) 2 commits
25
- (merged to 'next' on 2011-07-25 at 1460c31)
26
- + pack-objects: optimize "recency order"
27
- + core: log offset pack data accesses happened
28
-
29
-* jk/reset-reflog-message-fix (2011-07-22) 1 commit
30
- (merged to 'next' on 2011-08-01 at 6c88837)
31
- + reset: give better reflog messages
32
-
33
-* jl/submodule-status-summary-doc (2011-08-01) 1 commit
34
- (merged to 'next' on 2011-08-03 at 88f97a9)
35
- + Documentation/submodule: add command references and update options
36
-
37
-* jl/submodule-update-quiet (2011-07-28) 1 commit
38
- (merged to 'next' on 2011-08-01 at c611587)
39
- + submodule: update and add must honor --quiet flag
40
-
41
-* jn/gitweb-config-list-case (2011-07-31) 1 commit
42
- (merged to 'next' on 2011-08-01 at 9268738)
43
- + gitweb: Git config keys are case insensitive, make config search too
44
-
45
-* jn/gitweb-system-config (2011-07-24) 1 commit
46
- (merged to 'next' on 2011-08-01 at 4941e45)
47
- + gitweb: Introduce common system-wide settings for convenience
48
-
49
-* js/ls-tree-error (2011-07-25) 2 commits
50
- (merged to 'next' on 2011-08-01 at 61bae55)
51
- + Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
52
- + Add a test to check that git ls-tree sets non-zero exit code on error.
53
-
54
-* ms/reflog-show-is-default (2011-08-01) 1 commit
55
- (merged to 'next' on 2011-08-03 at ae9cf6f)
56
- + reflog: actually default to subcommand 'show'
57
-
58
-* oa/pull-reflog (2011-08-01) 1 commit
59
- (merged to 'next' on 2011-08-03 at faeff94)
60
- + pull: remove extra space from reflog message
17
+[New Topics]
18
62
-* tc/minix (2011-07-20) 1 commit
63
- (merged to 'next' on 2011-07-25 at 36ad29f)
64
- + Makefile: add Minix configuration options.
19
+* di/fast-import-ident (2011-08-11) 5 commits
20
+ - fsck: improve committer/author check
21
+ - fsck: add a few committer name tests
22
+ - fast-import: check committer name more strictly
23
+ - fast-import: don't fail on omitted committer name
24
+ - fast-import: add input format tests
25
+
26
+* fg/submodule-ff-check-before-push (2011-08-09) 1 commit
27
+ - push: Don't push a repository with unpushed submodules
28
+
29
+* hv/submodule-update-none (2011-08-11) 2 commits
30
+ - add update 'none' flag to disable update of submodule by default
31
+ - submodule: move update configuration variable further up
32
+
33
+* jc/lookup-object-hash (2011-08-11) 6 commits
34
+ - object hash: replace linear probing with 4-way cuckoo hashing
35
+ - object hash: we know the table size is a power of two
36
+ - object hash: next_size() helper for readability
37
+ - pack-objects --count-only
38
+ - object.c: remove duplicated code for object hashing
39
+ - object.c: code movement for readability
40
+
41
+* js/i18n-scripts (2011-08-08) 5 commits
42
+ - submodule: take advantage of gettextln and eval_gettextln.
43
+ - stash: take advantage of eval_gettextln
44
+ - pull: take advantage of eval_gettextln
45
+ - git-am: take advantage of gettextln and eval_gettextln.
46
+ - gettext: add gettextln, eval_gettextln to encode common idiom
47
48
--------------------------------------------------
67
-[New Topics]
49
+[Graduated to "master"]
50
69
-* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
70
- (merged to 'next' on 2011-08-05 at 976a4d4)
71
- + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
51
+* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
52
+ (merged to 'next' on 2011-08-03 at 6918f69)
53
+ + commit: allow partial commits with relative paths
54
73
-Will merge to "master" after cooking for a bit more.
55
+Ideally the pathspec-prefix helper should be renamed to something more
56
+sensible, but we could live with it for now.
57
+
58
+* ef/ipv4-connect-error-report (2011-08-01) 2 commits
59
+ (merged to 'next' on 2011-08-03 at ea4842b)
60
+ + connect: only log if all attempts failed (ipv4)
61
+ + Merge branch 'maint' into ef/ipv4-connect-error-report
62
63
* jk/fast-export-quote-path (2011-08-05) 1 commit
64
(merged to 'next' on 2011-08-05 at a80e5f5)
65
+ fast-export: quote paths in output
66
79
-Will merge to "master".
80
-
81
-* js/sh-style (2011-08-05) 2 commits
82
- - filter-branch.sh: de-dent usage string
83
- - misc-sh: fix up whitespace in some other .sh files.
84
-
85
-Will merge to "next".
86
-
87
-* ma/am-exclude (2011-08-03) 1 commit
88
- (merged to 'next' on 2011-08-05 at 658e57c)
89
- + am: pass exclude down to apply
90
-
91
-Will merge to "master" after cooking for a bit more.
92
-
93
-* po/cygwin-backslash (2011-08-05) 2 commits
94
- - On Cygwin support both UNIX and DOS style path-names
95
- - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
96
-
97
-I think a further refactoring (no, not my suggestion) was offered?
98
-
67
* rc/maint-http-wrong-free (2011-08-03) 2 commits
68
(merged to 'next' on 2011-08-05 at cea08ed)
69
+ Makefile: some changes for http-related flag documentation
70
+ http.c: fix an invalid free()
71
104
-Will merge to "master".
105
-
106
-* db/am-skip-blank-at-the-beginning (2011-08-08) 2 commits
107
- - RE: [PATCH v2] am: ignore leading whitespace before patch
108
- - am: ignore leading whitespace before patch
109
-
110
-Hmmm, perhaps mailinfo should consider [Rr][Ee]: instead of [Rr]e:
111
-as a known noise?
112
-
113
-Will merge to "next" after squashing them into one.
114
-
115
-* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
116
- - helping smart-http/stateless-rpc fetch race
117
-
118
-Will merge to "next".
119
-
120
-* jn/maint-test-return (2011-08-08) 2 commits
121
- - test: cope better with use of return for errors
122
- - test: simplify return value of test_run_
123
-
124
-Will merge to "next".
125
-
126
-* rt/zlib-smaller-window (2011-08-08) 3 commits
127
- - test: consolidate definition of $LF
128
- - fixup! Tolerate zlib deflation with window
129
- - Tolerate zlib deflation with window size < 32Kb
130
-
131
-Will merge to "next" after squashing the second one into the bottom one.
132
-
133
-* fg/submodule-git-file-git-dir (2011-08-08) 3 commits
134
- - Move git-dir for submodules
135
- - fixup! rev-parse: add option --is-well-formed-git-dir
136
- - rev-parse: add option --is-well-formed-git-dir <path>
72
+* rs/grep-function-context (2011-08-01) 2 commits
73
+ (merged to 'next' on 2011-08-05 at 8d63a8c)
74
+ + grep: long context options
75
+ + grep: add option to show whole function as context
76
77
--------------------------------------------------
78
[Stalled]
@@ -144,18 +83,6 @@ Will merge to "next" after squashing the second one into the bottom one.
83
84
Probably the topmost commit should be dropped.
85
147
-* cb/maint-ls-files-error-report (2011-08-01) 2 commits
148
- - squash! ls-files: fix pathspec display on error
149
- - ls-files: fix pathspec display on error
150
-
151
-Will merge to "next" after getting an Ack for the fix-up and squashing it.
152
-
153
-* ac/describe-dirty-refresh (2011-08-01) 2 commits
154
- - fixup! describe: Refresh the index when run with --dirty
155
- - describe: Refresh the index when run with --dirty
156
-
157
-Will merge to "next" after squashing the fixup into the bottom one.
158
-
86
* nk/branch-v-abbrev (2011-07-01) 1 commit
87
- branch -v: honor core.abbrev
88
@@ -257,43 +184,85 @@ Re-roll being worked on.
184
- t5800: point out that deleting branches does not work
185
- t5800: document inability to push new branch with old content
186
187
+* po/cygwin-backslash (2011-08-05) 2 commits
188
+ - On Cygwin support both UNIX and DOS style path-names
189
+ - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
190
+
191
+I think a further refactoring (no, not my suggestion) was offered?
192
+
193
--------------------------------------------------
194
[Cooking]
195
263
-* ef/ipv4-connect-error-report (2011-08-01) 2 commits
264
- (merged to 'next' on 2011-08-03 at ea4842b)
265
- + connect: only log if all attempts failed (ipv4)
266
- + Merge branch 'maint' into ef/ipv4-connect-error-report
196
+* cb/maint-ls-files-error-report (2011-08-11) 1 commit
197
+ - ls-files: fix pathspec display on error
198
268
-Will merge to "master".
199
+Will merge to "next".
200
270
-* js/bisect-no-checkout (2011-08-05) 10 commits
271
- - bisect: further style nitpicks
272
- - bisect: replace "; then" with "\n<tab>*then"
273
- - bisect: cleanup whitespace errors in git-bisect.sh.
274
- - bisect: add documentation for --no-checkout option.
275
- - bisect: add tests for the --no-checkout option.
276
- - bisect: introduce --no-checkout support into porcelain.
277
- - bisect: introduce support for --no-checkout option.
278
- - bisect: add tests to document expected behaviour in presence of broken trees.
279
- - bisect: use && to connect statements that are deferred with eval.
280
- - bisect: move argument parsing before state modification.
201
+* ac/describe-dirty-refresh (2011-08-11) 1 commit
202
+ - describe: Refresh the index when run with --dirty
203
204
Will merge to "next".
205
284
-* rs/grep-function-context (2011-08-01) 2 commits
285
- (merged to 'next' on 2011-08-05 at 8d63a8c)
286
- + grep: long context options
287
- + grep: add option to show whole function as context
206
+* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
207
+ (merged to 'next' on 2011-08-05 at 976a4d4)
208
+ + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
209
289
-Will merge to "master".
210
+Will merge to "master" after cooking for a bit more.
211
291
-* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
292
- (merged to 'next' on 2011-08-03 at 6918f69)
293
- + commit: allow partial commits with relative paths
212
+* js/sh-style (2011-08-05) 2 commits
213
+ (merged to 'next' on 2011-08-11 at 4a4c22c)
214
+ + filter-branch.sh: de-dent usage string
215
+ + misc-sh: fix up whitespace in some other .sh files.
216
295
-Ideally the pathspec-prefix helper should be renamed to something more
296
-sensible, but we could live with it for now.
217
+* ma/am-exclude (2011-08-09) 2 commits
218
+ (merged to 'next' on 2011-08-11 at cf0ba4d)
219
+ + am: Document new --exclude=<path> option
220
+ (merged to 'next' on 2011-08-05 at 658e57c)
221
+ + am: pass exclude down to apply
222
+
223
+Will merge to "master" after cooking for a bit more.
224
+
225
+* db/am-skip-blank-at-the-beginning (2011-08-11) 1 commit
226
+ (merged to 'next' on 2011-08-11 at 3637843)
227
+ + am: ignore leading whitespace before patch
228
+
229
+Will merge to "master" after cooking for a bit more.
230
+
231
+* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
232
+ (merged to 'next' on 2011-08-11 at 3f24b64)
233
+ + helping smart-http/stateless-rpc fetch race
234
+
235
+* jn/maint-test-return (2011-08-11) 3 commits
236
+ - t3900: do not reference numbered arguments from the test script
237
+ - test: cope better with use of return for errors
238
+ - test: simplify return value of test_run_
239
+
240
+Will merge to "next".
241
+
242
+* rt/zlib-smaller-window (2011-08-11) 2 commits
243
+ - test: consolidate definition of $LF
244
+ - Tolerate zlib deflation with window size < 32Kb
245
+
246
+Will merge to "next".
247
+
248
+* fg/submodule-git-file-git-dir (2011-08-08) 3 commits
249
+ - Move git-dir for submodules
250
+ - fixup! rev-parse: add option --is-well-formed-git-dir
251
+ - rev-parse: add option --is-well-formed-git-dir <path>
252
+
253
+* js/bisect-no-checkout (2011-08-09) 11 commits
254
+ (merged to 'next' on 2011-08-11 at 6c94a45)
255
+ + bisect: add support for bisecting bare repositories
256
+ + bisect: further style nitpicks
257
+ + bisect: replace "; then" with "\n<tab>*then"
258
+ + bisect: cleanup whitespace errors in git-bisect.sh.
259
+ + bisect: add documentation for --no-checkout option.
260
+ + bisect: add tests for the --no-checkout option.
261
+ + bisect: introduce --no-checkout support into porcelain.
262
+ + bisect: introduce support for --no-checkout option.
263
+ + bisect: add tests to document expected behaviour in presence of broken trees.
264
+ + bisect: use && to connect statements that are deferred with eval.
265
+ + bisect: move argument parsing before state modification.
266
267
* cb/maint-exec-error-report (2011-08-01) 2 commits
268
(merged to 'next' on 2011-08-05 at 2764424)
@@ -311,53 +280,50 @@ Will merge to "master" after cooking for a bit more.
280
Will merge to "master" after cooking for a bit more.
281
282
* jk/add-i-hunk-filter (2011-07-27) 5 commits
314
- - add--interactive: add option to autosplit hunks
315
- - add--interactive: allow negatation of hunk filters
316
- - add--interactive: allow hunk filtering on command line
317
- - add--interactive: factor out regex error handling
318
- - add--interactive: refactor patch mode argument processing
319
-
320
-Will merge to "next".
283
+ (merged to 'next' on 2011-08-11 at 8ff9a56)
284
+ + add--interactive: add option to autosplit hunks
285
+ + add--interactive: allow negatation of hunk filters
286
+ + add--interactive: allow hunk filtering on command line
287
+ + add--interactive: factor out regex error handling
288
+ + add--interactive: refactor patch mode argument processing
289
290
* mh/check-attr-listing (2011-08-04) 23 commits
323
- - Rename git_checkattr() to git_check_attr()
324
- - git-check-attr: Fix command-line handling to match docs
325
- - git-check-attr: Drive two tests using the same raw data
326
- - git-check-attr: Add an --all option to show all attributes
327
- - git-check-attr: Error out if no pathnames are specified
328
- - git-check-attr: Process command-line args more systematically
329
- - git-check-attr: Handle each error separately
330
- - git-check-attr: Extract a function error_with_usage()
331
- - git-check-attr: Introduce a new variable
332
- - git-check-attr: Extract a function output_attr()
333
- - Allow querying all attributes on a file
334
- - Remove redundant check
335
- - Remove redundant call to bootstrap_attr_stack()
336
- - Extract a function collect_all_attrs()
337
- - Teach prepare_attr_stack() to figure out dirlen itself
338
- - git-check-attr: Use git_attr_name()
339
- - Provide access to the name attribute of git_attr
340
- - git-check-attr: Add tests of command-line parsing
341
- - git-check-attr: Add missing "&&"
342
- - Disallow the empty string as an attribute name
343
- - Remove anachronism from comment
344
- - doc: Correct git_attr() calls in example code
345
- - doc: Add a link from gitattributes(5) to git-check-attr(1)
291
+ (merged to 'next' on 2011-08-11 at f73ad50)
292
+ + Rename git_checkattr() to git_check_attr()
293
+ + git-check-attr: Fix command-line handling to match docs
294
+ + git-check-attr: Drive two tests using the same raw data
295
+ + git-check-attr: Add an --all option to show all attributes
296
+ + git-check-attr: Error out if no pathnames are specified
297
+ + git-check-attr: Process command-line args more systematically
298
+ + git-check-attr: Handle each error separately
299
+ + git-check-attr: Extract a function error_with_usage()
300
+ + git-check-attr: Introduce a new variable
301
+ + git-check-attr: Extract a function output_attr()
302
+ + Allow querying all attributes on a file
303
+ + Remove redundant check
304
+ + Remove redundant call to bootstrap_attr_stack()
305
+ + Extract a function collect_all_attrs()
306
+ + Teach prepare_attr_stack() to figure out dirlen itself
307
+ + git-check-attr: Use git_attr_name()
308
+ + Provide access to the name attribute of git_attr
309
+ + git-check-attr: Add tests of command-line parsing
310
+ + git-check-attr: Add missing "&&"
311
+ + Disallow the empty string as an attribute name
312
+ + Remove anachronism from comment
313
+ + doc: Correct git_attr() calls in example code
314
+ + doc: Add a link from gitattributes(5) to git-check-attr(1)
315
(this branch is used by mh/check-attr-relative.)
316
348
-Will merge to "next".
349
-
317
* mh/check-attr-relative (2011-08-04) 6 commits
351
- - test-path-utils: Add subcommand "prefix_path"
352
- - test-path-utils: Add subcommand "absolute_path"
353
- - git-check-attr: Normalize paths
354
- - git-check-attr: Demonstrate problems with relative paths
355
- - git-check-attr: Demonstrate problems with unnormalized paths
356
- - git-check-attr: test that no output is written to stderr
318
+ (merged to 'next' on 2011-08-11 at f94550c)
319
+ + test-path-utils: Add subcommand "prefix_path"
320
+ + test-path-utils: Add subcommand "absolute_path"
321
+ + git-check-attr: Normalize paths
322
+ + git-check-attr: Demonstrate problems with relative paths
323
+ + git-check-attr: Demonstrate problems with unnormalized paths
324
+ + git-check-attr: test that no output is written to stderr
325
(this branch uses mh/check-attr-listing.)
326
359
-Will merge to "next".
360
-
327
* jk/http-auth-keyring (2011-08-03) 13 commits
328
(merged to 'next' on 2011-08-03 at b06e80e)
329
+ credentials: add "getpass" helper
@@ -387,10 +353,11 @@ for different repositories.
353
+ Fix prefix handling in ref iteration functions
354
355
* rc/histogram-diff (2011-08-08) 12 commits
390
- - xdiff/xhistogram: drop need for additional variable
391
- - xdiff/xhistogram: rely on xdl_trim_ends()
392
- - xdiff/xhistogram: rework handling of recursed results
393
- - xdiff: do away with xdl_mmfile_next()
356
+ (merged to 'next' on 2011-08-11 at 684dfd1)
357
+ + xdiff/xhistogram: drop need for additional variable
358
+ + xdiff/xhistogram: rely on xdl_trim_ends()
359
+ + xdiff/xhistogram: rework handling of recursed results
360
+ + xdiff: do away with xdl_mmfile_next()
361
(merged to 'next' on 2011-08-03 at f9e2328)
362
+ Make test number unique
363
(merged to 'next' on 2011-07-25 at 3351028)
@@ -402,8 +369,6 @@ for different repositories.
369
+ xdiff/xprepare: refactor abort cleanups
370
+ xdiff/xprepare: use memset()
371
405
-Will merge to "next".
406
-
372
* rr/revert-cherry-pick-continue (2011-08-08) 18 commits
373
- revert: Propagate errors upwards from do_pick_commit
374
- revert: Introduce --continue to continue the operation
@@ -424,4 +389,4 @@ Will merge to "next".
389
- config: Introduce functions to write non-standard file
390
- advice: Introduce error_resolve_conflict
391
427
-Getting into a reasonable shape. Is another round of re-roll coming?
392
+Will merge to "next".