What's cooking (2017/07 #02)
Junio C Hamano committed
Jul 7, 2017 at 12:23 UTC
118c25dd588fbb7d4460b2fa9fe004151058b6ca
1 file changed
+212
-250
whats-cooking.txt
+212
-250
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2017, #01; Wed, 5)
4
-X-master-at: 50ff9ea4a0770c8b1bfe3f98f09728427c0c6cc7
5
-X-next-at: b4debfe1a1bbbf047b7c2b69802448ce45df5f2f
3
+Subject: What's cooking in git.git (Jul 2017, #02; Fri, 7)
4
+X-master-at: 8b2efe2a0fd93b8721879f796d848a9ce785647f
5
+X-next-at: a9c46e097be495732ddb19ee1f57e62e5b35db6c
6
7
-What's cooking in git.git (Jul 2017, #01; Wed, 5)
7
+What's cooking in git.git (Jul 2017, #02; Fri, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,112 +20,43 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
-* bw/repo-object (2017-06-23) 21 commits
24
- (merged to 'next' on 2017-06-26 at ed9c0b77c3)
25
- + ls-files: use repository object
26
- + repository: enable initialization of submodules
27
- + submodule: convert is_submodule_initialized to work on a repository
28
- + submodule: add repo_read_gitmodules
29
- + submodule-config: store the_submodule_cache in the_repository
30
- + repository: add index_state to struct repo
31
- + config: read config from a repository object
32
- + path: add repo_worktree_path and strbuf_repo_worktree_path
33
- + path: add repo_git_path and strbuf_repo_git_path
34
- + path: worktree_git_path() should not use file relocation
35
- + path: convert do_git_path to take a 'struct repository'
36
- + path: convert strbuf_git_common_path to take a 'struct repository'
37
- + path: always pass in commondir to update_common_dir
38
- + path: create path.h
39
- + environment: store worktree in the_repository
40
- + environment: place key repository state in the_repository
41
- + repository: introduce the repository object
42
- + environment: remove namespace_len variable
43
- + setup: add comment indicating a hack
44
- + setup: don't perform lazy initialization of repository state
45
- + Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object
46
-
47
- Introduce a "repository" object to eventually make it easier to
48
- work in multiple repositories (the primary focus is to work with
49
- the superproject and its submodules) in a single process.
50
-
51
-
52
-* cc/shared-index-permfix (2017-06-25) 3 commits
53
- (merged to 'next' on 2017-06-26 at bb41584bf0)
54
- + t1700: make sure split-index respects core.sharedrepository
55
- + t1301: move modebits() to test-lib-functions.sh
56
- + read-cache: use shared perms when writing shared index
57
-
58
- The split index code did not honor core.sharedrepository setting
59
- correctly.
60
-
61
-
62
-* jt/unify-object-info (2017-06-26) 8 commits
63
- (merged to 'next' on 2017-06-26 at 540ea81983)
64
- + sha1_file: refactor has_sha1_file_with_flags
65
- + sha1_file: do not access pack if unneeded
66
- + sha1_file: teach sha1_object_info_extended more flags
67
- + sha1_file: refactor read_object
68
- + sha1_file: move delta base cache code up
69
- + sha1_file: rename LOOKUP_REPLACE_OBJECT
70
- + sha1_file: rename LOOKUP_UNKNOWN_OBJECT
71
- + sha1_file: teach packed_object_info about typename
72
-
73
- Code clean-ups.
74
-
75
-
76
-* rs/sha1-name-readdir-optim (2017-06-24) 4 commits
77
- (merged to 'next' on 2017-06-26 at a70587f2b9)
78
- + sha1_file: guard against invalid loose subdirectory numbers
79
- + sha1_file: let for_each_file_in_obj_subdir() handle subdir names
80
- + p4205: add perf test script for pretty log formats
81
- + sha1_name: cache readdir(3) results in find_short_object_filename()
82
-
83
- Optimize "what are the object names already taken in an alternate
84
- object database?" query that is used to derive the length of prefix
85
- an object name is uniquely abbreviated to.
23
+* ab/sha1dc-maint (2017-07-03) 1 commit
24
+ (merged to 'next' on 2017-07-05 at ac69c90b7e)
25
+ + sha1dc: update from upstream
26
+ (this branch is used by ab/sha1dc.)
27
87
---------------------------------------------------
88
-[New Topics]
28
+ Update the sha1dc again to fix portability glitches.
29
90
-* bc/object-id (2017-07-04) 12 commits
91
- - sha1_name: convert GET_SHA1* flags to GET_OID*
92
- - sha1_name: convert get_sha1* to get_oid*
93
- - Convert remaining callers of get_sha1 to get_oid.
94
- - builtin/verify-tag: convert to struct object_id
95
- - builtin/unpack-file: convert to struct object_id
96
- - bisect: convert bisect_checkout to struct object_id
97
- - builtin/update_ref: convert to struct object_id
98
- - sequencer: convert to struct object_id
99
- - remote: convert struct push_cas to struct object_id
100
- - submodule: convert submodule config lookup to use object_id
101
- - builtin/merge-tree: convert remaining caller of get_sha1 to object_id
102
- - builtin/fsck: convert remaining caller of get_sha1 to object_id
30
104
- Conversion from uchar[20] to struct object_id continues.
31
+* ab/strbuf-addftime-tzname-boolify (2017-07-01) 2 commits
32
+ (merged to 'next' on 2017-07-05 at 81e6795eb3)
33
+ + strbuf: change an always NULL/"" strbuf_addftime() param to bool
34
+ + strbuf.h comment: discuss strbuf_addftime() arguments in order
35
36
+ strbuf_addftime() is further getting tweaked.
37
107
-* jk/reflog-walk (2017-07-05) 7 commits
108
- - reflog-walk: stop using fake parents
109
- - rev-list: check reflog_info before showing usage
110
- - get_revision_1(): replace do-while with an early return
111
- - log: do not free parents when walking reflog
112
- - [SQUASH LOG MESSAGE ONLY] t1414: document some reflog-walk oddities
113
- - t1414: document some reflog-walk oddities
114
- - Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk
115
- (this branch uses jk/reflog-walk-maint.)
38
117
- Numerous bugs in walking of reflogs via "log -g" and friends have
118
- been fixed.
39
+* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit
40
+ (merged to 'next' on 2017-06-30 at af23bd111b)
41
+ + subtree: honour USE_ASCIIDOCTOR when set
42
43
+ The Makefile rule in contrib/subtree for building documentation
44
+ learned to honour USE_ASCIIDOCTOR just like the main documentation
45
+ set does.
46
121
-* jk/reflog-walk-maint (2017-07-05) 1 commit
122
- - reflog-walk: skip over double-null oid due to HEAD rename
123
- (this branch is used by jk/reflog-walk.)
47
125
- After "git branch --move" of the currently checked out branch, the
126
- code to walk the reflog of HEAD via "log -g" and friends
127
- incorrectly stopped at the reflog entry that records the renaming
128
- of the branch.
48
+* jc/utf8-fprintf (2017-06-28) 1 commit
49
+ (merged to 'next' on 2017-06-30 at a8cc490818)
50
+ + submodule--helper: do not call utf8_fprintf() unnecessarily
51
+
52
+ Code cleanup.
53
+
54
+
55
+* js/fsck-name-object (2017-06-28) 1 commit
56
+ (merged to 'next' on 2017-06-30 at 9a08514cf2)
57
+ + t1450: use egrep for regexp "alternation"
58
+
59
+ Test fix.
60
61
62
* js/t5534-rev-parse-gives-multi-line-output-fix (2017-07-05) 1 commit
@@ -136,8 +67,6 @@ of the repositories listed at
67
did not use 'git rev-parse' to formulate the line to look for in
68
the certificate correctly.
69
139
- Will merge to 'master'.
140
-
70
71
* rs/apply-avoid-over-reading (2017-07-01) 1 commit
72
(merged to 'next' on 2017-07-05 at 35730f3a47)
@@ -145,54 +74,52 @@ of the repositories listed at
74
75
Code clean-up to fix possible buffer over-reading.
76
148
- Will merge to 'master'.
77
78
+* sb/merge-recursive-code-cleanup (2017-06-30) 1 commit
79
+ (merged to 'next' on 2017-07-05 at 4228240520)
80
+ + merge-recursive: use DIFF_XDL_SET macro
81
151
-* sb/hashmap-cleanup (2017-07-05) 10 commits
152
- - t/helper/test-hashmap: use custom data instead of duplicate cmp functions
153
- - name-hash.c: drop hashmap_cmp_fn cast
154
- - submodule-config.c: drop hashmap_cmp_fn cast
155
- - remote.c: drop hashmap_cmp_fn cast
156
- - patch-ids.c: drop hashmap_cmp_fn cast
157
- - convert/sub-process: drop cast to hashmap_cmp_fn
158
- - config.c: drop hashmap_cmp_fn cast
159
- - builtin/describe: drop hashmap_cmp_fn cast
160
- - builtin/difftool.c: drop hashmap_cmp_fn cast
161
- - attr.c: drop hashmap_cmp_fn cast
162
- (this branch uses sb/hashmap-customize-comparison; is tangled with sb/diff-color-move.)
82
+ Code clean-up.
83
164
- Many uses of comparision callback function the hashmap API uses
165
- cast the callback function type when registering it to
166
- hashmap_init(), which defeats the compile time type checking when
167
- the callback interface changes (e.g. gaining more parameters).
168
- The callback implementations have been updated to take "void *"
169
- pointers and cast them to the type they expect instead.
84
171
- Will wait for feedback, then merge to and cook in 'next'.
85
+* xz/send-email-batch-size (2017-07-05) 1 commit
86
+ (merged to 'next' on 2017-07-05 at 92f3c31fbd)
87
+ + send-email: --batch-size to work around some SMTP server limit
88
89
+ "git send-email" learned to overcome some SMTP server limitation
90
+ that does not allow many pieces of e-mails to be sent over a single
91
+ session.
92
174
-* tb/push-to-cygwin-unc-path (2017-07-05) 1 commit
175
- - cygwin: allow pushing to UNC paths
93
+--------------------------------------------------
94
+[New Topics]
95
177
- On Cygwin, similar to Windows, "git push //server/share/repository"
178
- ought to mean a repository on a network share that can be accessed
179
- locally, but this did not work correctly due to stripping the double
180
- slashes at the beginning.
96
+* jc/allow-lazy-cas (2017-07-06) 1 commit
97
+ - push: disable lazy --force-with-lease by default
98
182
- This may need to be heavily tested before it gets unleashed to the
183
- wild, as the change is at a fairly low-level code and would affect
184
- not just the code to decide if the push destination is local. There
185
- may be unexpected fallouts in the path normalization.
99
+ Because "git push --force-with-lease[=<ref>]" that relies on the
100
+ stability of remote-tracking branches is unsafe when something
101
+ fetches into the repository behind user's back, it is now disabled
102
+ by default. A new configuration variable can be used to enable it
103
+ by users who know what they are doing. This would pave the way to
104
+ possibly turn `--force` into `--force-with-lease`.
105
106
Will wait for feedback, then merge to and cook in 'next'.
107
108
190
-* ab/sha1dc-maint (2017-07-03) 1 commit
191
- (merged to 'next' on 2017-07-05 at ac69c90b7e)
192
- + sha1dc: update from upstream
193
- (this branch is used by ab/sha1dc.)
109
+* ks/typofix-commit-c-comment (2017-07-06) 1 commit
110
+ (merged to 'next' on 2017-07-07 at 64e98fc832)
111
+ + builtin/commit.c: fix a typo in the comment
112
195
- Update the sha1dc again to fix portability glitches.
113
+ Typofix.
114
+
115
+ Will merge to 'master'.
116
+
117
+
118
+* bb/unicode-10.0 (2017-07-07) 1 commit
119
+ (merged to 'next' on 2017-07-07 at a9c46e097b)
120
+ + unicode: update the width tables to Unicode 10
121
+
122
+ Update the character width tables.
123
124
Will merge to 'master'.
125
@@ -225,17 +152,6 @@ of the repositories listed at
152
cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
153
154
228
-* xz/send-email-batch-size (2017-07-05) 1 commit
229
- (merged to 'next' on 2017-07-05 at 92f3c31fbd)
230
- + send-email: --batch-size to work around some SMTP server limit
231
-
232
- "git send-email" learned to overcome some SMTP server limitation
233
- that does not allow many pieces of e-mails to be sent over a single
234
- session.
235
-
236
- Will merge to 'master'.
237
-
238
-
155
* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
156
- Documentation/clone: document ignored configuration variables
157
- clone: respect additional configured fetch refspecs during initial fetch
@@ -273,6 +189,96 @@ of the repositories listed at
189
--------------------------------------------------
190
[Cooking]
191
192
+* bc/object-id (2017-07-04) 12 commits
193
+ - sha1_name: convert GET_SHA1* flags to GET_OID*
194
+ - sha1_name: convert get_sha1* to get_oid*
195
+ - Convert remaining callers of get_sha1 to get_oid.
196
+ - builtin/verify-tag: convert to struct object_id
197
+ - builtin/unpack-file: convert to struct object_id
198
+ - bisect: convert bisect_checkout to struct object_id
199
+ - builtin/update_ref: convert to struct object_id
200
+ - sequencer: convert to struct object_id
201
+ - remote: convert struct push_cas to struct object_id
202
+ - submodule: convert submodule config lookup to use object_id
203
+ - builtin/merge-tree: convert remaining caller of get_sha1 to object_id
204
+ - builtin/fsck: convert remaining caller of get_sha1 to object_id
205
+
206
+ Conversion from uchar[20] to struct object_id continues.
207
+
208
+
209
+* jk/reflog-walk (2017-07-07) 8 commits
210
+ - reflog-walk: apply --since/--until to reflog dates
211
+ - reflog-walk: stop using fake parents
212
+ - rev-list: check reflog_info before showing usage
213
+ - get_revision_1(): replace do-while with an early return
214
+ - log: do not free parents when walking reflog
215
+ - revision: disallow reflog walking with revs->limited
216
+ - t1414: document some reflog-walk oddities
217
+ - Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk
218
+ (this branch uses jk/reflog-walk-maint.)
219
+
220
+ Numerous bugs in walking of reflogs via "log -g" and friends have
221
+ been fixed.
222
+
223
+ Will wait for feedback, then merge to and cook in 'next'.
224
+
225
+
226
+* jk/reflog-walk-maint (2017-07-07) 4 commits
227
+ (merged to 'next' on 2017-07-07 at 611554ba2f)
228
+ + reflog-walk: include all fields when freeing complete_reflogs
229
+ + reflog-walk: don't free reflogs added to cache
230
+ + reflog-walk: duplicate strings in complete_reflogs list
231
+ (merged to 'next' on 2017-07-06 at 7408dd80a1)
232
+ + reflog-walk: skip over double-null oid due to HEAD rename
233
+ (this branch is used by jk/reflog-walk.)
234
+
235
+ After "git branch --move" of the currently checked out branch, the
236
+ code to walk the reflog of HEAD via "log -g" and friends
237
+ incorrectly stopped at the reflog entry that records the renaming
238
+ of the branch.
239
+
240
+ Will merge to 'master'.
241
+
242
+
243
+* sb/hashmap-cleanup (2017-07-05) 10 commits
244
+ - t/helper/test-hashmap: use custom data instead of duplicate cmp functions
245
+ - name-hash.c: drop hashmap_cmp_fn cast
246
+ - submodule-config.c: drop hashmap_cmp_fn cast
247
+ - remote.c: drop hashmap_cmp_fn cast
248
+ - patch-ids.c: drop hashmap_cmp_fn cast
249
+ - convert/sub-process: drop cast to hashmap_cmp_fn
250
+ - config.c: drop hashmap_cmp_fn cast
251
+ - builtin/describe: drop hashmap_cmp_fn cast
252
+ - builtin/difftool.c: drop hashmap_cmp_fn cast
253
+ - attr.c: drop hashmap_cmp_fn cast
254
+ (this branch uses sb/hashmap-customize-comparison; is tangled with sb/diff-color-move.)
255
+
256
+ Many uses of comparision callback function the hashmap API uses
257
+ cast the callback function type when registering it to
258
+ hashmap_init(), which defeats the compile time type checking when
259
+ the callback interface changes (e.g. gaining more parameters).
260
+ The callback implementations have been updated to take "void *"
261
+ pointers and cast them to the type they expect instead.
262
+
263
+ Will wait for feedback, then merge to and cook in 'next'.
264
+
265
+
266
+* tb/push-to-cygwin-unc-path (2017-07-05) 1 commit
267
+ - cygwin: allow pushing to UNC paths
268
+
269
+ On Cygwin, similar to Windows, "git push //server/share/repository"
270
+ ought to mean a repository on a network share that can be accessed
271
+ locally, but this did not work correctly due to stripping the double
272
+ slashes at the beginning.
273
+
274
+ This may need to be heavily tested before it gets unleashed to the
275
+ wild, as the change is at a fairly low-level code and would affect
276
+ not just the code to decide if the push destination is local. There
277
+ may be unexpected fallouts in the path normalization.
278
+
279
+ Will wait for feedback, then merge to and cook in 'next'.
280
+
281
+
282
* ab/grep-lose-opt-regflags (2017-06-30) 6 commits
283
(merged to 'next' on 2017-07-05 at 375c0b92ea)
284
+ grep: remove redundant REG_NEWLINE when compiling fixed regex
@@ -299,87 +305,45 @@ of the repositories listed at
305
306
307
* sb/hashmap-customize-comparison (2017-06-30) 3 commits
302
- - hashmap: migrate documentation from Documentation/technical into header
303
- - patch-ids.c: use hashmap correctly
304
- - hashmap.h: compare function has access to a data field
308
+ (merged to 'next' on 2017-07-06 at cc420805f3)
309
+ + hashmap: migrate documentation from Documentation/technical into header
310
+ + patch-ids.c: use hashmap correctly
311
+ + hashmap.h: compare function has access to a data field
312
(this branch is used by sb/diff-color-move and sb/hashmap-cleanup.)
313
314
Update the hashmap API so that data to customize the behaviour of
315
the comparison function can be specified at the time a hashmap is
316
initialized.
317
311
- Will merge to 'next'.
312
-
313
-
314
-* sb/merge-recursive-code-cleanup (2017-06-30) 1 commit
315
- (merged to 'next' on 2017-07-05 at 4228240520)
316
- + merge-recursive: use DIFF_XDL_SET macro
317
-
318
- Code clean-up.
319
-
320
- Will merge to 'master'.
321
-
322
-
323
-* ab/strbuf-addftime-tzname-boolify (2017-07-01) 2 commits
324
- (merged to 'next' on 2017-07-05 at 81e6795eb3)
325
- + strbuf: change an always NULL/"" strbuf_addftime() param to bool
326
- + strbuf.h comment: discuss strbuf_addftime() arguments in order
327
-
328
- strbuf_addftime() is further getting tweaked.
329
-
318
Will merge to 'master'.
319
320
321
* mt/p4-parse-G-output (2017-07-05) 1 commit
334
- - git-p4: parse marshal output "p4 -G" in p4 changes
322
+ . git-p4: parse marshal output "p4 -G" in p4 changes
323
324
Use "p4 -G" to make "p4 changes" output more Python-friendly
325
to parse.
326
327
Needs review/ack from git-p4 folks.
328
+ It still seems to break when merged to 'pu'.
329
330
342
-* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit
343
- (merged to 'next' on 2017-06-30 at af23bd111b)
344
- + subtree: honour USE_ASCIIDOCTOR when set
345
-
346
- The Makefile rule in contrib/subtree for building documentation
347
- learned to honour USE_ASCIIDOCTOR just like the main documentation
348
- set does.
349
-
350
- Will merge to 'master'.
351
-
352
-
353
-* js/fsck-name-object (2017-06-28) 1 commit
354
- (merged to 'next' on 2017-06-30 at 9a08514cf2)
355
- + t1450: use egrep for regexp "alternation"
356
-
357
- Test fix.
358
-
359
- Will merge to 'master'.
360
-
361
-
362
-* jc/utf8-fprintf (2017-06-28) 1 commit
363
- (merged to 'next' on 2017-06-30 at a8cc490818)
364
- + submodule--helper: do not call utf8_fprintf() unnecessarily
331
+* rs/free-and-null (2017-06-29) 1 commit
332
+ (merged to 'next' on 2017-07-06 at 9c9e1d59a2)
333
+ + coccinelle: polish FREE_AND_NULL rules
334
335
Code cleanup.
336
337
Will merge to 'master'.
338
339
371
-* rs/free-and-null (2017-06-29) 1 commit
372
- - coccinelle: polish FREE_AND_NULL rules
373
-
374
- Code cleanup.
375
-
376
-
340
* ab/wildmatch (2017-06-23) 1 commit
378
- - wildmatch: remove unused wildopts parameter
341
+ (merged to 'next' on 2017-07-07 at 34482a9a4f)
342
+ + wildmatch: remove unused wildopts parameter
343
380
- Prepare the wildmatch API for future enhancements to allow a
381
- pattern that is repeatedly matched against many strings to be
382
- precompiled.
344
+ Minor code cleanup.
345
+
346
+ Will merge to 'master'.
347
348
349
* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
@@ -407,6 +371,8 @@ of the repositories listed at
371
"git pull --rebase --recurse-submodules" learns to rebase the
372
branch in the submodules to an updated base.
373
374
+ Will merge to 'next'.
375
+
376
377
* pw/unquote-path-in-git-pm (2017-06-30) 4 commits
378
(merged to 'next' on 2017-07-05 at 538ab4d599)
@@ -463,7 +429,7 @@ of the repositories listed at
429
430
Doc update.
431
466
- What's the status of this thing?
432
+ Will merge to 'next'.
433
434
435
* sd/branch-copy (2017-06-18) 3 commits
@@ -474,9 +440,12 @@ of the repositories listed at
440
"git branch" learned "-c/-C" to create and switch to a new branch
441
by copying an existing one.
442
477
- Has a bit of interaction with mh/packed-ref-store and bw/config-h,
478
- so perhaps needs to wait for the former to stabilize a bit more
479
- and possibly rebasing on them.
443
+ Undecided.
444
+
445
+ I personally do not think "branch --copy master backup" while on
446
+ "master" that switches to "backup" is a good UI, and I *will* say
447
+ "I told you so" when users complain after we merge this down to
448
+ 'next' and eventually to 'master'.
449
450
451
* ls/filter-process-delayed (2017-06-30) 7 commits
@@ -496,15 +465,15 @@ of the repositories listed at
465
466
467
* ab/sha1dc (2017-07-03) 2 commits
499
- - sha1collisiondetection: automatically enable when submodule is populated
500
- - sha1dc: optionally use sha1collisiondetection as a submodule
501
- (this branch uses ab/sha1dc-maint.)
468
+ (merged to 'next' on 2017-07-06 at 5a783032b7)
469
+ + sha1collisiondetection: automatically enable when submodule is populated
470
+ + sha1dc: optionally use sha1collisiondetection as a submodule
471
472
The "collission-detecting" implementation of SHA-1 hash we borrowed
473
from is replaced by directly binding the upstream project as our
474
submodule. Glitches on minority platforms are still being worked out.
475
507
- Will merge to 'next'.
476
+ Will merge to 'master'.
477
478
479
* bp/fsmonitor (2017-06-12) 6 commits
@@ -517,43 +486,45 @@ of the repositories listed at
486
487
We learned to talk to watchman to speed up "git status".
488
520
- No more comments or updates?
489
+ Expecting a reroll.
490
+ cf. <bade1166-e646-b05a-f65b-adb8da8ba0a7@gmail.com>
491
492
493
* sb/diff-color-move (2017-06-30) 26 commits
524
- - diff: document the new --color-moved setting
525
- - diff.c: add dimming to moved line detection
526
- - diff.c: color moved lines differently, plain mode
527
- - diff.c: color moved lines differently
528
- - diff.c: buffer all output if asked to
529
- - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
530
- - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
531
- - diff.c: convert word diffing to use emit_diff_symbol
532
- - diff.c: convert show_stats to use emit_diff_symbol
533
- - diff.c: convert emit_binary_diff_body to use emit_diff_symbol
534
- - submodule.c: migrate diff output to use emit_diff_symbol
535
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
536
- - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
537
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
538
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
539
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
540
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
541
- - diff.c: migrate emit_line_checked to use emit_diff_symbol
542
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
543
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
544
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER
545
- - diff.c: introduce emit_diff_symbol
546
- - diff.c: factor out diff_flush_patch_all_file_pairs
547
- - diff.c: move line ending check into emit_hunk_header
548
- - diff.c: readability fix
549
- - Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move
494
+ (merged to 'next' on 2017-07-06 at 758ed40e4f)
495
+ + diff: document the new --color-moved setting
496
+ + diff.c: add dimming to moved line detection
497
+ + diff.c: color moved lines differently, plain mode
498
+ + diff.c: color moved lines differently
499
+ + diff.c: buffer all output if asked to
500
+ + diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
501
+ + diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
502
+ + diff.c: convert word diffing to use emit_diff_symbol
503
+ + diff.c: convert show_stats to use emit_diff_symbol
504
+ + diff.c: convert emit_binary_diff_body to use emit_diff_symbol
505
+ + submodule.c: migrate diff output to use emit_diff_symbol
506
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
507
+ + diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
508
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
509
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
510
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
511
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
512
+ + diff.c: migrate emit_line_checked to use emit_diff_symbol
513
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
514
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
515
+ + diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER
516
+ + diff.c: introduce emit_diff_symbol
517
+ + diff.c: factor out diff_flush_patch_all_file_pairs
518
+ + diff.c: move line ending check into emit_hunk_header
519
+ + diff.c: readability fix
520
+ + Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move
521
(this branch uses sb/hashmap-customize-comparison; is tangled with sb/hashmap-cleanup.)
522
523
"git diff" has been taught to optionally paint new lines that are
524
the same as deleted lines elsewhere differently from genuinely new
525
lines.
526
556
- Will merge to 'next'.
527
+ Will merge to 'master'.
528
529
--------------------------------------------------
530
[Discarded]
@@ -583,12 +554,3 @@ of the repositories listed at
554
of other worktrees as the root for reachability traversal, making
555
objects that are in use only in other worktrees to be subject to
556
garbage collection.
586
-
587
-
588
-* ab/free-and-null (2017-06-28) 2 commits
589
- (merged to 'next' on 2017-06-28 at 1cf373c61a)
590
- + Revert "coccinelle: add a rule to make "expression" code use FREE_AND_NULL()"
591
- (merged to 'next' on 2017-06-28 at 1785f88122)
592
- + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
593
-
594
- The coccinelle rule for free-and-null refactoring got simplified.