What's cooking (2014/04 #09)
Junio C Hamano committed
Apr 29, 2014 at 15:35 UTC
1d095dd8dc211a3d897db9fb3b6af3e307180417
1 file changed
+197
-135
whats-cooking.txt
+197
-135
@@ -1,140 +1,104 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2014, #08; Fri, 25)
4
-X-master-at: 35936f8fc38a214cc7d2595070641d39a541dfb1
5
-X-next-at: 6b2797783cb3e61a56a96669ce7848480f49f38f
3
+Subject: What's cooking in git.git (Apr 2014, #09; Tue, 29)
4
+X-master-at: d8779e1e2536bdd024254af14d2c046bba2bbb01
5
+X-next-at: fe24852931172d52dd7fafff92f32bb80ce75764
6
7
-What's cooking in git.git (Apr 2014, #08; Fri, 25)
7
+What's cooking in git.git (Apr 2014, #09; Tue, 29)
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 is at v2.0.0-rc1. Last minute fixes
15
-to newly added code keep flowing in, which is good.
14
+The tip of the 'master' branch has passed v2.0.0-rc1. Last minute
15
+fixes to newly added code keep flowing in, which is good. I've
16
+picked up some topics that will not be part of the upcoming release
17
+to 'pu' not to lose them, but I didn't have time to give them a deep
18
+reading.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
22
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
22
---------------------------------------------------
23
-[Graduated to "master"]
24
-
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
-
30
- Ask curl-config how to link with the curl library, instead of
31
- having only a limited configurability knobs in the Makefile.
32
-
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
-
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
-
47
-
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
-
25
--------------------------------------------------
26
[New Topics]
27
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
28
+* cc/replace-edit (2014-04-29) 4 commits
29
+ - replace: add --edit option
30
+ - replace: factor object resolution out of replace_object
31
+ - replace: use OPT_CMDMODE to handle modes
32
+ - replace: refactor command-mode determination
33
73
- Adjust shell scripts to use $(cmd) instead of `cmd`.
34
75
- Will merge to 'next' and keep it there for the remainder of the cycle.
35
+* da/imap-send-use-credential-helper (2014-04-29) 1 commit
36
+ - imap-send: use git-credential
37
38
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
39
+* dk/blame-reorg (2014-04-28) 1 commit
40
+ - blame: large-scale performance rewrite
41
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-'").
42
43
+* je/pager-do-not-recurse (2014-04-28) 1 commit
44
+ - pager: do allow spawning pager recursively
45
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
46
91
- Will merge to 'next' and keep it there for the remainder of the cycle.
47
+* jk/commit-C-pick-empty (2014-04-28) 1 commit
48
+ - commit: do not complain of empty messages from -C
49
50
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
51
+* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
52
+ - t3910: show failure of core.precomposeunicode with decomposed filenames
53
98
- A finishing touch fix to a new change already in 'master'.
54
100
- Will merge to 'master' by -rc2.
55
+* mt/send-email-cover-to-cc (2014-04-29) 2 commits
56
+ - test/send-email: to-cover, cc-cover tests
57
+ - git-send-email: two new options: to-cover, cc-cover
58
59
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
60
+* nd/split-index (2014-04-29) 33 commits
61
+ - SQUASH???
62
+ - t1700: new tests for split-index mode
63
+ - t2104: make sure split index mode is off for the version test
64
+ - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
65
+ - read-tree: note about dropping split-index mode or index version
66
+ - read-tree: force split-index mode off on --index-output
67
+ - rev-parse: add --shared-index-path to get shared index path
68
+ - update-index --split-index: do not split if $GIT_DIR is read only
69
+ - update-index: new options to enable/disable split index mode
70
+ - split-index: strip pathname of on-disk replaced entries
71
+ - split-index: do not invalidate cache-tree at read time
72
+ - split-index: the reading part
73
+ - split-index: the writing part
74
+ - read-cache: mark updated entries for split index
75
+ - read-cache: save deleted entries in split index
76
+ - read-cache: mark new entries for split index
77
+ - read-cache: split-index mode
78
+ - read-cache: save index SHA-1 after reading
79
+ - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
80
+ - cache-tree: mark istate->cache_changed on prime_cache_tree()
81
+ - cache-tree: mark istate->cache_changed on cache tree update
82
+ - cache-tree: mark istate->cache_changed on cache tree invalidation
83
+ - unpack-trees: be specific what part of the index has changed
84
+ - resolve-undo: be specific what part of the index has changed
85
+ - update-index: be specific what part of the index has changed
86
+ - read-cache: be specific what part of the index has changed
87
+ - read-cache: be strict about "changed" in remove_marked_cache_entries()
88
+ - read-cache: store in-memory flags in the first 12 bits of ce_flags
89
+ - read-cache: relocate and unexport commit_locked_index()
90
+ - read-cache: new API write_locked_index instead of write_index/write_cache
91
+ - sequencer: do not update/refresh index if the lock cannot be held
92
+ - ewah: delete unused ewah_read_mmap_native declaration
93
+ - ewah: fix constness of ewah_read_mmap
94
107
- Will keep in 'next' for the remainder of the cycle.
95
+
96
+* tl/relax-in-poll-emulation (2014-04-29) 1 commit
97
+ - compat/poll: sleep 1 millisecond to avoid busy wait
98
99
--------------------------------------------------
100
[Stalled]
101
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
-
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
-
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
-
137
-
102
* tr/merge-recursive-index-only (2014-02-05) 3 commits
103
- merge-recursive: -Xindex-only to leave worktree unchanged
104
- merge-recursive: internal flag to avoid touching the worktree
@@ -160,15 +124,6 @@ of the repositories listed at
124
Needs to be rebased, now kb/fast-hashmap topic is in.
125
126
163
-* bc/blame-crlf-test (2014-02-18) 1 commit
164
- - blame: add a failing test for a CRLF issue.
165
-
166
- I have a feeling that a fix for this should be fairly isolated and
167
- trivial (it should be just the matter of paying attention to the
168
- crlf settings when synthesizing the fake commit)---perhaps somebody
169
- can squash in a fix to this?
170
-
171
-
127
* jk/makefile (2014-02-05) 16 commits
128
- FIXUP
129
- move LESS/LV pager environment to Makefile
@@ -186,6 +141,7 @@ of the repositories listed at
141
- Makefile: introduce make-var helper function
142
- Makefile: fix git-instaweb dependency on gitweb
143
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
144
+ (this branch is used by mm/pager-less-sans-S.)
145
146
Simplify the Makefile rules and macros that exist primarily for
147
quoting purposes, and make it easier to robustly express the
@@ -302,15 +258,132 @@ of the repositories listed at
258
--------------------------------------------------
259
[Cooking]
260
305
-* fc/remote-helpers-hg-bzr-graduation (2014-04-21) 3 commits
261
+* bc/blame-crlf-test (2014-04-28) 1 commit
262
+ - blame: correctly handle files regardless of autocrlf.
263
+
264
+
265
+* rs/ref-transaction (2014-04-29) 27 commits
266
+ - refs.c: make lock_ref_sha1 static
267
+ - refs.c: make write_ref_sha1 static
268
+ - walker.c: use ref transaction for ref updates
269
+ - fast-import.c: use a ref transaction when dumping tags
270
+ - receive-pack.c: use a reference transaction for updating the refs
271
+ - fetch.c: use a single ref transaction for all ref updates
272
+ - fetch.c: change s_update_ref to use a ref transaction
273
+ - fetch.c: clear errno before calling functions that might set it
274
+ - refs.c: ref_transaction_commit should not free the transaction
275
+ - refs.c: free the transaction before returning when number of updates is 0
276
+ - refs.c: change update_ref to use a transaction
277
+ - branch.c: use ref transaction for all ref updates
278
+ - fast-import.c: change update_branch to use ref transactions
279
+ - sequencer.c: use ref transactions for all ref updates
280
+ - commit.c: use ref transactions for updates
281
+ - replace.c: use the ref transaction functions for updates
282
+ - tag.c: use ref transactions when doing updates
283
+ - refs.c: ref_transaction_delete to check for error and return status
284
+ - refs.c: change ref_transaction_create to do error checking and return status
285
+ - refs.c: change ref_transaction_update() to do error checking and return status
286
+ - refs.c: remove the onerr argument to ref_transaction_commit
287
+ - refs.c: make update_ref_write update a strbuf on failure
288
+ - update-ref.c: log transaction error from the update_ref
289
+ - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
290
+ - refs.c: add a strbuf argument to ref_transaction_commit for error logging
291
+ - refs.c: allow passing NULL to ref_transaction_free
292
+ - refs.c: constify the sha arguments for ref_transaction_create|delete|update
293
+ (this branch uses mh/ref-transaction.)
294
+
295
+ Updates most of the callsites to write_sha1_ref(), the low-level
296
+ mechanism to update a ref, to use the ref-transaction API.
297
+
298
+ Expecting a reroll.
299
+
300
+
301
+* ep/shell-command-substitution (2014-04-29) 27 commits
302
+ - t1050-large.sh: use the $( ... ) construct for command substitution
303
+ - t1020-subdirectory.sh: use the $( ... ) construct for command substitution
304
+ - t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
305
+ - t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
306
+ - t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
307
+ - t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
308
+ - t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
309
+ - t0300-credentials.sh: use the $( ... ) construct for command substitution
310
+ - t0030-stripspace.sh: use the $( ... ) construct for command substitution
311
+ - t0026-eol-config.sh: use the $( ... ) construct for command substitution
312
+ - t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
313
+ - t0020-crlf.sh: use the $( ... ) construct for command substitution
314
+ - t0010-racy-git.sh: use the $( ... ) construct for command substitution
315
+ - t0001-init.sh: use the $( ... ) construct for command substitution
316
+ - p5302-pack-index.sh: use the $( ... ) construct for command substitution
317
+ - lib-gpg.sh: use the $( ... ) construct for command substitution
318
+ - lib-cvs.sh: use the $( ... ) construct for command substitution
319
+ - lib-credential.sh: use the $( ... ) construct for command substitution
320
+ - git-web--browse.sh: use the $( ... ) construct for command substitution
321
+ - git-stash.sh: use the $( ... ) construct for command substitution
322
+ - git-rebase.sh: use the $( ... ) construct for command substitution
323
+ - git-rebase--merge.sh: use the $( ... ) construct for command substitution
324
+ - git-pull.sh: use the $( ... ) construct for command substitution
325
+ - appp.sh: use the $( ... ) construct for command substitution
326
+ - t7900-subtree.sh: use the $( ... ) construct for command substitution
327
+ - test-gitmw-lib.sh: use the $( ... ) construct for command substitution
328
+ - t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
329
+
330
+ Adjust shell scripts to use $(cmd) instead of `cmd`.
331
+
332
+ Will merge to 'next' and keep it there for the remainder of the cycle.
333
+
334
+
335
+* ib/test-selectively-run (2014-04-23) 3 commits
336
+ - test-lib: '--run' to run only specific tests
337
+ - test-lib: tests skipped by GIT_SKIP_TESTS say so
338
+ - test-lib: Document short options in t/README
339
+
340
+ Allow specifying only certain individual test pieces to be run
341
+ using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
342
+
343
+
344
+* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
345
+ - git-remote-mediawiki: fix encoding issue for UTF-8 media files
346
+ - git-remote-mediawiki: allow stop/start-ing the test server
347
+
348
+ Will merge to 'next' and keep it there for the remainder of the cycle.
349
+
350
+
351
+* mw/symlinks (2014-04-24) 1 commit
352
+ (merged to 'next' on 2014-04-25 at 20b2af6)
353
+ + setup: fix windows path buffer over-stepping
354
+
355
+ A finishing touch fix to a new change already in 'master'.
356
+
357
+ Will merge to 'master' by -rc2.
358
+
359
+
360
+* sk/tag-contains-wo-recursion (2014-04-25) 1 commit
361
+ (merged to 'next' on 2014-04-25 at f320750)
362
+ + git tag --contains: avoid stack overflow
363
+
364
+ Will keep in 'next' for the remainder of the cycle.
365
+
366
+
367
+* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
368
+ - remote-hg: trivial cleanups
369
+ - remote-hg: make sure we omit multiple heads
370
+ - git-remote-hg: use internal clone's hgrc
371
+ - t: remote-hg: split into setup test
372
+ - remote-hg: properly detect missing contexts
373
+ - remote-{hg,bzr}: store marks only on success
374
+ - remote-hg: update to 'public' phase when pushing
375
+ - remote-hg: fix parsing of custom committer
376
(merged to 'next' on 2014-04-22 at fed170a)
377
+ remote-helpers: move tests out of contrib
378
+ remote-helpers: move out of contrib
379
+ remote-helpers: squelch python import exceptions
380
311
- Move remote-hg and remote-bzr out of contrib/.
381
+ Move remote-hg and remote-bzr out of contrib/. There were some
382
+ suggestions on the follow-up fix patches still not in 'next', which
383
+ may result in a reroll.
384
313
- Will keep in 'next' for the remainder of the cycle.
385
+ Will merge to 'next' and keep it there for the remainder of the
386
+ cycle.
387
388
389
* fc/remote-helper-refmap (2014-04-21) 8 commits
@@ -330,16 +403,15 @@ of the repositories listed at
403
Will keep in 'next' for the remainder of the cycle.
404
405
333
-* jk/external-diff-use-argv-array (2014-04-21) 6 commits
406
+* jk/external-diff-use-argv-array (2014-04-21) 5 commits
407
(merged to 'next' on 2014-04-22 at e6d92d7)
408
+ run_external_diff: refactor cmdline setup logic
409
+ run_external_diff: hoist common bits out of conditional
410
+ run_external_diff: drop fflush(NULL)
411
+ run_external_diff: clean up error handling
412
+ run_external_diff: use an argv_array for the environment
340
- + run_external_diff: use an argv_array for the command line
413
342
- Code clean-up.
414
+ Code clean-up (and a bugfix which has been merged for 2.0).
415
416
Will keep in 'next' for the remainder of the cycle.
417
@@ -568,22 +640,17 @@ of the repositories listed at
640
Expecting a reroll.
641
642
571
-* mt/patch-id-stable (2014-03-31) 3 commits
572
- (merged to 'next' on 2014-04-08 at 0188d44)
573
- + patch-id-test: test --stable and --unstable flags
574
- + patch-id: document new behaviour
575
- + patch-id: make it stable against hunk reordering
643
+* mt/patch-id-stable (2014-04-29) 5 commits
644
+ - t4204-patch-id.sh: default is now stable
645
+ - patch-id: change default to stable
646
+ - patch-id-test: test stable and unstable behaviour
647
+ - test: add test_write_lines helper
648
+ - patch-id: make it stable against hunk reordering
649
650
Introduce a new way to compute patch-id for a patch that is not
651
affected by the order of the paths that appear in the input.
652
580
- This changes the generated patch-id unless the users add an extra
581
- option to their command lines, but I deliberately queued the series
582
- to 'next' without reverting that compatibility breakage to see if
583
- people complain. It could be that we do not have to worry about
584
- the default flipping at all. We'll see.
585
-
586
- Will keep in 'next' for the remainder of the cycle.
653
+ Will merge to 'next' and keep it there for the remainder of the cycle.
654
655
656
* mh/ref-transaction (2014-04-07) 27 commits
@@ -722,23 +789,18 @@ of the repositories listed at
789
Will keep in 'next' for the remainder of the cycle.
790
791
725
-* cc/interpret-trailers (2014-04-07) 12 commits
726
- - trailer: add blank line before the trailers if needed
792
+* cc/interpret-trailers (2014-04-29) 11 commits
793
- Documentation: add documentation for 'git interpret-trailers'
794
- trailer: add tests for commands in config file
795
- trailer: execute command from 'trailer.<name>.command'
796
- trailer: add tests for "git interpret-trailers"
797
- trailer: add interpret-trailers command
798
- trailer: put all the processing together and print
733
- - trailer: parse trailers from stdin
799
+ - trailer: parse trailers from file or stdin
800
- trailer: process command line trailer arguments
801
- trailer: read and process config information
736
- - trailer: process trailers from stdin and arguments
802
+ - trailer: process trailers from input message and arguments
803
- trailer: add data structures and basic functions
804
805
A new filter to programatically edit the tail end of the commit log
806
messages.
741
-
742
- I was planning to merge it to 'next' and keep it there for the
743
- remainder of the cycle, but it appears that there still will be
744
- another round of reroll, at least for the documentation?