What's cooking (2014/04 #01)
Junio C Hamano committed
Apr 4, 2014 at 13:49 UTC
a0d7203a49f1bfe390fca4767d305d5746a658b2
1 file changed
+197
-271
whats-cooking.txt
+197
-271
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2014, #08; Mon, 31)
4
-X-master-at: 25d1ac0e59f4471c3b124a0c19cad9f9511a26ad
5
-X-next-at: 875d83ee45ac54ebd34015807b9d6c3817e4b249
3
+Subject: What's cooking in git.git (Apr 2014, #01; Fri, 4)
4
+X-master-at: e4eef26d985177e4bdd32bf58b6ae40e7ae67289
5
+X-next-at: 3e70902d3cca37d1cd975a63c61e4c0966946084
6
7
-What's cooking in git.git (Mar 2014, #08; Mon, 31)
7
+What's cooking in git.git (Apr 2014, #01; Fri, 4)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -26,186 +26,122 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
29
-* an/branch-config-message (2014-03-24) 1 commit
30
- (merged to 'next' on 2014-03-26 at 26f9741)
31
- + branch.c: install_branch_config: simplify if chain
32
-
33
-
34
-* ca/doc-config-third-party (2014-03-21) 1 commit
35
- (merged to 'next' on 2014-03-25 at 731e011)
36
- + config.txt: third-party tools may and do use their own variables
37
-
38
-
39
-* dp/makefile-charset-lib-doc (2014-03-23) 1 commit
40
- (merged to 'next' on 2014-03-25 at b32e3ad)
41
- + Makefile: describe CHARSET_LIB better
42
-
43
-
44
-* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
45
- (merged to 'next' on 2014-03-25 at 19fe25f)
46
- + tests: use "env" to run commands with temporary env-var settings
47
- (this branch is used by jk/tests-cleanup.)
48
-
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
50
-* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit
51
- (merged to 'next' on 2014-03-25 at 2683eb6)
52
- + doc: status, remove leftover statement about '#' prefix
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
55
-* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
56
- (merged to 'next' on 2014-03-25 at 08efd68)
57
- + fsck: use bitwise-or assignment operator to set flag
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
60
-* ib/rev-parse-parseopt-argh (2014-03-23) 2 commits
61
- (merged to 'next' on 2014-03-25 at d9083ed)
62
- + t1502: protect runs of SPs used in the indentation
63
- + rev-parse --parseopt: option argument name hints
64
- (this branch is used by jc/rev-parse-argh-dashed-multi-words.)
45
+ Protect refs in a hierarchy that can come from more than one remote
46
+ hierarcies from incorrect removal by "git fetch --prune".
47
66
- Teaches the "rev-parse --parseopt" mechanism used by scripted
67
- Porcelains to parse command line options and give help text how to
68
- supply argv-help (the placeholder string for an option parameter,
69
- e.g. "key-id" in "--gpg-sign=<key-id>").
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
72
-* jk/tests-cleanup (2014-03-21) 12 commits
73
- (merged to 'next' on 2014-03-26 at 4a72b49)
74
- + t0001: drop subshells just for "cd"
75
- + t0001: drop useless subshells
76
- + t0001: use test_must_fail
77
- + t0001: use test_config_global
78
- + t0001: use test_path_is_*
79
- + t0001: make symlink reinit test more careful
80
- + t: prefer "git config --file" to GIT_CONFIG
81
- + t: prefer "git config --file" to GIT_CONFIG with test_must_fail
82
- + t: stop using GIT_CONFIG to cross repo boundaries
83
- + t: drop useless sane_unset GIT_* calls
84
- + t/test-lib: drop redundant unset of GIT_CONFIG
85
- + t/Makefile: stop setting GIT_CONFIG
86
- (this branch uses dt/tests-with-env-not-subshell.)
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
89
-* js/userdiff-cc (2014-03-21) 10 commits
90
- (merged to 'next' on 2014-03-25 at 8c0e585)
91
- + userdiff: have 'cpp' hunk header pattern catch more C++ anchor points
92
- + t4018: test cases showing that the cpp pattern misses many anchor points
93
- + t4018: test cases for the built-in cpp pattern
94
- + t4018: reduce test files for pattern compilation tests
95
- + t4018: convert custom pattern test to the new infrastructure
96
- + t4018: convert java pattern test to the new infrastructure
97
- + t4018: convert perl pattern tests to the new infrastructure
98
- + t4018: an infrastructure to test hunk headers
99
- + userdiff: support unsigned and long long suffixes of integer constants
100
- + userdiff: support C++ ->* and .* operators in the word regexp
59
+ "diff --no-index -Mq a b" fell into an infinite loop.
60
102
- Improves the pattern to match the hunk-header for C/C++.
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
105
-* mm/status-porcelain-format-i18n-fix (2014-03-26) 1 commit
106
- (merged to 'next' on 2014-03-26 at 41680fc)
107
- + status: disable translation when --porcelain is used
67
+ Allow tweaking the maximum length of the delta-chain produced by
68
+ "gc --aggressive".
69
70
110
-* mr/msvc-link-with-lcurl (2014-03-27) 1 commit
111
- (merged to 'next' on 2014-03-28 at 3281dab)
112
- + MSVC: allow linking with the cURL library
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
115
-* wt/doc-submodule-name-path-confusion-1 (2014-03-27) 1 commit
116
- (merged to 'next' on 2014-03-28 at 225f241)
117
- + doc: submodule.* config are keyed by submodule names
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
120
-* wt/doc-submodule-name-path-confusion-2 (2014-03-27) 1 commit
121
- (merged to 'next' on 2014-03-28 at ec5bcf3)
122
- + doc: submodule.*.branch config is keyed by name
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
97
--------------------------------------------------
98
[New Topics]
99
127
-* cb/aix (2014-03-31) 2 commits
128
- - tests: don't rely on strerror text when testing rmdir failure
129
- - dir.c: make git_fnmatch() not inline
130
-
131
- Will merge to 'next'.
132
-
133
-
134
-* jc/fix-diff-no-index-diff-opt-parse (2014-03-31) 1 commit
135
- - diff-no-index: correctly diagnose error return from diff_opt_parse()
136
-
137
- "diff --no-index -Mq a b" fell into an infinite loop.
138
-
139
- Will merge to 'next'.
140
-
141
-
142
-* mr/opt-set-ptr (2014-03-31) 3 commits
143
- - parse-options: remove unused OPT_SET_PTR
144
- - parse-options: add cast to correct pointer type to OPT_SET_PTR
145
- - MSVC: fix t0040-parse-options crash
146
-
147
- OPT_SET_PTR() implementation was broken on IL32P64 platforms.
148
-
149
- We may just want directly to go to the endgame of removing
150
- OPT_SET_PTR macro, which nobody seems to use.
151
-
152
-
153
-* mt/patch-id-stable (2014-03-31) 3 commits
154
- - patch-id-test: test --stable and --unstable flags
155
- - patch-id: document new behaviour
156
- - patch-id: make it stable against hunk reordering
157
-
158
- Introduce a new way to compute patch-id for a patch that is not
159
- affected by the order of the paths that appear in the input.
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
105
162
-* jl/nor-or-nand-and (2014-03-31) 4 commits
163
- - code and test: fix misuses of "nor"
164
- - comments: fix misuses of "nor"
165
- - contrib: fix misuses of "nor"
166
- - Documentation: fix misuses of "nor"
106
+ Will merge to 'master'.
107
168
- Eradicate mistaken use of "nor" (that is, essentially "nor" used
169
- not in "neither A nor B" ;-)) from in-code comments, command output
170
- strings, and documentations.
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
173
-* mh/ref-transaction (2014-03-31) 27 commits
174
- - ref_transaction_commit(): work with transaction->updates in place
175
- - struct ref_update: add type field
176
- - struct ref_update: add a lock member
177
- - ref_transaction_commit(): simplify expressions
178
- - struct ref_update: store refname as a FLEX_ARRAY
179
- - struct ref_update: rename field "ref_name" to "refname"
180
- - refs: remove API function update_refs()
181
- - update-ref --stdin: reimplement using reference transactions
182
- - refs: add a concept of a reference transaction
183
- - update-ref --stdin: harmonize error messages
184
- - update-ref --stdin: improve the error message for unexpected EOF
185
- - t1400: test one breakage at a time
186
- - update-ref --stdin -z: deprecate interpreting the empty string as zeros
187
- - update-ref.c: extract a new function, parse_next_sha1()
188
- - t1400: test that stdin -z update treats empty <newvalue> as zeros
189
- - update-ref --stdin: simplify error messages for missing oldvalues
190
- - update-ref --stdin: make error messages more consistent
191
- - update-ref --stdin: improve error messages for invalid values
192
- - update-ref.c: extract a new function, parse_refname()
193
- - parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
194
- - update-ref --stdin: read the whole input at once
195
- - update_refs(): tighten constness
196
- - refs.h: rename the action_on_err constants
197
- - t1400: add some more tests involving quoted arguments
198
- - parse_arg(): really test that argument is properly terminated
199
- - t1400: provide more usual input to the command
200
- - t1400: fix test name and expected result of one test
138
+ Will merge to 'master'.
139
202
- Update "update-ref --stdin [-z]" and then introduce a transactional
203
- support for (multi-)reference updates.
140
205
- I think the earlier part should be merged to 'next' soonish in
206
- order to keep the topic that is still in flux reasonably short. I
207
- haven't read the "transaction" part carefully yet.
141
+* jk/pack-bitmap (2014-04-04) 1 commit
142
+ - add `ignore_missing_links` mode to revwalk
143
144
+ Will merge to 'next'.
145
146
--------------------------------------------------
147
[Stalled]
@@ -232,15 +168,16 @@ of the repositories listed at
168
with conflicts the person who recorded the merge would have seen
169
and the final conflict resolution that was recorded in the merge.
170
235
- RFC. This latest round clashes with the kb/fast-hashmap topic in
236
- 'master'.
171
+ Needs to be rebased, now kb/fast-hashmap topic is in.
172
173
174
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
175
- Enable index-pack threading in msysgit.
176
242
- Still under discussion among Windows folks. A failure report
243
- exists ($gmane/245170).
177
+ What is the status of this topic? A failure report exists
178
+ ($gmane/245170), and I am aware of Duy's $gmane/245034 but that was
179
+ where the discussion stalled. Is everybody waiting for everybody
180
+ else to get the discussion unstuck?
181
182
183
* bc/blame-crlf-test (2014-02-18) 1 commit
@@ -277,12 +214,6 @@ of the repositories listed at
214
Expecting a reroll.
215
216
280
-* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
281
- - hashmap.h: make sure map entries are tightly packed
282
-
283
- Will discard.
284
-
285
-
217
* po/everyday-doc (2014-01-27) 1 commit
218
- Make 'git help everyday' work
219
@@ -343,25 +274,6 @@ of the repositories listed at
274
This was primarily a RFH ($gmane/239580).
275
276
346
-* hv/submodule-ignore-fix (2013-12-06) 4 commits
347
- - disable complete ignorance of submodules for index <-> HEAD diff
348
- - always show committed submodules in summary after commit
349
- - teach add -f option for ignored submodules
350
- - fix 'git add' to skip submodules configured as ignored
351
-
352
- Teach "git add" to be consistent with "git status" when changes to
353
- submodules are set to be ignored, to avoid surprises after checking
354
- with "git status" to see there isn't any change to be further added
355
- and then see that "git add ." adds changes to them.
356
-
357
- I think a reroll is coming, so this may need to be replaced, but I
358
- needed some practice with heavy conflict resolution. It conflicts
359
- with two changes to "git add" that have been scheduled for Git 2.0
360
- quite badly, and I think I got the resolution right this time.
361
-
362
- Waiting for a reroll.
363
-
364
-
277
* np/pack-v4 (2013-09-18) 90 commits
278
. packv4-parse.c: add tree offset caching
279
. t1050: replace one instance of show-index with verify-pack
@@ -373,8 +285,7 @@ of the repositories listed at
285
Nico and Duy advancing the eternal vaporware pack-v4. This is here
286
primarily for wider distribution of the preview edition.
287
376
- Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
377
- this topic conflicts with.
288
+ Needs to be rebased, now the pack-bitmap series is in.
289
290
291
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
@@ -410,15 +321,85 @@ of the repositories listed at
321
--------------------------------------------------
322
[Cooking]
323
324
+* mr/opt-set-ptr (2014-03-31) 3 commits
325
+ (merged to 'next' on 2014-04-03 at a26385b)
326
+ + parse-options: remove unused OPT_SET_PTR
327
+ + parse-options: add cast to correct pointer type to OPT_SET_PTR
328
+ + MSVC: fix t0040-parse-options crash
329
+
330
+ OPT_SET_PTR() implementation was broken on IL32P64 platforms;
331
+ it turns out that the macro is not used by any real user.
332
+
333
+
334
+* mt/patch-id-stable (2014-03-31) 3 commits
335
+ - patch-id-test: test --stable and --unstable flags
336
+ - patch-id: document new behaviour
337
+ - patch-id: make it stable against hunk reordering
338
+
339
+ Introduce a new way to compute patch-id for a patch that is not
340
+ affected by the order of the paths that appear in the input.
341
+
342
+ Will merge to 'next' and keep it there for the remainder of this cycle.
343
+
344
+
345
+* 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"
350
+
351
+ Eradicate mistaken use of "nor" (that is, essentially "nor" used
352
+ not in "neither A nor B" ;-)) from in-code comments, command output
353
+ strings, and documentations.
354
+
355
+ Will merge to 'next'.
356
+
357
+
358
+* mh/ref-transaction (2014-04-01) 27 commits
359
+ - 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
363
+ - struct ref_update: store refname as a FLEX_ARRAY
364
+ - struct ref_update: rename field "ref_name" to "refname"
365
+ - refs: remove API function update_refs()
366
+ - update-ref --stdin: reimplement using reference transactions
367
+ - refs: add a concept of a reference transaction
368
+ - update-ref --stdin: harmonize error messages
369
+ - update-ref --stdin: improve the error message for unexpected EOF
370
+ - t1400: test one mistake at a time
371
+ - update-ref --stdin -z: deprecate interpreting the empty string as zeros
372
+ - update-ref.c: extract a new function, parse_next_sha1()
373
+ - t1400: test that stdin -z update treats empty <newvalue> as zeros
374
+ - update-ref --stdin: simplify error messages for missing oldvalues
375
+ - update-ref --stdin: make error messages more consistent
376
+ - update-ref --stdin: improve error messages for invalid values
377
+ - update-ref.c: extract a new function, parse_refname()
378
+ - parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
379
+ - update-ref --stdin: read the whole input at once
380
+ - update_refs(): fix constness
381
+ - refs.h: rename the action_on_err constants
382
+ - t1400: add some more tests involving quoted arguments
383
+ - parse_arg(): really test that argument is properly terminated
384
+ - t1400: provide more usual input to the command
385
+ - t1400: fix name and expected result of one test
386
+
387
+ Update "update-ref --stdin [-z]" and then introduce a transactional
388
+ support for (multi-)reference updates.
389
+
390
+ Replaced with an unpublished "v3".
391
+
392
+
393
* jc/apply-ignore-whitespace (2014-03-26) 1 commit
414
- - apply --ignore-space-change: lines with and without leading whitespaces do not match
394
+ (merged to 'next' on 2014-04-04 at 53779a7)
395
+ + apply --ignore-space-change: lines with and without leading whitespaces do not match
396
416
- An RFC. "--ignore-space-change" option of "git apply" ignored the
397
+ "--ignore-space-change" option of "git apply" ignored the
398
spaces at the beginning of line too aggressively, which is
399
inconsistent with the option of the same name "diff" and "git diff"
400
have.
401
421
- Will hold.
402
+ Will keep in 'next' for the remainder of this cycle.
403
404
405
* jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits
@@ -435,11 +416,12 @@ of the repositories listed at
416
Will merge to 'master'.
417
418
438
-* jk/commit-dates-parsing-fix (2014-03-26) 1 commit
439
- - t4212: loosen far-in-future test for AIX
419
+* jk/commit-dates-parsing-fix (2014-04-01) 2 commits
420
+ (merged to 'next' on 2014-04-04 at c16eeb0)
421
+ + t4212: loosen far-in-future test for AIX
422
+ + date: recognize bogus FreeBSD gmtime output
423
441
- I think we agreed that a simpler test would be a better way
442
- forward.
424
+ Will merge to 'master' and later to 'maint'.
425
426
427
* mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit
@@ -449,34 +431,6 @@ of the repositories listed at
431
Will merge to 'master'.
432
433
452
-* ep/shell-command-substitution (2014-03-25) 2 commits
453
- (merged to 'next' on 2014-03-28 at 99a512a)
454
- + git-am.sh: use the $(...) construct for command substitution
455
- + check-builtins.sh: use the $(...) construct for command substitution
456
-
457
- Will merge to 'master'.
458
-
459
-
460
-* rs/pickaxe-i (2014-03-24) 10 commits
461
- (merged to 'next' on 2014-03-25 at 3b6f21f)
462
- + pickaxe: simplify kwset loop in contains()
463
- + pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
464
- + pickaxe: move pickaxe() after pickaxe_match()
465
- + pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
466
- + pickaxe: honor -i when used with -S and --pickaxe-regex
467
- + t4209: use helper functions to test --author
468
- + t4209: use helper functions to test --grep
469
- + t4209: factor out helper function test_log_icase()
470
- + t4209: factor out helper function test_log()
471
- + t4209: set up expectations up front
472
-
473
- Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
474
- to be used together and work as expected to perform a pickaxe
475
- search using case-insensitive regular expression matching.
476
-
477
- Will merge to 'master'.
478
-
479
-
434
* as/grep-fullname-config (2014-03-20) 1 commit
435
(merged to 'next' on 2014-03-28 at 810a076)
436
+ grep: add grep.fullName config variable
@@ -487,39 +441,7 @@ of the repositories listed at
441
This may cause regressions on scripted users that do not expect
442
this new behaviour.
443
490
- Will hold.
491
-
492
-
493
-* nd/gc-aggressive (2014-03-31) 2 commits
494
- - environment.c: fix constness for odb_pack_keep()
495
- - gc --aggressive: make --depth configurable
496
-
497
- Allow tweaking the maximum length of the delta-chain produced by
498
- "gc --aggressive".
499
-
500
- Will merge to 'next'.
501
-
502
-
503
-* ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit
504
- (merged to 'next' on 2014-03-25 at a8cd922)
505
- + remote-hg: do not fail on invalid bookmarks
506
-
507
- Will merge to 'master'.
508
-
509
-
510
-* cn/fetch-prune-overlapping-destination (2014-03-26) 2 commits
511
- (merged to 'next' on 2014-03-28 at 954513a)
512
- + fetch: handle overlaping refspecs on --prune
513
- + fetch: add a failing test for prunning with overlapping refspecs
514
-
515
- Protect refs in a hierarchy that can come from more than one remote
516
- hierarcies from incorrect removal by "git fetch --prune".
517
-
518
- Since I didn't get any responses to my earlier "Comments?", I ended
519
- up reading it myself again and found a small leak, whose fix has
520
- been squashed in to the tip commit.
521
-
522
- Will merge to 'master'.
444
+ Will keep in 'next' for the remainder of this cycle.
445
446
447
* nd/multiple-work-trees (2014-03-25) 28 commits
@@ -556,9 +478,7 @@ of the repositories listed at
478
rely on symbolic links and make sharing of objects and refs safer
479
by making the borrowee and borrowers aware of each other.
480
559
- What is the doneness of this thing? I remember reading it through
560
- once and sent review comments on earlier parts, but have there been
561
- a lot of discussions on this topic?
481
+ Will hold.
482
483
484
* ks/tree-diff-nway (2014-03-27) 19 commits
@@ -592,23 +512,13 @@ of the repositories listed at
512
detections and such. And N=2 case nicely degenerates to the usual
513
2-way diff-tree, which is very nice.
514
595
- The preparatory steps are all in 'next'. The real fun part should
596
- follow soonish (hopefully).
515
+ The preparatory steps are all in 'next'.
516
517
+ Will merge to 'next' and keep it there for the remainder of this cycle.
518
599
-* nd/log-show-linear-break (2014-03-25) 2 commits
600
- (merged to 'next' on 2014-03-28 at ea4a8db)
601
- + log: add --show-linear-break to help see non-linear history
602
- + object.h: centralize object flag allocation
519
604
- Attempts to show where a single-strand-of-pearls break in "git log"
605
- output.
606
-
607
- Will merge to 'master'.
608
-
609
-
610
-* cc/interpret-trailers (2014-03-26) 12 commits
611
- - trailers: add documentation for 'git interpret-trailers'
520
+* cc/interpret-trailers (2014-04-01) 11 commits
521
+ - Documentation: add documentation for 'git interpret-trailers'
522
- trailer: add tests for commands in config file
523
- trailer: execute command from 'trailer.<name>.command'
524
- trailer: add tests for "git interpret-trailers"
@@ -617,9 +527,25 @@ of the repositories listed at
527
- trailer: parse trailers from stdin
528
- trailer: process command line trailer arguments
529
- trailer: read and process config information
620
- - Move lower case functions into wrapper.c
530
- trailer: process trailers from stdin and arguments
622
- - trailers: add data structures and basic functions
531
+ - trailer: add data structures and basic functions
532
533
A new filter to programatically edit the tail end of the commit log
534
messages.
535
+
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