What's cooking (2014/04 #08)
Junio C Hamano committed
Apr 25, 2014 at 15:13 UTC
7152a4263093cb8f0812318e4f5872f07c1da0c5
1 file changed
+214
-185
whats-cooking.txt
+214
-185
@@ -1,21 +1,18 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2014, #07; Tue, 22)
4
-X-master-at: 779792a5f24bb4e8049c4f88ad752e70d4a8a080
5
-X-next-at: 4f984835015ed69c2885f183cdc0198f90d08135
3
+Subject: What's cooking in git.git (Apr 2014, #08; Fri, 25)
4
+X-master-at: 35936f8fc38a214cc7d2595070641d39a541dfb1
5
+X-next-at: 6b2797783cb3e61a56a96669ce7848480f49f38f
6
7
-What's cooking in git.git (Apr 2014, #07; Tue, 22)
7
+What's cooking in git.git (Apr 2014, #08; Fri, 25)
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
-The tip of the 'master' branch has passed v2.0.0-rc0, an early
15
-preview release. There are a handful of topics still in 'next' (and
16
-a few that are not in 'next') that I'd like to have in v2.0.0-rc1,
17
-but other than that, this hopefully is fairly a close approximation
18
-of the upcoming release.
14
+The tip of the 'master' branch is at v2.0.0-rc1. Last minute fixes
15
+to newly added code keep flowing in, which is good.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -23,186 +20,120 @@ of the repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
26
-[New Topics]
23
+[Graduated to "master"]
24
28
-* fc/remote-helpers-hg-bzr-graduation (2014-04-21) 3 commits
29
- - remote-helpers: move tests out of contrib
30
- - remote-helpers: move out of contrib
31
- - remote-helpers: squelch python import exceptions
25
+* db/make-with-curl (2014-04-15) 2 commits
26
+ (merged to 'next' on 2014-04-16 at b9c8527)
27
+ + Makefile: allow static linking against libcurl
28
+ + Makefile: use curl-config to determine curl flags
29
33
- Move remote-hg and remote-bzr out of contrib/.
30
+ Ask curl-config how to link with the curl library, instead of
31
+ having only a limited configurability knobs in the Makefile.
32
35
- Will merge to 'next' and keep it there for the remainder of the cycle.
33
34
+* fc/transport-helper-sync-error-fix (2014-04-21) 6 commits
35
+ (merged to 'next' on 2014-04-21 at f53a08a)
36
+ + t5801 (remote-helpers): cleanup environment sets
37
+ + transport-helper: fix sync issue on crashes
38
+ + transport-helper: trivial cleanup
39
+ + transport-helper: propagate recvline() error pushing
40
+ + remote-helpers: make recvline return an error
41
+ + transport-helper: remove barely used xchgline()
42
38
-* rs/ref-transaction (2014-04-22) 14 commits
39
- . SQUASH???
40
- . refs.c: change update_ref to use a transaction
41
- . walker.c: use ref transaction for ref updates
42
- . branch.c: use ref transaction for all ref updates
43
- . fast-import.c: change update_branch to use ref transactions
44
- . sequencer.c: use ref transactions for all ref updates
45
- . commit.c: use ref transactions for updates
46
- . replace.c: use the ref transaction functions for updates
47
- . tag.c: use ref transactions when doing updates
48
- . refs.c: ref_transaction_delete to check for error and return status
49
- . refs.c: change ref_transaction_create to do error checking and return status
50
- . refs.c: change ref_transaction_update() to do error checking and return status
51
- . refs.c: use a single exit path from transaction commit and handle onerr
52
- . refs.c: constify the sha arguments for ref_transaction_create|delete|update
53
- (this branch uses mh/ref-transaction.)
43
+ Make sure the marks are not written out when the transport helper
44
+ did not finish happily, to avoid marks file that is out of sync
45
+ with the reality.
46
55
- Updates most of the callsites to write_sha1_ref(), the low-level
56
- mechanism to update a ref, to use the ref-transaction API.
47
58
- Seems to break the dumb walker test (t5550) when merged to 'pu',
59
- possibly due to misconversion of walker.c. Kept out of 'pu' as I
60
- didn't want to resolve conflicts with the other topics only to get
61
- a known-broken version.
48
+* jk/pack-bitmap (2014-04-22) 1 commit
49
+ (merged to 'next' on 2014-04-22 at ba58737)
50
+ + ewah_bitmap.c: do not assume size_t and eword_t are the same size
51
52
+ A last minute (and hopefully the last) fix to avoid coredumps due
53
+ to an incorrect pointer arithmetic.
54
64
-* fc/remote-helper-refmap (2014-04-21) 8 commits
65
- - transport-helper: remove unnecessary strbuf resets
66
- - transport-helper: add support to delete branches
67
- - fast-export: add support to delete refs
68
- - fast-import: add support to delete refs
69
- - transport-helper: add support to push symbolic refs
70
- - transport-helper: add support for old:new refspec
71
- - fast-export: add new --refspec option
72
- - fast-export: improve argument parsing
55
+--------------------------------------------------
56
+[New Topics]
57
74
- Allow remote-helper/fast-import based transport to rename the refs
75
- while transferring the history.
58
+* ep/shell-command-substitution (2014-04-23) 13 commits
59
+ - p5302-pack-index.sh: use the $( ... ) construct for command substitution
60
+ - lib-gpg.sh: use the $( ... ) construct for command substitution
61
+ - lib-cvs.sh: use the $( ... ) construct for command substitution
62
+ - lib-credential.sh: use the $( ... ) construct for command substitution
63
+ - git-web--browse.sh: use the $( ... ) construct for command substitution
64
+ - git-stash.sh: use the $( ... ) construct for command substitution
65
+ - git-rebase.sh: use the $( ... ) construct for command substitution
66
+ - git-rebase--merge.sh: use the $( ... ) construct for command substitution
67
+ - git-pull.sh: use the $( ... ) construct for command substitution
68
+ - appp.sh: use the $( ... ) construct for command substitution
69
+ - t7900-subtree.sh: use the $( ... ) construct for command substitution
70
+ - test-gitmw-lib.sh: use the $( ... ) construct for command substitution
71
+ - t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
72
+
73
+ Adjust shell scripts to use $(cmd) instead of `cmd`.
74
75
Will merge to 'next' and keep it there for the remainder of the cycle.
76
77
80
-* jk/external-diff-use-argv-array (2014-04-21) 6 commits
81
- - run_external_diff: refactor cmdline setup logic
82
- - run_external_diff: hoist common bits out of conditional
83
- - run_external_diff: drop fflush(NULL)
84
- - run_external_diff: clean up error handling
85
- - run_external_diff: use an argv_array for the environment
86
- - run_external_diff: use an argv_array for the command line
87
-
88
- Code clean-up.
78
+* ib/test-selectively-run (2014-04-23) 3 commits
79
+ - test-lib: '--run' to run only specific tests
80
+ - test-lib: tests skipped by GIT_SKIP_TESTS say so
81
+ - test-lib: Document short options in t/README
82
90
- Will keep in 'next' for the remainder of the cycle.
83
+ Allow specifying only certain individual test pieces to be run
84
+ using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
85
86
93
-* jx/blame-align-relative-time (2014-04-22) 2 commits
94
- - blame: dynamic blame_date_width for different locales
95
- - blame:: fix broken time_buf paddings in relative timestamp
96
-
97
- "git blame" miscounted number of columns needed to show localized
98
- timestamps, resulting in jaggy left-side-edge of the source code
99
- lines in its output.
87
+* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
88
+ - git-remote-mediawiki: fix encoding issue for UTF-8 media files
89
+ - git-remote-mediawiki: allow stop/start-ing the test server
90
91
Will merge to 'next' and keep it there for the remainder of the cycle.
92
93
104
-* fc/merge-default-to-upstream (2014-04-22) 1 commit
105
- (merged to 'next' on 2014-04-22 at 4f98483)
106
- + merge: enable defaulttoupstream by default
107
-
108
- "git merge" without argument, even when there is an upstream
109
- defined for the current branch, refused to run until
110
- merge.defaultToUpstream is set to true. Flip the default of that
111
- configuration variable to true.
112
-
113
- Will keep in 'next' for the remainder of the cycle.
114
-
115
-
116
-* fc/mergetool-prompt (2014-04-22) 1 commit
117
- (merged to 'next' on 2014-04-22 at dcaec94)
118
- + mergetool: run prompt only if guessed tool
119
-
120
- mergetool.prompt used to default to 'true', always causing a confirmation
121
- "do you really want to run the tool on this path" to be shown.
122
-
123
- Among the two purposes the prompt serves, ignore the use case to
124
- confirm that the user wants to view particular path with the named
125
- tool, and make the prompt only to confirm the choice of the tool
126
- made by autodetection and defaulting. For those who configured the
127
- tool explicitly, the prompt shown for the latter purpose is simply
128
- annoying.
129
-
130
- Strictly speaking, this is a backward incompatible change and the
131
- users need to explicitly set the variable to 'true' if they want to
132
- resurrect the now-ignored use case.
133
-
134
- Will keep in 'next' for the remainder of the cycle.
135
-
136
-
137
-* fc/mergetools-vimdiff3 (2014-04-22) 1 commit
138
- (merged to 'next' on 2014-04-22 at d843e75)
139
- + mergetools: add vimdiff3 mode
140
-
141
- Will keep in 'next' for the remainder of the cycle.
142
-
94
+* mw/symlinks (2014-04-24) 1 commit
95
+ (merged to 'next' on 2014-04-25 at 20b2af6)
96
+ + setup: fix windows path buffer over-stepping
97
144
-* km/git-svn-workaround-older-getopt-long (2014-04-22) 1 commit
145
- - t9117: use --prefix "" instead of --prefix=""
98
+ A finishing touch fix to a new change already in 'master'.
99
147
- Will merge to 'next' and hopefully merge to 'master' by -rc2 if not earlier.
100
+ Will merge to 'master' by -rc2.
101
102
150
-* lr/git-run-setup-gently (2014-04-22) 1 commit
151
- - git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
103
+* sk/tag-contains-wo-recursion (2014-04-25) 1 commit
104
+ (merged to 'next' on 2014-04-25 at f320750)
105
+ + git tag --contains: avoid stack overflow
106
107
Will keep in 'next' for the remainder of the cycle.
108
109
+--------------------------------------------------
110
+[Stalled]
111
156
-* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit
157
- - Documentation: git-gui: describe gui.displayuntracked
158
-
159
- Will merge to 'next' and hopefully merge to 'master' by -rc2 if not earlier.
160
-
161
-
162
-* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit
163
- - git-prompt.sh: don't put unsanitized branch names in $PS1
164
-
165
- Will merge to 'next' and hopefully merge to 'master' by -rc2 if not earlier.
112
+* rs/ref-transaction (2014-04-22) 14 commits
113
+ . SQUASH???
114
+ . refs.c: change update_ref to use a transaction
115
+ . walker.c: use ref transaction for ref updates
116
+ . branch.c: use ref transaction for all ref updates
117
+ . fast-import.c: change update_branch to use ref transactions
118
+ . sequencer.c: use ref transactions for all ref updates
119
+ . commit.c: use ref transactions for updates
120
+ . replace.c: use the ref transaction functions for updates
121
+ . tag.c: use ref transactions when doing updates
122
+ . refs.c: ref_transaction_delete to check for error and return status
123
+ . refs.c: change ref_transaction_create to do error checking and return status
124
+ . refs.c: change ref_transaction_update() to do error checking and return status
125
+ . refs.c: use a single exit path from transaction commit and handle onerr
126
+ . refs.c: constify the sha arguments for ref_transaction_create|delete|update
127
+ (this branch uses mh/ref-transaction.)
128
167
---------------------------------------------------
168
-[Graduated to "master"]
129
+ Updates most of the callsites to write_sha1_ref(), the low-level
130
+ mechanism to update a ref, to use the ref-transaction API.
131
170
-* ep/shell-command-substitution (2014-04-17) 14 commits
171
- (merged to 'next' on 2014-04-18 at ebd996d)
172
- + t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
173
- + t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
174
- + git-tag.sh: use the $( ... ) construct for command substitution
175
- + git-revert.sh: use the $( ... ) construct for command substitution
176
- + git-resolve.sh: use the $( ... ) construct for command substitution
177
- + git-repack.sh: use the $( ... ) construct for command substitution
178
- + git-merge.sh: use the $( ... ) construct for command substitution
179
- + git-ls-remote.sh: use the $( ... ) construct for command substitution
180
- + git-fetch.sh: use the $( ... ) construct for command substitution
181
- + git-commit.sh: use the $( ... ) construct for command substitution
182
- + git-clone.sh: use the $( ... ) construct for command substitution
183
- + git-checkout.sh: use the $( ... ) construct for command substitution
184
- + install-webdoc.sh: use the $( ... ) construct for command substitution
185
- + howto-index.sh: use the $( ... ) construct for command substitution
186
-
187
-
188
-* jx/i18n (2014-04-18) 4 commits
189
- (merged to 'next' on 2014-04-18 at 2ace126)
190
- + i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
191
- + i18n: only extract comments marked with "TRANSLATORS:"
192
- + i18n: remove obsolete comments for translators in diffstat generation
193
- + i18n: fix uncatchable comments for translators in date.c
194
-
195
-
196
-* km/avoid-non-function-return-in-rebase (2014-04-17) 2 commits
197
- (merged to 'next' on 2014-04-18 at 6982c3e)
198
- + Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
199
- + rebase: avoid non-function use of "return" on FreeBSD
200
-
201
- Work around /bin/sh that does not like "return" at the top-level
202
- of a file that is dot-sourced from inside a function definition.
132
+ Seems to break the dumb walker test (t5550) when merged to 'pu',
133
+ possibly due to misconversion of walker.c. Kept out of 'pu' as I
134
+ didn't want to resolve conflicts with the other topics only to get
135
+ a known-broken version.
136
204
---------------------------------------------------
205
-[Stalled]
137
138
* tr/merge-recursive-index-only (2014-02-05) 3 commits
139
- merge-recursive: -Xindex-only to leave worktree unchanged
@@ -371,6 +302,129 @@ of the repositories listed at
302
--------------------------------------------------
303
[Cooking]
304
305
+* fc/remote-helpers-hg-bzr-graduation (2014-04-21) 3 commits
306
+ (merged to 'next' on 2014-04-22 at fed170a)
307
+ + remote-helpers: move tests out of contrib
308
+ + remote-helpers: move out of contrib
309
+ + remote-helpers: squelch python import exceptions
310
+
311
+ Move remote-hg and remote-bzr out of contrib/.
312
+
313
+ Will keep in 'next' for the remainder of the cycle.
314
+
315
+
316
+* fc/remote-helper-refmap (2014-04-21) 8 commits
317
+ (merged to 'next' on 2014-04-22 at fb5a4c2)
318
+ + transport-helper: remove unnecessary strbuf resets
319
+ + transport-helper: add support to delete branches
320
+ + fast-export: add support to delete refs
321
+ + fast-import: add support to delete refs
322
+ + transport-helper: add support to push symbolic refs
323
+ + transport-helper: add support for old:new refspec
324
+ + fast-export: add new --refspec option
325
+ + fast-export: improve argument parsing
326
+
327
+ Allow remote-helper/fast-import based transport to rename the refs
328
+ while transferring the history.
329
+
330
+ Will keep in 'next' for the remainder of the cycle.
331
+
332
+
333
+* jk/external-diff-use-argv-array (2014-04-21) 6 commits
334
+ (merged to 'next' on 2014-04-22 at e6d92d7)
335
+ + run_external_diff: refactor cmdline setup logic
336
+ + run_external_diff: hoist common bits out of conditional
337
+ + run_external_diff: drop fflush(NULL)
338
+ + run_external_diff: clean up error handling
339
+ + run_external_diff: use an argv_array for the environment
340
+ + run_external_diff: use an argv_array for the command line
341
+
342
+ Code clean-up.
343
+
344
+ Will keep in 'next' for the remainder of the cycle.
345
+
346
+
347
+* jx/blame-align-relative-time (2014-04-23) 2 commits
348
+ (merged to 'next' on 2014-04-23 at 858df39)
349
+ + blame: dynamic blame_date_width for different locales
350
+ + blame: fix broken time_buf paddings in relative timestamp
351
+
352
+ "git blame" miscounted number of columns needed to show localized
353
+ timestamps, resulting in jaggy left-side-edge of the source code
354
+ lines in its output.
355
+
356
+ Will keep in 'next' for the remainder of the cycle.
357
+
358
+
359
+* fc/merge-default-to-upstream (2014-04-22) 1 commit
360
+ (merged to 'next' on 2014-04-22 at 4f98483)
361
+ + merge: enable defaulttoupstream by default
362
+
363
+ "git merge" without argument, even when there is an upstream
364
+ defined for the current branch, refused to run until
365
+ merge.defaultToUpstream is set to true. Flip the default of that
366
+ configuration variable to true.
367
+
368
+ Will keep in 'next' for the remainder of the cycle.
369
+
370
+
371
+* fc/mergetool-prompt (2014-04-24) 2 commits
372
+ - mergetool: document the default for --[no-]prompt
373
+ (merged to 'next' on 2014-04-22 at dcaec94)
374
+ + mergetool: run prompt only if guessed tool
375
+
376
+ mergetool.prompt used to default to 'true', always causing a confirmation
377
+ "do you really want to run the tool on this path" to be shown.
378
+
379
+ Among the two purposes the prompt serves, ignore the use case to
380
+ confirm that the user wants to view particular path with the named
381
+ tool, and make the prompt only to confirm the choice of the tool
382
+ made by autodetection and defaulting. For those who configured the
383
+ tool explicitly, the prompt shown for the latter purpose is simply
384
+ annoying.
385
+
386
+ Strictly speaking, this is a backward incompatible change and the
387
+ users need to explicitly set the variable to 'true' if they want to
388
+ resurrect the now-ignored use case.
389
+
390
+ Will merge to 'next' and keep it there for the remainder of the cycle.
391
+
392
+
393
+* fc/mergetools-vimdiff3 (2014-04-22) 1 commit
394
+ (merged to 'next' on 2014-04-22 at d843e75)
395
+ + mergetools: add vimdiff3 mode
396
+
397
+ Will keep in 'next' for the remainder of the cycle.
398
+
399
+
400
+* km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit
401
+ (merged to 'next' on 2014-04-23 at 3f35586)
402
+ + t9117: use --prefix "" instead of --prefix=""
403
+
404
+ Will merge to 'master' by -rc2.
405
+
406
+
407
+* lr/git-run-setup-gently (2014-04-22) 1 commit
408
+ (merged to 'next' on 2014-04-22 at 5c2523f)
409
+ + git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
410
+
411
+ Will keep in 'next' for the remainder of the cycle.
412
+
413
+
414
+* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit
415
+ (merged to 'next' on 2014-04-22 at 385d39a)
416
+ + Documentation: git-gui: describe gui.displayuntracked
417
+
418
+ Will merge to 'master' by -rc2.
419
+
420
+
421
+* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit
422
+ (merged to 'next' on 2014-04-22 at 3a1506f)
423
+ + git-prompt.sh: don't put unsanitized branch names in $PS1
424
+
425
+ Will merge to 'master' by -rc2.
426
+
427
+
428
* fc/publish-vs-upstream (2014-04-21) 8 commits
429
- sha1_name: add support for @{publish} marks
430
- sha1_name: simplify track finding
@@ -411,7 +465,9 @@ of the repositories listed at
465
Expecting a reroll.
466
467
414
-* ef/send-email-absolute-path-to-the-command (2014-04-16) 1 commit
468
+* ef/send-email-absolute-path-to-the-command (2014-04-23) 2 commits
469
+ (merged to 'next' on 2014-04-23 at a657e5e)
470
+ + send-email: windows drive prefix (e.g. C:) appears only at the beginning
471
(merged to 'next' on 2014-04-21 at 43bebb5)
472
+ send-email: recognize absolute path on Windows
473
@@ -437,33 +493,6 @@ of the repositories listed at
493
Will keep in 'next' for the remainder of the cycle.
494
495
440
-* fc/transport-helper-sync-error-fix (2014-04-21) 6 commits
441
- (merged to 'next' on 2014-04-21 at f53a08a)
442
- + t5801 (remote-helpers): cleanup environment sets
443
- + transport-helper: fix sync issue on crashes
444
- + transport-helper: trivial cleanup
445
- + transport-helper: propagate recvline() error pushing
446
- + remote-helpers: make recvline return an error
447
- + transport-helper: remove barely used xchgline()
448
-
449
- Make sure the marks are not written out when the transport helper
450
- did not finish happily, to avoid marks file that is out of sync
451
- with the reality.
452
-
453
- Will merge to 'master' by -rc1 if no regressions are reported.
454
-
455
-
456
-* db/make-with-curl (2014-04-15) 2 commits
457
- (merged to 'next' on 2014-04-16 at b9c8527)
458
- + Makefile: allow static linking against libcurl
459
- + Makefile: use curl-config to determine curl flags
460
-
461
- Ask curl-config how to link with the curl library, instead of
462
- having only a limited configurability knobs in the Makefile.
463
-
464
- Will merge to 'master' by -rc1 if no regressions are reported.
465
-
466
-
496
* nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit
497
(merged to 'next' on 2014-04-16 at b38d5a9)
498
+ index-pack: work around thread-unsafe pread()