What's cooking (2014/04 #02)
Junio C Hamano committed
Apr 7, 2014 at 15:16 UTC
033689d2d9defb78f11c31cb17f2accdd077d27a
1 file changed
+78
-153
whats-cooking.txt
+78
-153
@@ -1,147 +1,31 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2014, #01; Fri, 4)
3
+Subject: What's cooking in git.git (Apr 2014, #02; Mon, 7)
4
X-master-at: e4eef26d985177e4bdd32bf58b6ae40e7ae67289
5
-X-next-at: 3e70902d3cca37d1cd975a63c61e4c0966946084
5
+X-next-at: 0306834402c2cffa7f83ae33bcc31a47c1cdccd0
6
7
-What's cooking in git.git (Apr 2014, #01; Fri, 4)
7
+What's cooking in git.git (Apr 2014, #02; Mon, 7)
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
-More topics merged to 'master', some of which are fallouts from GSoC
15
-microprojects, some are updates to docs. C/C++ funcname pattern
16
-update is now in.
17
-
18
-I haven't reverted the merge of that "submodule update" topic yet; I
19
-should do that soonish.
20
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
26
---------------------------------------------------
27
-[Graduated to "master"]
28
-
29
-* ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit
30
- (merged to 'next' on 2014-03-25 at a8cd922)
31
- + remote-hg: do not fail on invalid bookmarks
32
-
33
-
34
-* cb/aix (2014-03-31) 2 commits
35
- (merged to 'next' on 2014-04-01 at dd6b3d8)
36
- + tests: don't rely on strerror text when testing rmdir failure
37
- + dir.c: make git_fnmatch() not inline
38
-
39
-
40
-* cn/fetch-prune-overlapping-destination (2014-03-26) 2 commits
41
- (merged to 'next' on 2014-03-28 at 954513a)
42
- + fetch: handle overlaping refspecs on --prune
43
- + fetch: add a failing test for prunning with overlapping refspecs
44
-
45
- Protect refs in a hierarchy that can come from more than one remote
46
- hierarcies from incorrect removal by "git fetch --prune".
47
-
48
-
49
-* ep/shell-command-substitution (2014-03-25) 2 commits
50
- (merged to 'next' on 2014-03-28 at 99a512a)
51
- + git-am.sh: use the $(...) construct for command substitution
52
- + check-builtins.sh: use the $(...) construct for command substitution
53
-
54
-
55
-* jc/fix-diff-no-index-diff-opt-parse (2014-03-31) 1 commit
56
- (merged to 'next' on 2014-04-01 at b8ae26b)
57
- + diff-no-index: correctly diagnose error return from diff_opt_parse()
58
-
59
- "diff --no-index -Mq a b" fell into an infinite loop.
60
-
61
-
62
-* nd/gc-aggressive (2014-03-31) 2 commits
63
- (merged to 'next' on 2014-04-01 at e9f89b3)
64
- + environment.c: fix constness for odb_pack_keep()
65
- + gc --aggressive: make --depth configurable
66
-
67
- Allow tweaking the maximum length of the delta-chain produced by
68
- "gc --aggressive".
69
-
70
-
71
-* nd/log-show-linear-break (2014-03-25) 2 commits
72
- (merged to 'next' on 2014-03-28 at ea4a8db)
73
- + log: add --show-linear-break to help see non-linear history
74
- + object.h: centralize object flag allocation
75
-
76
- Attempts to show where a single-strand-of-pearls break in "git log"
77
- output.
78
-
79
-
80
-* rs/pickaxe-i (2014-03-24) 10 commits
81
- (merged to 'next' on 2014-03-25 at 3b6f21f)
82
- + pickaxe: simplify kwset loop in contains()
83
- + pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
84
- + pickaxe: move pickaxe() after pickaxe_match()
85
- + pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
86
- + pickaxe: honor -i when used with -S and --pickaxe-regex
87
- + t4209: use helper functions to test --author
88
- + t4209: use helper functions to test --grep
89
- + t4209: factor out helper function test_log_icase()
90
- + t4209: factor out helper function test_log()
91
- + t4209: set up expectations up front
92
-
93
- Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
94
- to be used together and work as expected to perform a pickaxe
95
- search using case-insensitive regular expression matching.
96
-
19
--------------------------------------------------
20
[New Topics]
21
100
-* ib/rev-parse-parseopt-argh (2014-04-01) 1 commit
101
- (merged to 'next' on 2014-04-01 at 025578d)
102
- + rev-parse: fix typo in example on manpage
103
-
104
- Finishing touch to a new topic scheduled for 2.0
22
+* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
23
+ - commit -m: commit staged submodules regardless of ignore config
24
+ - status/commit: show staged submodules regardless of ignore config
25
106
- Will merge to 'master'.
26
108
-
109
-* mh/lockfile (2014-04-02) 22 commits
110
- - lockfile: allow new file contents to be written while retaining lock
111
- - lockfile: extract a function reset_lock_file()
112
- - remove_lock_file(): call rollback_lock_file()
113
- - struct lock_file: rename lock_filename field to staging_filename
114
- - lockfile: also keep track of the filename of the file being locked
115
- - lock_file(): exit early if lockfile cannot be opened
116
- - commit_lock_file(): don't work with a fixed-length buffer
117
- - resolve_symlink(): use a strbuf internally
118
- - lockfile: use strbufs when handling (most) paths
119
- - config: change write_error() to take a (struct lock_file *) argument
120
- - delete_ref_loose(): don't muck around in the lock_file's filename
121
- - lockfile: define a constant LOCK_SUFFIX_LEN
122
- - lockfile.c: document the various states of lock_file objects
123
- - api-lockfile: expand the documentation
124
- - struct lock_file: replace on_list field with flags field
125
- - lock_file(): always add lock_file object to lock_file_list
126
- - hold_lock_file_for_append(): release lock on errors
127
- - lockfile: unlock file if lockfile permissions cannot be adjusted
128
- - rollback_lock_file(): set fd to -1
129
- - rollback_lock_file(): do not clear filename redundantly
130
- - try_merge_strategy(): remove redundant lock_file allocation
131
- - t3204: test deleting references when lock files already exist
132
-
133
-
134
-* mh/update-ref-batch-create-fix (2014-04-02) 1 commit
135
- (merged to 'next' on 2014-04-04 at 97e3f12)
136
- + update-ref: fail create operation over stdin if ref already exists
137
-
138
- Will merge to 'master'.
139
-
140
-
141
-* jk/pack-bitmap (2014-04-04) 1 commit
142
- - add `ignore_missing_links` mode to revwalk
143
-
144
- Will merge to 'next'.
27
+* mh/multimail (2014-04-07) 1 commit
28
+ - git-multimail: update to version 1.0.0
29
30
--------------------------------------------------
31
[Stalled]
@@ -321,6 +205,60 @@ of the repositories listed at
205
--------------------------------------------------
206
[Cooking]
207
208
+* ib/rev-parse-parseopt-argh (2014-04-01) 1 commit
209
+ (merged to 'next' on 2014-04-01 at 025578d)
210
+ + rev-parse: fix typo in example on manpage
211
+
212
+ Finishing touch to a new topic scheduled for 2.0
213
+
214
+ Will merge to 'master'.
215
+
216
+
217
+* mh/lockfile (2014-04-07) 25 commits
218
+ - trim_last_path_elm(): replace last_path_elm()
219
+ - resolve_symlink(): take a strbuf parameter
220
+ - resolve_symlink(): use a strbuf for internal scratch space
221
+ - Change lock_file::filename into a strbuf
222
+ - commit_lock_file(): use a strbuf to manage temporary space
223
+ - try_merge_strategy(): use a statically-allocated lock_file object
224
+ - try_merge_strategy(): remove redundant lock_file allocation
225
+ - lockfile: avoid transitory invalid states
226
+ - commit_lock_file(): make committing an unlocked lockfile a NOP
227
+ - commit_lock_file(): inline temporary variable
228
+ - remove_lock_file(): call rollback_lock_file()
229
+ - lock_file(): exit early if lockfile cannot be opened
230
+ - write_packed_entry_fn(): convert cb_data into a (const int *)
231
+ - prepare_index(): declare return value to be (const char *)
232
+ - delete_ref_loose(): don't muck around in the lock_file's filename
233
+ - lockfile: define a constant LOCK_SUFFIX_LEN
234
+ - lockfile.c: document the various states of lock_file objects
235
+ - struct lock_file: replace on_list field with flags field
236
+ - lock_file(): always add lock_file object to lock_file_list
237
+ - hold_lock_file_for_append(): release lock on errors
238
+ - lockfile: unlock file if lockfile permissions cannot be adjusted
239
+ - rollback_lock_file(): set fd to -1
240
+ - rollback_lock_file(): do not clear filename redundantly
241
+ - unable_to_lock_die(): rename function from unable_to_lock_index_die()
242
+ - api-lockfile: expand the documentation
243
+
244
+ Refactor and fix corner-case bugs in the lockfile API.
245
+
246
+
247
+* mh/update-ref-batch-create-fix (2014-04-02) 1 commit
248
+ (merged to 'next' on 2014-04-04 at 97e3f12)
249
+ + update-ref: fail create operation over stdin if ref already exists
250
+
251
+ Will merge to 'master'.
252
+
253
+
254
+* jk/pack-bitmap (2014-04-04) 2 commits
255
+ (merged to 'next' on 2014-04-04 at 0306834)
256
+ + pack-objects: do not reuse packfiles without --delta-base-offset
257
+ + add `ignore_missing_links` mode to revwalk
258
+
259
+ Will merge to 'master'.
260
+
261
+
262
* mr/opt-set-ptr (2014-03-31) 3 commits
263
(merged to 'next' on 2014-04-03 at a26385b)
264
+ parse-options: remove unused OPT_SET_PTR
@@ -330,6 +268,8 @@ of the repositories listed at
268
OPT_SET_PTR() implementation was broken on IL32P64 platforms;
269
it turns out that the macro is not used by any real user.
270
271
+ Will merge to 'master'.
272
+
273
274
* mt/patch-id-stable (2014-03-31) 3 commits
275
- patch-id-test: test --stable and --unstable flags
@@ -343,23 +283,24 @@ of the repositories listed at
283
284
285
* jl/nor-or-nand-and (2014-03-31) 4 commits
346
- - code and test: fix misuses of "nor"
347
- - comments: fix misuses of "nor"
348
- - contrib: fix misuses of "nor"
349
- - Documentation: fix misuses of "nor"
286
+ (merged to 'next' on 2014-04-04 at b5d1ac5)
287
+ + code and test: fix misuses of "nor"
288
+ + comments: fix misuses of "nor"
289
+ + contrib: fix misuses of "nor"
290
+ + Documentation: fix misuses of "nor"
291
292
Eradicate mistaken use of "nor" (that is, essentially "nor" used
293
not in "neither A nor B" ;-)) from in-code comments, command output
294
strings, and documentations.
295
355
- Will merge to 'next'.
296
+ Will merge to 'master'.
297
298
358
-* mh/ref-transaction (2014-04-01) 27 commits
299
+* mh/ref-transaction (2014-04-07) 27 commits
300
- ref_transaction_commit(): work with transaction->updates in place
360
- - struct ref_update: add type field
361
- - struct ref_update: add a lock member
362
- - ref_transaction_commit(): introduce temporary variables
301
+ - struct ref_update: add a type field
302
+ - struct ref_update: add a lock field
303
+ - ref_transaction_commit(): simplify code using temporary variables
304
- struct ref_update: store refname as a FLEX_ARRAY
305
- struct ref_update: rename field "ref_name" to "refname"
306
- refs: remove API function update_refs()
@@ -387,8 +328,6 @@ of the repositories listed at
328
Update "update-ref --stdin [-z]" and then introduce a transactional
329
support for (multi-)reference updates.
330
390
- Replaced with an unpublished "v3".
391
-
331
332
* jc/apply-ignore-whitespace (2014-03-26) 1 commit
333
(merged to 'next' on 2014-04-04 at 53779a7)
@@ -481,7 +420,7 @@ of the repositories listed at
420
Will hold.
421
422
484
-* ks/tree-diff-nway (2014-03-27) 19 commits
423
+* ks/tree-diff-nway (2014-04-07) 19 commits
424
- combine-diff: speed it up, by using multiparent diff tree-walker directly
425
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
426
- Portable alloca for Git
@@ -517,7 +456,8 @@ of the repositories listed at
456
Will merge to 'next' and keep it there for the remainder of this cycle.
457
458
520
-* cc/interpret-trailers (2014-04-01) 11 commits
459
+* cc/interpret-trailers (2014-04-07) 12 commits
460
+ - trailer: add blank line before the trailers if needed
461
- Documentation: add documentation for 'git interpret-trailers'
462
- trailer: add tests for commands in config file
463
- trailer: execute command from 'trailer.<name>.command'
@@ -533,19 +473,4 @@ of the repositories listed at
473
A new filter to programatically edit the tail end of the commit log
474
messages.
475
536
- Will merge to 'next'.
537
-
538
---------------------------------------------------
539
-[Discarded]
540
-
541
-* hv/submodule-ignore-fix (2013-12-06) 4 commits
542
- . disable complete ignorance of submodules for index <-> HEAD diff
543
- . always show committed submodules in summary after commit
544
- . teach add -f option for ignored submodules
545
- . fix 'git add' to skip submodules configured as ignored
546
-
547
- Being reworked in a new topic.
548
-
549
-
550
-* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
551
- . hashmap.h: make sure map entries are tightly packed
476
+ Will merge to 'next' and keep it there for the remainder of this cycle.