What's cooking (2013/07 #03)
Junio C Hamano committed
Jul 9, 2013 at 15:56 UTC
8e5570f864238d78f9f3c2519beb45557dcc422d
1 file changed
+248
-75
whats-cooking.txt
+248
-75
@@ -1,17 +1,17 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2013, #02; Fri, 5)
3
+Subject: What's cooking in git.git (Jul 2013, #03; Tue, 9)
4
X-master-at: f8abaebab3fe1a1b873f9636ea410ac4007c8fa8
5
-X-next-at: 0346b8459f4201954d9ada6dccc8e6ff9f59269c
5
+X-next-at: 3d27516a463a68ec338ac7d8cf6c700422cf7a2e
6
7
-What's cooking in git.git (Jul 2013, #02; Fri, 5)
7
+What's cooking in git.git (Jul 2013, #03; Tue, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-We are in the middle of 5th week now in the 11-week releace cycle
14
+We are in the middle of 6th week now in the 11-week releace cycle
15
for 1.8.4, and quite a few topics have graduated to 'master'.
16
Please help ensure the quality of the upcoming release by testing
17
the tip of 'master' (and if you are so inclined, 'next') early.
@@ -21,95 +21,182 @@ of the repositories listed at
21
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
---------------------------------------------------
25
-[Graduated to "master"]
26
-
27
-* tr/test-v-and-v-subtest-only (2013-06-29) 9 commits
28
- (merged to 'next' on 2013-06-30 at 1c5fac1)
29
- + perf-lib: fix start/stop of perf tests
30
- (merged to 'next' on 2013-06-26 at 8ff4d84)
31
- + test-lib: support running tests under valgrind in parallel
32
- + test-lib: allow prefixing a custom string before "ok N" etc.
33
- + test-lib: valgrind for only tests matching a pattern
34
- + test-lib: verbose mode for only tests matching a pattern
35
- + test-lib: self-test that --verbose works
36
- + test-lib: rearrange start/end of test_expect_* and test_skip
37
- + test-lib: refactor $GIT_SKIP_TESTS matching
38
- + test-lib: enable MALLOC_* for the actual tests
39
-
40
- Allows N instances of tests run in parallel, each running 1/N parts
41
- of the test suite under Valgrind, to speed things up.
42
-
24
--------------------------------------------------
25
[New Topics]
26
46
-* jc/t1512-fix (2013-07-01) 2 commits
47
- - get_short_sha1(): correctly disambiguate type-limited abbreviation
48
- - t1512: correct leftover constants from earlier edition
27
+* bc/push-match-many-refs (2013-07-08) 1 commit
28
+ - remote.c: avoid O(m*n) behavior in match_push_refs
29
50
- A test that should have failed but didn't revealed a bug that needs
51
- to be corrected.
30
+ Pushing to repositories with many refs employed O(m*n) algorithm
31
+ where n is the number of refs on the receiving end.
32
33
Will merge to 'next'.
34
35
56
-* jk/fetch-pack-many-refs (2013-07-02) 3 commits
57
- - fetch-pack: avoid quadratic behavior in rev_list_push
58
- - commit.c: make compare_commits_by_commit_date global
59
- - fetch-pack: avoid quadratic list insertion in mark_complete
36
+* ft/diff-rename-default-score-is-half (2013-07-05) 1 commit
37
+ (merged to 'next' on 2013-07-09 at 6a6b57e)
38
+ + diff-options: document default similarity index
39
61
- Fetching between repositories with many refs employed O(n^2)
62
- algorithm to match up the common objects, which has been corrected.
40
+ Will merge to 'master'.
41
+
42
+
43
+* jc/name-rev-exact-ref (2013-07-09) 3 commits
44
+ - describe: use argv-array
45
+ - name-rev: allow converting the exact object name at the tip of a ref
46
+ - name-ref: factor out name shortening logic from name_ref()
47
+
48
+ Corrects the longstanding sloppiness in the implementation of
49
+ name-rev that conflated "we take commit-ish" and "differences
50
+ between tags and commits do not matter".
51
52
Will merge to 'next'.
53
54
67
-* jk/format-patch-from (2013-07-03) 2 commits
68
- - teach format-patch to place other authors into in-body "From"
69
- - pretty.c: drop const-ness from pretty_print_context
55
+* jk/in-pack-size-measurement (2013-07-07) 4 commits
56
+ - pack-revindex: radix-sort the revindex
57
+ - cat-file: add --batch-disk-sizes option
58
+ - teach sha1_object_info_extended a "disk_size" query
59
+ - zero-initialize object_info structs
60
71
- "git format-patch" learned "--from[=whom]" option, which sets the
72
- "From: " header to the specified person (or the person who runs the
73
- command, if "=whom" part is missing) and move the original author
74
- information to an in-body From: header as necessary.
61
+ Allow on-disk footprint of objects in packfiles (often they are a
62
+ lot smaller than their true size, when expressed as deltas). The
63
+ command line API to ask for the new extra information may be still
64
+ under discussion.
65
76
- Will merge to 'next'.
66
+ Expecting a reroll.
67
68
79
-* ms/remote-tracking-branches-in-doc (2013-07-03) 1 commit
80
- - Change "remote tracking" to "remote-tracking"
69
+* jk/maint-clone-shared-no-connectivity-validation (2013-07-08) 1 commit
70
+ - clone: drop connectivity check for local clones
71
+ (this branch is used by jk/clone-shared-no-connectivity-validation.)
72
+
73
+ "git clone -s/-l" is a filesystem level copy and does not offer any
74
+ protection against source repository being corrupt. While the
75
+ connectivity validation checks commits and trees being readable, it
76
+ made the otherwise instantaneous local modes of clone much more
77
+ expensive, without protecting blob data from bitflips.
78
79
Will merge to 'next'.
80
81
85
-* tf/gitweb-extra-breadcrumbs (2013-07-04) 1 commit
86
- - gitweb: allow extra breadcrumbs to prefix the trail
82
+* jk/maint-config-multi-order (2013-07-07) 1 commit
83
+ (merged to 'next' on 2013-07-09 at 0db1db9)
84
+ + git-config(1): clarify precedence of multiple values
85
+
86
+ Will merge to 'master'.
87
+
88
+
89
+* jk/pull-to-integrate (2013-07-08) 2 commits
90
+ (merged to 'next' on 2013-07-09 at 2ecac24)
91
+ + pull: change the description to "integrate" changes
92
+ + push: avoid suggesting "merging" remote changes
93
+
94
+ Will merge to 'master'.
95
+
96
+
97
+* km/svn-1.8-serf-only (2013-07-07) 2 commits
98
+ - git-svn: allow git-svn fetching to work using serf
99
+ - Git.pm: add new temp_is_locked function
100
+
101
+ Comments?
102
88
- An Gitweb installation that is a part of larger site can optionally
89
- show extra links that point at the levels higher than the Gitweb
90
- pages itself in the link hierarchy of pages.
103
+
104
+* mh/maint-lockfile-overflow (2013-07-07) 1 commit
105
+ (merged to 'next' on 2013-07-09 at e1a0eac)
106
+ + lockfile: fix buffer overflow in path handling
107
+
108
+ Will merge to 'master' and later to 'maint'.
109
+
110
+
111
+* rr/name-rev-stdin-doc (2013-07-07) 1 commit
112
+ (merged to 'next' on 2013-07-09 at 7cfbff6)
113
+ + name-rev doc: rewrite --stdin paragraph
114
+
115
+ Will merge to 'master'.
116
+
117
+
118
+* rr/send-email-ssl-verify (2013-07-06) 6 commits
119
+ - SQUASH??? update to support SSL_ca_file as well as SSL_ca_path
120
+ - SQUASH??? send-email: cover both smtps and starttls cases
121
+ - fixup! send-email: squelch warning from Net::SMTP::SSL
122
+ - SQUASH??? send-email giving default value to ssl-cert-path with ||= assignment
123
+ - send-email: introduce sendemail.smtpsslcertpath
124
+ - send-email: squelch warning from Net::SMTP::SSL
125
+
126
+ The issue seems a lot deeper than the initial attempt and needs
127
+ somebody to sit down and sort out to get the version dependencies
128
+ and lazy loading right.
129
+
130
+
131
+* rs/pickaxe-simplify (2013-07-07) 1 commit
132
+ - diffcore-pickaxe: simplify has_changes and contains
133
134
Will merge to 'next'.
135
136
95
-* bc/commit-invalid-utf8 (2013-07-04) 2 commits
96
- - commit: reject overlong UTF-8 sequences
97
- - commit: reject invalid UTF-8 codepoints
137
+* tr/merge-recursive-index-only (2013-07-07) 3 commits
138
+ - merge-recursive: -Xindex-only to leave worktree unchanged
139
+ - merge-recursive: untangle double meaning of o->call_depth
140
+ - merge-recursive: remove dead conditional in update_stages()
141
+
142
+
143
+* tr/test-lint-no-export-assignment-in-shell (2013-07-08) 2 commits
144
+ (merged to 'next' on 2013-07-09 at 6f10ea2)
145
+ + test-lint: detect 'export FOO=bar'
146
+ + t9902: fix 'test A == B' to use = operator
147
+
148
+ Will merge to 'master'.
149
+
150
+
151
+* tr/test-v-and-v-subtest-only (2013-07-08) 1 commit
152
+ (merged to 'next' on 2013-07-08 at 933d477)
153
+ + t0000: do not use export X=Y
154
+
155
+ Finishing touches to a topics that is already in master for the
156
+ upcoming release.
157
+
158
+ Will merge to 'master'.
159
+
160
+
161
+* es/overlapping-range-set (2013-07-09) 2 commits
162
+ - range_set: fix coalescing bug when range is a subset of another
163
+ - t4211: fix broken test when one -L range is subset of another
164
165
Will merge to 'next'.
166
167
102
-* bc/send-email-use-port-as-separate-param (2013-07-04) 1 commit
103
- - send-email: provide port separately from hostname
168
+* jc/push-cas (2013-07-09) 7 commits
169
+ - push: document --lockref
170
+ - t5533: test "push --lockref"
171
+ - push --lockref: implement logic to populate old_sha1_expect[]
172
+ - remote.c: add command line option parser for --lockref
173
+ - push: beginning of compare-and-swap "force/delete safety"
174
+ - builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN
175
+ - cache.h: move remote/connect API out of it
176
+
177
+ Allow a safer "rewind of the remote tip" push than blind "--force",
178
+ by requiring that the overwritten remote ref to be unchanged since
179
+ the new history to replace it was prepared.
180
+
181
+ The machinery is more or less ready, but the interface to override
182
+ the safety may need further discussion.
183
+
184
+
185
+* jc/remote-http-argv-array (2013-07-09) 1 commit
186
+ - remote-http: use argv-array
187
188
Will merge to 'next'.
189
190
108
-* ml/cygwin-does-not-have-fifo (2013-07-05) 1 commit
109
- - test-lib.sh - cygwin does not have usable FIFOs
191
+* jk/argv-pushf-sentinel (2013-07-09) 1 commit
192
+ - argv-array: add sentinel attribute to argv_array_pushl
193
194
Will merge to 'next'.
195
196
+
197
+* nd/const-struct-cache-entry (2013-07-09) 1 commit
198
+ - Convert "struct cache_entry *" to "const ..." wherever possible
199
+
200
--------------------------------------------------
201
[Stalled]
202
@@ -242,6 +329,84 @@ of the repositories listed at
329
--------------------------------------------------
330
[Cooking]
331
332
+* jc/t1512-fix (2013-07-01) 2 commits
333
+ (merged to 'next' on 2013-07-09 at a6c62bb)
334
+ + get_short_sha1(): correctly disambiguate type-limited abbreviation
335
+ + t1512: correct leftover constants from earlier edition
336
+
337
+ A test that should have failed but didn't revealed a bug that needs
338
+ to be corrected.
339
+
340
+ Will merge to 'master'.
341
+
342
+
343
+* jk/fetch-pack-many-refs (2013-07-02) 3 commits
344
+ (merged to 'next' on 2013-07-09 at a53b7c7)
345
+ + fetch-pack: avoid quadratic behavior in rev_list_push
346
+ + commit.c: make compare_commits_by_commit_date global
347
+ + fetch-pack: avoid quadratic list insertion in mark_complete
348
+
349
+ Fetching between repositories with many refs employed O(n^2)
350
+ algorithm to match up the common objects, which has been corrected.
351
+
352
+ Will merge to 'master'.
353
+
354
+
355
+* jk/format-patch-from (2013-07-03) 2 commits
356
+ (merged to 'next' on 2013-07-09 at 6ed86d5)
357
+ + teach format-patch to place other authors into in-body "From"
358
+ + pretty.c: drop const-ness from pretty_print_context
359
+
360
+ "git format-patch" learned "--from[=whom]" option, which sets the
361
+ "From: " header to the specified person (or the person who runs the
362
+ command, if "=whom" part is missing) and move the original author
363
+ information to an in-body From: header as necessary.
364
+
365
+ Will merge to 'master'.
366
+
367
+
368
+* ms/remote-tracking-branches-in-doc (2013-07-03) 1 commit
369
+ (merged to 'next' on 2013-07-09 at 411a8bd)
370
+ + Change "remote tracking" to "remote-tracking"
371
+
372
+ Will merge to 'master'.
373
+
374
+
375
+* tf/gitweb-extra-breadcrumbs (2013-07-04) 1 commit
376
+ (merged to 'next' on 2013-07-09 at 525331b)
377
+ + gitweb: allow extra breadcrumbs to prefix the trail
378
+
379
+ An Gitweb installation that is a part of larger site can optionally
380
+ show extra links that point at the levels higher than the Gitweb
381
+ pages itself in the link hierarchy of pages.
382
+
383
+ Will merge to 'master'.
384
+
385
+
386
+* bc/commit-invalid-utf8 (2013-07-09) 3 commits
387
+ - commit: reject non-characters
388
+ - commit: reject overlong UTF-8 sequences
389
+ - commit: reject invalid UTF-8 codepoints
390
+
391
+ Tighten up autodetection of UTF-8 encoded strings.
392
+
393
+ Will merge to 'next'.
394
+
395
+
396
+* bc/send-email-use-port-as-separate-param (2013-07-04) 1 commit
397
+ (merged to 'next' on 2013-07-09 at a569eb5)
398
+ + send-email: provide port separately from hostname
399
+
400
+ Will merge to 'master'.
401
+
402
+
403
+* ml/cygwin-does-not-have-fifo (2013-07-05) 1 commit
404
+ (merged to 'next' on 2013-07-09 at 7d6849d)
405
+ + test-lib.sh - cygwin does not have usable FIFOs
406
+
407
+ Will merge to 'master'.
408
+
409
+
410
* pb/stash-refuse-to-kill (2013-07-01) 2 commits
411
(merged to 'next' on 2013-07-05 at 78ecc59)
412
+ git stash: avoid data loss when "git stash save" kills a directory
@@ -256,7 +421,7 @@ of the repositories listed at
421
422
This needed a small fix to "ls-files --killed".
423
259
- Will merge to 'next'.
424
+ Will merge to 'master'.
425
426
427
* es/contacts (2013-07-03) 3 commits
@@ -285,17 +450,19 @@ of the repositories listed at
450
451
452
* cp/submodule-custom-update (2013-07-03) 1 commit
288
- - submodule update: allow custom command to update submodule working tree
453
+ (merged to 'next' on 2013-07-09 at 3d27516)
454
+ + submodule update: allow custom command to update submodule working tree
455
456
In addition to the choice from "rebase, merge, or checkout-detach",
457
allow a custom command to be used in "submodule update" to update
458
the working tree of submodules.
459
294
- Will merge to 'next'.
460
+ Will merge to 'master'.
461
462
463
* mv/merge-ff-tristate (2013-07-02) 1 commit
298
- - merge: handle --ff/--no-ff/--ff-only as a tri-state option
464
+ (merged to 'next' on 2013-07-09 at c32b95d)
465
+ + merge: handle --ff/--no-ff/--ff-only as a tri-state option
466
467
The configuration variable "merge.ff" was cleary a tri-state to
468
choose one from "favor fast-forward when possible", "always create
@@ -305,7 +472,7 @@ of the repositories listed at
472
"last one wins, and command line overrides the configuration"
473
correctly.
474
308
- Will merge to 'next'.
475
+ Will merge to 'master'.
476
477
478
* rr/rebase-reflog-message-reword (2013-06-23) 2 commits
@@ -319,24 +486,25 @@ of the repositories listed at
486
Will merge to 'next'.
487
488
322
-* bp/mediawiki-preview (2013-07-04) 7 commits
323
- - git-remote-mediawiki: Add preview subcommand into git mw
324
- - git-remote-mediawiki: Adding git-mw command
325
- - git-remote-mediawiki: Factoring code between git-remote-mediawiki and Git::Mediawiki
326
- - git-remote-mediawiki: Update tests to run with the new bin-wrapper
327
- - git-remote-mediawiki: New git bin-wrapper for developement
328
- - wrap-for-bin: Make bin-wrappers chainable
329
- - git-remote-mediawiki: Introduction of Git::Mediawiki.pm
489
+* bp/mediawiki-preview (2013-07-08) 7 commits
490
+ - git-remote-mediawiki: add preview subcommand into git mw
491
+ - git-remote-mediawiki: add git-mw command
492
+ - git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki
493
+ - git-remote-mediawiki: update tests to run with the new bin-wrapper
494
+ - git-remote-mediawiki: add a git bin-wrapper for developement
495
+ - wrap-for-bin: make bin-wrappers chainable
496
+ - git-remote-mediawiki: introduction of Git::Mediawiki.pm
497
498
Looks like this is in a fairly good shape?
499
500
501
* fg/submodule-clone-depth (2013-07-03) 1 commit
335
- - Add --depth to submodule update/add
502
+ (merged to 'next' on 2013-07-09 at ab156f3)
503
+ + Add --depth to submodule update/add
504
505
Allow shallow-cloning of submodules with "git submodule update".
506
339
- Will merge to 'next'.
507
+ Will merge to 'master'.
508
509
510
* jc/pull-training-wheel (2013-06-27) 1 commit
@@ -351,7 +519,12 @@ of the repositories listed at
519
logic with other people's support. Hint, hint...
520
521
354
-* as/log-output-encoding-in-user-format (2013-07-05) 7 commits
522
+* as/log-output-encoding-in-user-format (2013-07-05) 11 commits
523
+ (merged to 'next' on 2013-07-08 at 2e1bdd9)
524
+ + t4205 (log-pretty-formats): avoid using `sed`
525
+ + t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set
526
+ + t4205, t6006, t7102: make functions better readable
527
+ + t4205 (log-pretty-formats): revert back single quotes
528
(merged to 'next' on 2013-07-05 at d2c99e5)
529
+ t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
530
(merged to 'next' on 2013-07-01 at 3318aa8)
@@ -364,7 +537,7 @@ of the repositories listed at
537
+ t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
538
539
"log --format=" did not honor i18n.logoutputencoding configuration
367
- and this is a beginning of the series that attempts to fix it.
540
+ and this attempts to fix it.
541
542
Will merge to 'master'.
543
@@ -391,7 +564,8 @@ of the repositories listed at
564
565
566
* af/rebase-i-merge-options (2013-07-02) 1 commit
394
- - Do not ignore merge options in interactive rebase
567
+ (merged to 'next' on 2013-07-08 at f411975)
568
+ + Do not ignore merge options in interactive rebase
569
570
"git rebase -i" now honors --strategy and -X options.
571
@@ -415,7 +589,6 @@ of the repositories listed at
589
+ push: change `simple` to accommodate triangular workflows
590
+ config doc: rewrite push.default section
591
+ t/t5528-push-default: remove redundant test_config lines
418
- (this branch is tangled with rr/triangle-push-fix.)
592
593
Earlier remote.pushdefault (and per-branch branch.*.pushremote)
594
were introduced as an additional mechanism to choose what