What's cooking (2018/02 #01)
Junio C Hamano committed
Feb 7, 2018 at 15:11 UTC
eff6552db495fff8c7d665c78b990fdbb7b1d454
1 file changed
+520
-217
whats-cooking.txt
+520
-217
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2018, #04; Wed, 31)
3
+Subject: What's cooking in git.git (Feb 2018, #01; Wed, 7)
4
X-master-at: 5be1f00a9a701532232f57958efab4be8c959a29
5
-X-next-at: de0f0111ea2ad3a2b03a378e6272c2ee476a26ed
5
+X-next-at: fa21fb2ec8acbede1bf0ed3cca9e96e2445d38d1
6
7
-What's cooking in git.git (Jan 2018, #04; Wed, 31)
7
+What's cooking in git.git (Feb 2018, #01; Wed, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -28,188 +28,189 @@ of the repositories listed at
28
--------------------------------------------------
29
[New Topics]
30
31
-* ab/fetch-prune (2018-01-24) 11 commits
32
- - fetch: add a --fetch-prune option and fetch.pruneTags config
33
- - fetch tests: add scaffolding for the new fetch.pruneTags
34
- - git-fetch & config doc: link to the new PRUNING section
35
- - git remote doc: correct dangerous lies about what prune does
36
- - git fetch doc: add a new section to explain the ins & outs of pruning
37
- - fetch tests: test --prune and refspec interaction
38
- - fetch tests: add a tag to be deleted to the pruning tests
39
- - fetch tests: re-arrange arguments for future readability
40
- - fetch tests: refactor in preparation for testing tag pruning
41
- - fetch: stop accessing "remote" variable indirectly
42
- - fetch: don't redundantly NULL something calloc() gave us
31
+* bc/hash-algo (2018-02-02) 12 commits
32
+ - bulk-checkin: abstract SHA-1 usage
33
+ - csum-file: abstract uses of SHA-1
34
+ - csum-file: rename sha1file to hashfile
35
+ - read-cache: abstract away uses of SHA-1
36
+ - pack-write: switch various SHA-1 values to abstract forms
37
+ - pack-check: convert various uses of SHA-1 to abstract forms
38
+ - fast-import: switch various uses of SHA-1 to the_hash_algo
39
+ - sha1_file: switch uses of SHA-1 to the_hash_algo
40
+ - builtin/unpack-objects: switch uses of SHA-1 to the_hash_algo
41
+ - builtin/index-pack: improve hash function abstraction
42
+ - hash: create union for hash context allocation
43
+ - hash: move SHA-1 macros to hash.h
44
+
45
+ More abstraction of hash function from the codepath.
46
44
- Clarify how configured fetch refspecs interact with the "--prune"
45
- option of "git fetch", and also add a handy short-hand for getting
46
- rid of stale tags that are locally held.
47
+ Will merge to 'next'.
48
49
49
-* gs/retire-mru (2018-01-24) 1 commit
50
- - mru: Replace mru.[ch] with list.h implementation
51
- (this branch uses ot/mru-on-list.)
50
+* bp/untracked-cache-noflush (2018-02-05) 1 commit
51
+ - dir.c: don't flag the index as dirty for changes to the untracked cache
52
53
- Retire mru API as it does not give enough abstraction over
54
- underlying list API to be worth it.
53
+ Writing out the index file when the only thing that changed in it
54
+ is the untracked cache information is often wasteful, and this has
55
+ been optimized out.
56
56
- Will merge to 'next'.
57
+ Waiting for the discussion to finish.
58
+ cf. <CACsJy8DLP=j-h3knwX9zOpejAfUbv1YJwfB-iw4476oy0hTfxg@mail.gmail.com>
59
60
59
-* jc/mailinfo-cleanup-fix (2018-01-24) 1 commit
60
- - mailinfo: avoid segfault when can't open files
61
-
62
- Corner case bugfix.
61
+* cc/perf-aggregate (2018-02-02) 3 commits
62
+ - perf/aggregate: sort JSON fields in output
63
+ - perf/aggregate: add --reponame option
64
+ - perf/aggregate: add --subsection option
65
66
Will merge to 'next'.
67
68
67
-* po/clang-format-functype-weight (2018-01-24) 1 commit
68
- - clang-format: adjust penalty for return type line break
69
+* gs/rebase-allow-empty-message (2018-02-07) 1 commit
70
+ - rebase: add --allow-empty-message option
71
70
- Prevent "clang-format" from breaking line after function return type.
72
+ "git rebase" learned to take "--allow-empty-message" option.
73
74
Will merge to 'next'.
75
76
75
-* po/http-push-error-message (2018-01-24) 1 commit
76
- - http-push: improve error log
77
+* jc/blame-missing-path (2018-02-07) 1 commit
78
+ - blame: tighten command line parser
79
78
- Debugging aid.
80
+ "git blame HEAD COPYING" in a bare repository failed to run, while
81
+ "git blame HEAD -- COPYING" run just fine.
82
83
Will merge to 'next'.
84
85
83
-* po/object-id (2018-01-30) 12 commits
84
- - sha1_file: rename hash_sha1_file_literally
85
- - sha1_file: convert write_loose_object to object_id
86
- - sha1_file: convert force_object_loose to object_id
87
- - sha1_file: convert write_sha1_file to object_id
88
- - notes: convert write_notes_tree to object_id
89
- - notes: convert combine_notes_* to object_id
90
- - commit: convert commit_tree* to object_id
91
- - match-trees: convert splice_tree to object_id
92
- - cache: clear whole hash buffer with oidclr
93
- - sha1_file: convert hash_sha1_file to object_id
94
- - dir: convert struct sha1_stat to use object_id
95
- - sha1_file: convert pretend_sha1_file to object_id
86
+* jt/binsearch-with-fanout (2018-02-02) 2 commits
87
+ - packfile: refactor hash search with fanout table
88
+ - packfile: remove GIT_DEBUG_LOOKUP log statements
89
97
- Conversion from uchar[20] to struct object_id continues.
90
+ Refactor the code to binary search starting from a fan-out table
91
+ (which is how the packfile is indexed with object names) into a
92
+ reusable helper.
93
94
+ Will merge to 'next'.
95
100
-* sg/travis-linux32-sanity (2018-01-30) 5 commits
101
- - travis-ci: don't fail if user already exists on 32 bit Linux build job
102
- - travis-ci: don't run the test suite as root in the 32 bit Linux build
103
- - travis-ci: don't repeat the path of the cache directory
104
- - travis-ci: use 'set -e' in the 32 bit Linux build job
105
- - travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build
96
107
- Will merge to 'next'.
97
+* lw/daemon-log-destination (2018-02-05) 1 commit
98
+ - daemon: add --log-destination=(stderr|syslog|none)
99
100
+ The log from "git daemon" can be redirected with a new option; one
101
+ relevant use case is to send the log to standard error (instead of
102
+ syslog) when running it from inetd.
103
110
-* jk/daemon-fixes (2018-01-25) 6 commits
111
- - daemon: fix length computation in newline stripping
112
- - t/lib-git-daemon: add network-protocol helpers
113
- - daemon: handle NULs in extended attribute string
114
- - daemon: fix off-by-one in logging extended attributes
115
- - t/lib-git-daemon: record daemon log
116
- - t5570: use ls-remote instead of clone for interp tests
104
+ Will merge to 'next'.
105
106
119
-* jt/long-running-process-doc (2018-01-25) 1 commit
120
- - Docs: split out long-running subprocess handshake
107
+* nd/diff-stat-with-summary (2018-02-02) 2 commits
108
+ - diff: add --stat-with-summary
109
+ - diff.c: refactor pprint_rename() to use strbuf
110
111
+ Waiting for the discussion to finish.
112
123
-* nd/format-patch-stat-width (2018-01-25) 2 commits
124
- - format-patch: reduce patch diffstat width to 72
125
- - format-patch: keep cover-letter diffstat wrapped in 72 columns
113
114
+* nd/parseopt-completion (2018-02-07) 42 commits
115
+ - SQUASH???
116
+ - completion: use __gitcomp_builtin in _git_worktree
117
+ - completion: use __gitcomp_builtin in _git_tag
118
+ - completion: use __gitcomp_builtin in _git_status
119
+ - completion: use __gitcomp_builtin in _git_show_branch
120
+ - completion: use __gitcomp_builtin in _git_rm
121
+ - completion: use __gitcomp_builtin in _git_revert
122
+ - completion: use __gitcomp_builtin in _git_reset
123
+ - completion: use __gitcomp_builtin in _git_replace
124
+ - remote: force completing --mirror= instead of --mirror
125
+ - completion: use __gitcomp_builtin in _git_remote
126
+ - completion: use __gitcomp_builtin in _git_push
127
+ - completion: use __gitcomp_builtin in _git_pull
128
+ - completion: use __gitcomp_builtin in _git_notes
129
+ - completion: use __gitcomp_builtin in _git_name_rev
130
+ - completion: use __gitcomp_builtin in _git_mv
131
+ - completion: use __gitcomp_builtin in _git_merge_base
132
+ - completion: use __gitcomp_builtin in _git_merge
133
+ - completion: use __gitcomp_builtin in _git_ls_remote
134
+ - completion: use __gitcomp_builtin in _git_ls_files
135
+ - completion: use __gitcomp_builtin in _git_init
136
+ - completion: use __gitcomp_builtin in _git_help
137
+ - completion: use __gitcomp_builtin in _git_grep
138
+ - completion: use __gitcomp_builtin in _git_gc
139
+ - completion: use __gitcomp_builtin in _git_fsck
140
+ - completion: use __gitcomp_builtin in _git_fetch
141
+ - completion: use __gitcomp_builtin in _git_difftool
142
+ - completion: use __gitcomp_builtin in _git_describe
143
+ - completion: use __gitcomp_builtin in _git_config
144
+ - completion: use __gitcomp_builtin in _git_commit
145
+ - completion: use __gitcomp_builtin in _git_clone
146
+ - completion: use __gitcomp_builtin in _git_clean
147
+ - completion: use __gitcomp_builtin in _git_cherry_pick
148
+ - completion: use __gitcomp_builtin in _git_checkout
149
+ - completion: use __gitcomp_builtin in _git_branch
150
+ - completion: use __gitcomp_builtin in _git_apply
151
+ - completion: use __gitcomp_builtin in _git_am
152
+ - completion: use __gitcomp_builtin in _git_add
153
+ - git-completion.bash: introduce __gitcomp_builtin
154
+ - parse-options: let OPT__FORCE take optional flags argument
155
+ - parse-options: add OPT_xxx_F() variants
156
+ - parse-options: support --git-completion-helper
157
+
158
+
159
+* nd/trace-index-ops (2018-02-02) 1 commit
160
+ - trace: measure where the time is spent in the index-heavy operations
161
128
-* nd/list-merge-strategy (2018-01-26) 1 commit
129
- - completion: fix completing merge strategies on non-C locales
162
+ Will merge to 'next'.
163
164
132
-* sb/pull-rebase-submodule (2018-01-25) 1 commit
133
- - builtin/pull: respect verbosity settings in submodules
165
+* pc/submodule-helper-foreach (2018-02-02) 5 commits
166
+ - submodule: port submodule subcommand 'foreach' from shell to C
167
+ - submodule foreach: document variable '$displaypath'
168
+ - submodule foreach: clarify the '$toplevel' variable documentation
169
+ - submodule foreach: document '$sm_path' instead of '$path'
170
+ - submodule foreach: correct '$path' in nested submodules from a subdirectory
171
172
+ Waiting for the discussion to finish.
173
+ cf. <20180206150044.1bffbb573c088d38c8e44bf5@google.com>
174
136
-* sg/test-i18ngrep (2018-01-26) 10 commits
137
- - t: make 'test_i18ngrep' more informative on failure
138
- - t: make sure that 'test_i18ngrep' got enough parameters
139
- - t: forbid piping into 'test_i18ngrep'
140
- - t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'
141
- - t5536: let 'test_i18ngrep' read the file without redirection
142
- - t5510: consolidate 'grep' and 'test_i18ngrep' patterns
143
- - t4001: don't run 'git status' upstream of a pipe
144
- - t6022: don't run 'git merge' upstream of a pipe
145
- - t5812: add 'test_i18ngrep's missing filename parameter
146
- - t5541: add 'test_i18ngrep's missing filename parameter
175
176
+* rs/cocci-strbuf-addf-to-addstr (2018-02-02) 1 commit
177
+ - cocci: simplify check for trivial format strings
178
149
-* bw/c-plus-plus (2018-01-30) 37 commits
150
- - replace: rename 'new' variables
151
- - trailer: rename 'template' variables
152
- - tempfile: rename 'template' variables
153
- - wrapper: rename 'template' variables
154
- - environment: rename 'namespace' variables
155
- - diff: rename 'template' variables
156
- - environment: rename 'template' variables
157
- - init-db: rename 'template' variables
158
- - unpack-trees: rename 'new' variables
159
- - trailer: rename 'new' variables
160
- - submodule: rename 'new' variables
161
- - split-index: rename 'new' variables
162
- - remote: rename 'new' variables
163
- - ref-filter: rename 'new' variables
164
- - read-cache: rename 'new' variables
165
- - line-log: rename 'new' variables
166
- - imap-send: rename 'new' variables
167
- - http: rename 'new' variables
168
- - entry: rename 'new' variables
169
- - diffcore-delta: rename 'new' variables
170
- - diff: rename 'new' variables
171
- - diff-lib: rename 'new' variable
172
- - commit: rename 'new' variables
173
- - combine-diff: rename 'new' variables
174
- - remote: rename 'new' variables
175
- - reflog: rename 'new' variables
176
- - pack-redundant: rename 'new' variables
177
- - help: rename 'new' variables
178
- - checkout: rename 'new' variables
179
- - apply: rename 'new' variables
180
- - apply: rename 'try' variables
181
- - diff: rename 'this' variables
182
- - rev-parse: rename 'this' variable
183
- - pack-objects: rename 'this' variables
184
- - blame: rename 'this' variables
185
- - object: rename function 'typename' to 'type_name'
186
- - object_info: change member name from 'typename' to 'type_name'
179
+ Will merge to 'next'.
180
181
189
-* ew/svn-branch-segfault-fix (2018-01-30) 1 commit
190
- - git-svn: control destruction order to avoid segfault
182
+* tg/reset-hard-show-head-with-pretty (2018-02-02) 1 commit
183
+ - reset --hard: make use of the pretty machinery
184
192
- Workaround for segfault with more recent versions of SVN.
185
+ The way "git reset --hard" reports the commit the updated HEAD
186
+ points at is made consistent with the way how the commit title is
187
+ generated by the other parts of the system. This matters when the
188
+ title is spread across physically multiple lines.
189
190
Will merge to 'next'.
191
192
197
-* tz/doc-show-defaults-to-head (2018-01-30) 1 commit
198
- - doc: mention 'git show' defaults to HEAD
193
+* tg/worktree-add-existing-branch (2018-02-05) 3 commits
194
+ - worktree: teach "add" to check out existing branches
195
+ - worktree: be clearer when "add" dwim-ery kicks in
196
+ - worktree: improve message when creating a new worktree
197
200
- Doc update.
198
+ "git worktree add" learned to check out an existing branch.
199
202
- Will merge to 'next'.
200
+ Expecting a reroll.
201
+ cf. <CAPig+cRLohiqR_Drh7P0q3XbvC22WLjNwH0YLZo3dqFzZZuAPw@mail.gmail.com>
202
+ cf. <CACsJy8BEKYqW+Ne_WY2RBaSbb9OKcjREtrawStj=eJsVsia_Jw@mail.gmail.com>
203
+ The general idea is good, just end-user facing messages are found
204
+ suboptimal.
205
206
205
-* nd/ignore-glob-doc-update (2018-01-31) 1 commit
206
- - gitignore.txt: elaborate shell glob syntax
207
+* nm/tag-edit (2018-02-07) 1 commit
208
+ - tag: add --edit option
209
210
209
-* nd/rebase-show-current-patch (2018-01-31) 3 commits
210
- - rebase: introduce and use pseudo-ref ORIG_COMMIT
211
- - rebase: add --show-current-patch
212
- - am: add --show-current-patch
211
+* sm/mv-dry-run-update (2018-02-07) 2 commits
212
+ - mv: remove unneeded 'if (!show_only)'
213
+ - t7001: add test case for --dry-run
214
215
--------------------------------------------------
216
[Stalled]
@@ -353,6 +354,265 @@ of the repositories listed at
354
--------------------------------------------------
355
[Cooking]
356
357
+* ab/fetch-prune (2018-01-24) 11 commits
358
+ - fetch: add a --fetch-prune option and fetch.pruneTags config
359
+ - fetch tests: add scaffolding for the new fetch.pruneTags
360
+ - git-fetch & config doc: link to the new PRUNING section
361
+ - git remote doc: correct dangerous lies about what prune does
362
+ - git fetch doc: add a new section to explain the ins & outs of pruning
363
+ - fetch tests: test --prune and refspec interaction
364
+ - fetch tests: add a tag to be deleted to the pruning tests
365
+ - fetch tests: re-arrange arguments for future readability
366
+ - fetch tests: refactor in preparation for testing tag pruning
367
+ - fetch: stop accessing "remote" variable indirectly
368
+ - fetch: don't redundantly NULL something calloc() gave us
369
+
370
+ Clarify how configured fetch refspecs interact with the "--prune"
371
+ option of "git fetch", and also add a handy short-hand for getting
372
+ rid of stale tags that are locally held.
373
+
374
+ Expecting a reroll.
375
+ cf. <87h8quytmq.fsf@evledraar.gmail.com>
376
+
377
+
378
+* gs/retire-mru (2018-01-24) 1 commit
379
+ (merged to 'next' on 2018-02-07 at 4b2e893911)
380
+ + mru: Replace mru.[ch] with list.h implementation
381
+ (this branch uses ot/mru-on-list.)
382
+
383
+ Retire mru API as it does not give enough abstraction over
384
+ underlying list API to be worth it.
385
+
386
+ Will merge to 'master'.
387
+
388
+
389
+* ot/mru-on-list (2017-10-01) 1 commit
390
+ (merged to 'next' on 2018-02-07 at ee1ee4ac79)
391
+ + mru: use double-linked list from list.h
392
+ (this branch is used by gs/retire-mru.)
393
+
394
+ The first step to getting rid of mru API and using the
395
+ doubly-linked list API directly instead.
396
+
397
+ Will merge to 'master'.
398
+
399
+
400
+* jc/mailinfo-cleanup-fix (2018-01-24) 1 commit
401
+ (merged to 'next' on 2018-02-07 at 65d41f993b)
402
+ + mailinfo: avoid segfault when can't open files
403
+
404
+ Corner case bugfix.
405
+
406
+ Will merge to 'master'.
407
+
408
+
409
+* po/clang-format-functype-weight (2018-01-24) 1 commit
410
+ (merged to 'next' on 2018-02-07 at 0724aaae38)
411
+ + clang-format: adjust penalty for return type line break
412
+
413
+ Prevent "clang-format" from breaking line after function return type.
414
+
415
+ Will merge to 'master'.
416
+
417
+
418
+* po/http-push-error-message (2018-01-24) 1 commit
419
+ (merged to 'next' on 2018-02-07 at 3dccd32857)
420
+ + http-push: improve error log
421
+
422
+ Debugging aid.
423
+
424
+ Will merge to 'master'.
425
+
426
+
427
+* po/object-id (2018-01-30) 12 commits
428
+ - sha1_file: rename hash_sha1_file_literally
429
+ - sha1_file: convert write_loose_object to object_id
430
+ - sha1_file: convert force_object_loose to object_id
431
+ - sha1_file: convert write_sha1_file to object_id
432
+ - notes: convert write_notes_tree to object_id
433
+ - notes: convert combine_notes_* to object_id
434
+ - commit: convert commit_tree* to object_id
435
+ - match-trees: convert splice_tree to object_id
436
+ - cache: clear whole hash buffer with oidclr
437
+ - sha1_file: convert hash_sha1_file to object_id
438
+ - dir: convert struct sha1_stat to use object_id
439
+ - sha1_file: convert pretend_sha1_file to object_id
440
+
441
+ Conversion from uchar[20] to struct object_id continues.
442
+
443
+ Will merge to 'next'.
444
+
445
+
446
+* sg/travis-linux32-sanity (2018-01-30) 5 commits
447
+ (merged to 'next' on 2018-02-07 at 0349cf505c)
448
+ + travis-ci: don't fail if user already exists on 32 bit Linux build job
449
+ + travis-ci: don't run the test suite as root in the 32 bit Linux build
450
+ + travis-ci: don't repeat the path of the cache directory
451
+ + travis-ci: use 'set -e' in the 32 bit Linux build job
452
+ + travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build
453
+
454
+ Travis updates.
455
+
456
+ Will merge to 'master'.
457
+
458
+
459
+* jk/daemon-fixes (2018-01-25) 6 commits
460
+ (merged to 'next' on 2018-02-07 at 0e4fe8f8cc)
461
+ + daemon: fix length computation in newline stripping
462
+ + t/lib-git-daemon: add network-protocol helpers
463
+ + daemon: handle NULs in extended attribute string
464
+ + daemon: fix off-by-one in logging extended attributes
465
+ + t/lib-git-daemon: record daemon log
466
+ + t5570: use ls-remote instead of clone for interp tests
467
+
468
+ Assorted fixes to "git daemon".
469
+
470
+ Will merge to 'master'.
471
+
472
+
473
+* jt/long-running-process-doc (2018-01-25) 1 commit
474
+ (merged to 'next' on 2018-02-07 at 8bbb42ad3c)
475
+ + Docs: split out long-running subprocess handshake
476
+
477
+ Doc updates.
478
+
479
+ Will merge to 'master'.
480
+
481
+
482
+* nd/format-patch-stat-width (2018-02-02) 2 commits
483
+ - format-patch: reduce patch diffstat width to 72
484
+ - format-patch: keep cover-letter diffstat wrapped in 72 columns
485
+
486
+ "git format-patch" learned to give 72-cols to diffstat, which is
487
+ consistent with other line length limits the subcommand uses for
488
+ its output meant for e-mails.
489
+
490
+ Will merge to 'next'.
491
+
492
+
493
+* nd/list-merge-strategy (2018-01-26) 1 commit
494
+ (merged to 'next' on 2018-02-07 at a75d04a675)
495
+ + completion: fix completing merge strategies on non-C locales
496
+
497
+ Completion of "git merge -s<strategy>" (in contrib/) did not work
498
+ well in non-C locale.
499
+
500
+ Will merge to 'master'.
501
+
502
+
503
+* sb/pull-rebase-submodule (2018-01-25) 1 commit
504
+ - builtin/pull: respect verbosity settings in submodules
505
+
506
+ Will merge to 'next'.
507
+
508
+
509
+* sg/test-i18ngrep (2018-01-26) 10 commits
510
+ - t: make 'test_i18ngrep' more informative on failure
511
+ - t: make sure that 'test_i18ngrep' got enough parameters
512
+ - t: forbid piping into 'test_i18ngrep'
513
+ - t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'
514
+ - t5536: let 'test_i18ngrep' read the file without redirection
515
+ - t5510: consolidate 'grep' and 'test_i18ngrep' patterns
516
+ - t4001: don't run 'git status' upstream of a pipe
517
+ - t6022: don't run 'git merge' upstream of a pipe
518
+ - t5812: add 'test_i18ngrep's missing filename parameter
519
+ - t5541: add 'test_i18ngrep's missing filename parameter
520
+
521
+ Test fixes.
522
+
523
+ Expecting a reroll.
524
+ cf. <CAM0VKjkf=51i1YPqdNm=pyPHaNNguXLu0T1iHDYv28jW92QTow@mail.gmail.com>
525
+
526
+
527
+* bw/c-plus-plus (2018-01-30) 37 commits
528
+ - replace: rename 'new' variables
529
+ - trailer: rename 'template' variables
530
+ - tempfile: rename 'template' variables
531
+ - wrapper: rename 'template' variables
532
+ - environment: rename 'namespace' variables
533
+ - diff: rename 'template' variables
534
+ - environment: rename 'template' variables
535
+ - init-db: rename 'template' variables
536
+ - unpack-trees: rename 'new' variables
537
+ - trailer: rename 'new' variables
538
+ - submodule: rename 'new' variables
539
+ - split-index: rename 'new' variables
540
+ - remote: rename 'new' variables
541
+ - ref-filter: rename 'new' variables
542
+ - read-cache: rename 'new' variables
543
+ - line-log: rename 'new' variables
544
+ - imap-send: rename 'new' variables
545
+ - http: rename 'new' variables
546
+ - entry: rename 'new' variables
547
+ - diffcore-delta: rename 'new' variables
548
+ - diff: rename 'new' variables
549
+ - diff-lib: rename 'new' variable
550
+ - commit: rename 'new' variables
551
+ - combine-diff: rename 'new' variables
552
+ - remote: rename 'new' variables
553
+ - reflog: rename 'new' variables
554
+ - pack-redundant: rename 'new' variables
555
+ - help: rename 'new' variables
556
+ - checkout: rename 'new' variables
557
+ - apply: rename 'new' variables
558
+ - apply: rename 'try' variables
559
+ - diff: rename 'this' variables
560
+ - rev-parse: rename 'this' variable
561
+ - pack-objects: rename 'this' variables
562
+ - blame: rename 'this' variables
563
+ - object: rename function 'typename' to 'type_name'
564
+ - object_info: change member name from 'typename' to 'type_name'
565
+
566
+ I do not mind refraining from using these keywords in a foreign
567
+ language in our codebase too much, but at the same time, renaming
568
+ must be done a bit more thoughtfully. When the original uses 'new'
569
+ together with and in contrast to 'old', renaming 'new' must be done
570
+ while preserving the pairing (which may involve renaming 'old' as
571
+ well), for example.
572
+
573
+ Backburnered, i.e. will drop if other topics start to conflict with
574
+ it, but will accept rerolls.
575
+
576
+
577
+* ew/svn-branch-segfault-fix (2018-01-30) 1 commit
578
+ (merged to 'next' on 2018-02-07 at 1bf8d8f74f)
579
+ + git-svn: control destruction order to avoid segfault
580
+
581
+ Workaround for segfault with more recent versions of SVN.
582
+
583
+ Will merge to 'master'.
584
+
585
+
586
+* tz/doc-show-defaults-to-head (2018-01-30) 1 commit
587
+ (merged to 'next' on 2018-02-07 at fa21fb2ec8)
588
+ + doc: mention 'git show' defaults to HEAD
589
+
590
+ Doc update.
591
+
592
+ Will merge to 'master'.
593
+
594
+
595
+* nd/ignore-glob-doc-update (2018-02-02) 1 commit
596
+ - gitignore.txt: elaborate shell glob syntax
597
+
598
+ Doc update.
599
+
600
+ Will merge to 'next'.
601
+
602
+
603
+* nd/rebase-show-current-patch (2018-01-31) 3 commits
604
+ - rebase: introduce and use pseudo-ref ORIG_COMMIT
605
+ - rebase: add --show-current-patch
606
+ - am: add --show-current-patch
607
+
608
+ The new "--show-current-patch" option gives an end-user facing way
609
+ to get the diff being applied when "git rebase" (and "git am")
610
+ stops with a conflict.
611
+
612
+ Expecting a reroll.
613
+ cf. <CACsJy8D8PaDR0r+6AKMgPo9UBcWYQC8goaVkVhxMCXCa1E9F9A@mail.gmail.com>
614
+
615
+
616
* jh/status-no-ahead-behind (2018-01-24) 4 commits
617
- status: support --no-ahead-behind in long format
618
- status: update short status to respect --no-ahead-behind
@@ -363,6 +623,8 @@ of the repositories listed at
623
between the current branch and its upstream, which can now be
624
disabled with "--no-ahead-behind" option.
625
626
+ At v5; is this ready for 'next'?
627
+
628
629
* nd/worktree-move (2018-01-24) 7 commits
630
- worktree remove: allow it when $GIT_WORK_TREE is already gone
@@ -375,28 +637,33 @@ of the repositories listed at
637
638
"git worktree" learned move and remove subcommands.
639
640
+ Expecting a reroll.
641
+ cf. <20180124095357.19645-1-pclouds@gmail.com>
642
+
643
644
* nd/trace-with-env (2018-01-19) 7 commits
380
- - run-command.c: print new cwd in trace_run_command()
381
- - run-command.c: print env vars in trace_run_command()
382
- - run-command.c: print program 'git' when tracing git_cmd mode
383
- - run-command.c: introduce trace_run_command()
384
- - trace.c: move strbuf_release() out of print_trace_line()
385
- - trace: avoid unnecessary quoting
386
- - sq_quote_argv: drop maxlen parameter
645
+ (merged to 'next' on 2018-02-07 at 68399411d9)
646
+ + run-command.c: print new cwd in trace_run_command()
647
+ + run-command.c: print env vars in trace_run_command()
648
+ + run-command.c: print program 'git' when tracing git_cmd mode
649
+ + run-command.c: introduce trace_run_command()
650
+ + trace.c: move strbuf_release() out of print_trace_line()
651
+ + trace: avoid unnecessary quoting
652
+ + sq_quote_argv: drop maxlen parameter
653
654
The tracing machinery learned to report tweaking of environment
655
variables as well.
656
391
- Will merge to 'next'.
657
+ Will merge to 'master'.
658
659
660
* cl/t9001-cleanup (2018-01-12) 1 commit
395
- - t9001: use existing helper in send-email test
661
+ (merged to 'next' on 2018-02-07 at 9b194a9999)
662
+ + t9001: use existing helper in send-email test
663
664
Test clean-up.
665
399
- Will merge to 'next'.
666
+ Will merge to 'master'.
667
668
669
* kg/packed-ref-cache-fix (2018-01-24) 6 commits
@@ -410,65 +677,78 @@ of the repositories listed at
677
Avoid mmapping small files while using packed refs (especially ones
678
with zero size, which would cause later munmap() to fail).
679
680
+ Will merge to 'next'.
681
+ A change to a binsearch loop to work around picky complers was
682
+ unnecessarily hard to reason about, but it should do.
683
+
684
685
* ks/submodule-doc-updates (2018-01-16) 2 commits
415
- - Doc/git-submodule: improve readability and grammar of a sentence
416
- - Doc/gitsubmodules: make some changes to improve readability and syntax
686
+ (merged to 'next' on 2018-02-07 at aff2fa1650)
687
+ + Doc/git-submodule: improve readability and grammar of a sentence
688
+ + Doc/gitsubmodules: make some changes to improve readability and syntax
689
690
Doc updates.
691
420
- Will merge to 'next'.
692
+ Will merge to 'master'.
693
694
695
* nd/shared-index-fix (2018-01-24) 3 commits
424
- - read-cache: don't write index twice if we can't write shared index
425
- - read-cache.c: move tempfile creation/cleanup out of write_shared_index
426
- - read-cache.c: change type of "temp" in write_shared_index()
696
+ (merged to 'next' on 2018-02-07 at c5d6e68c91)
697
+ + read-cache: don't write index twice if we can't write shared index
698
+ + read-cache.c: move tempfile creation/cleanup out of write_shared_index
699
+ + read-cache.c: change type of "temp" in write_shared_index()
700
428
- Will merge to 'next'.
701
+ Code clean-up.
702
+
703
+ Will merge to 'master'.
704
705
706
* rs/describe-unique-abbrev (2018-01-16) 1 commit
432
- - describe: use strbuf_add_unique_abbrev() for adding short hashes
707
+ (merged to 'next' on 2018-02-07 at b5383e2d05)
708
+ + describe: use strbuf_add_unique_abbrev() for adding short hashes
709
710
Code clean-up.
711
436
- Will merge to 'next'.
712
+ Will merge to 'master'.
713
714
715
* tb/crlf-conv-flags (2018-01-16) 1 commit
440
- - convert_to_git(): safe_crlf/checksafe becomes int conv_flags
716
+ (merged to 'next' on 2018-02-07 at 1981be1b46)
717
+ + convert_to_git(): safe_crlf/checksafe becomes int conv_flags
718
(this branch is used by ls/checkout-encoding.)
719
720
Code clean-up.
721
445
- Will merge to 'next'.
722
+ Will merge to 'master'.
723
724
725
* nd/diff-flush-before-warning (2018-01-16) 1 commit
449
- - diff.c: flush stdout before printing rename warnings
726
+ (merged to 'next' on 2018-02-07 at 9c67f58ae0)
727
+ + diff.c: flush stdout before printing rename warnings
728
729
Avoid showing a warning message in the middle of a line of "git
730
diff" output.
731
454
- Will merge to 'next'.
732
+ Will merge to 'master'.
733
734
735
* rb/hashmap-h-compilation-fix (2018-01-16) 1 commit
458
- - hashmap.h: remove unused variable
736
+ (merged to 'next' on 2018-02-07 at 780bc6d06b)
737
+ + hashmap.h: remove unused variable
738
739
Code clean-up.
740
462
- Will merge to 'next'.
741
+ Will merge to 'master'.
742
743
744
* cc/sha1-file-name (2018-01-19) 2 commits
466
- - sha1_file: improve sha1_file_name() perfs
467
- - sha1_file: remove static strbuf from sha1_file_name()
745
+ (merged to 'next' on 2018-02-07 at a50b171a84)
746
+ + sha1_file: improve sha1_file_name() perfs
747
+ + sha1_file: remove static strbuf from sha1_file_name()
748
749
Code clean-up.
750
471
- Will merge to 'next'.
751
+ Will merge to 'master'.
752
753
754
* cl/send-email-reply-to (2018-01-17) 2 commits
@@ -482,11 +762,12 @@ of the repositories listed at
762
763
764
* ds/use-get-be64 (2018-01-19) 1 commit
485
- - packfile: use get_be64() for large offsets
765
+ (merged to 'next' on 2018-02-07 at 6d6d5ba71d)
766
+ + packfile: use get_be64() for large offsets
767
768
Code clean-up.
769
489
- Will merge to 'next'.
770
+ Will merge to 'master'.
771
772
773
* en/merge-recursive-fixes (2018-01-19) 3 commits
@@ -495,10 +776,16 @@ of the repositories listed at
776
- Tighten and correct a few testcases for merging and cherry-picking
777
(this branch is used by en/rename-directory-detection.)
778
779
+ Will merge to 'next'.
780
+
781
782
* jc/worktree-add-short-help (2018-01-17) 1 commit
783
- worktree: say that "add" takes an arbitrary commit in short-help
784
785
+ Error message fix.
786
+
787
+ Will merge to 'next'.
788
+
789
790
* js/rebase-recreate-merge (2018-01-30) 10 commits
791
- rebase -i: introduce --recreate-merges=[no-]rebase-cousins
@@ -515,56 +802,69 @@ of the repositories listed at
802
"git rebase" learned "--recreate-merges" to transplant the whole
803
topology of commit graph elsewhere.
804
805
+ Not learning anything other than the parent info from an existing
806
+ merge was found unsatisfactory by some. It is something that can
807
+ be fixed incrementally without breaking end-user experience, I
808
+ would think, by doing the same cherry-pick 3-way merge.
809
+ cf. <87k1vpqq85.fsf@javad.com>
810
+
811
812
* jt/http-redact-cookies (2018-01-19) 2 commits
520
- - http: support omitting data from traces
521
- - http: support cookie redaction when tracing
813
+ (merged to 'next' on 2018-02-07 at a8c3416a7d)
814
+ + http: support omitting data from traces
815
+ + http: support cookie redaction when tracing
816
817
The http tracing code, often used to debug connection issues,
818
learned to redact potentially sensitive information from its output
819
so that it can be more safely sharable.
820
527
- Will merge to 'next'.
821
+ Will merge to 'master'.
822
823
824
* mr/packed-ref-store-fix (2018-01-19) 1 commit
531
- - files_initial_transaction_commit(): only unlock if locked
825
+ (merged to 'next' on 2018-02-07 at 17d32e99da)
826
+ + files_initial_transaction_commit(): only unlock if locked
827
828
Crash fix for a corner case where an error codepath tried to unlock
829
what it did not acquire lock on.
830
536
- Will merge to 'next'.
831
+ Will merge to 'master'.
832
833
834
* rs/strbuf-cocci-workaround (2018-01-19) 1 commit
540
- - cocci: use format keyword instead of a literal string
835
+ (merged to 'next' on 2018-02-07 at 73a2c4c769)
836
+ + cocci: use format keyword instead of a literal string
837
838
Update Coccinelle rules to catch and optimize strbuf_addf(&buf, "%s", str)
839
544
- Will merge to 'next'.
840
+ Will merge to 'master'.
841
842
843
* sg/cocci-move-array (2018-01-22) 1 commit
548
- - Use MOVE_ARRAY
844
+ (merged to 'next' on 2018-02-07 at 6ced765979)
845
+ + Use MOVE_ARRAY
846
847
Code clean-up.
848
552
- Will merge to 'next'.
849
+ Will merge to 'master'.
850
851
852
* tg/split-index-fixes (2018-01-19) 3 commits
556
- - travis: run tests with GIT_TEST_SPLIT_INDEX
557
- - split-index: don't write cache tree with null oid entries
558
- - read-cache: fix reading the shared index for other repos
853
+ (merged to 'next' on 2018-02-07 at 52d7a92ec5)
854
+ + travis: run tests with GIT_TEST_SPLIT_INDEX
855
+ + split-index: don't write cache tree with null oid entries
856
+ + read-cache: fix reading the shared index for other repos
857
858
The split-index mode had a few corner case bugs fixed.
859
562
- Will merge to 'next'.
860
+ Will merge to 'master'.
861
862
863
* jt/fsck-code-cleanup (2018-01-23) 1 commit
864
- fsck: fix leak when traversing trees
865
866
+ Will merge to 'next'.
867
+
868
869
* ab/wildmatch-tests (2018-01-30) 10 commits
870
- wildmatch test: mark test as EXPENSIVE_ON_WINDOWS
@@ -580,17 +880,24 @@ of the repositories listed at
880
881
More tests for wildmatch functions.
882
583
- Expecting an update.
584
- cf. <87vaga9mgf.fsf@evledraar.gmail.com>
883
+ Will merge to 'next'.
884
885
587
-* bw/protocol-v2 (2018-01-26) 27 commits
886
+* bw/protocol-v2 (2018-02-07) 35 commits
887
+ - remote-curl: don't request v2 when pushing
888
- remote-curl: implement stateless-connect command
889
+ - http: don't always add Git-Protocol header
890
+ - http: allow providing extra headers for http requests
891
+ - remote-curl: store the protocol version the server responded with
892
- remote-curl: create copy of the service name
893
- pkt-line: add packet_buf_write_len function
894
- transport-helper: introduce stateless-connect
895
- transport-helper: refactor process_connect_service
896
- transport-helper: remove name parameter
897
+ - connect: don't request v2 when pushing
898
+ - connect: refactor git_connect to only get the protocol version once
899
+ - fetch-pack: support shallow requests
900
+ - upload-pack: support shallow requests
901
- fetch-pack: perform a fetch using v2
902
- upload-pack: introduce fetch server command
903
- push: pass ref patterns when pushing
@@ -631,12 +938,13 @@ of the repositories listed at
938
939
940
* pc/submodule-helper (2018-01-16) 2 commits
634
- - submodule: port submodule subcommand 'deinit' from shell to C
635
- - submodule: port submodule subcommand 'sync' from shell to C
941
+ (merged to 'next' on 2018-02-07 at 53b4524eca)
942
+ + submodule: port submodule subcommand 'deinit' from shell to C
943
+ + submodule: port submodule subcommand 'sync' from shell to C
944
945
Rewrite two more "git submodule" subcommands in C.
946
639
- Will merge to 'next'.
947
+ Will merge to 'master'.
948
949
950
* sb/blame-color (2018-01-08) 4 commits
@@ -645,6 +953,10 @@ of the repositories listed at
953
- builtin/blame: dim uninteresting metadata
954
- color.h: document and modernize header
955
956
+ Expecting a reroll.
957
+ cf. https://public-inbox.org/git/20171110011002.10179-1-sbeller@google.com/#t
958
+ error messages are funny, can segfault, ...
959
+
960
961
* sg/travis-build-during-script-phase (2018-01-08) 1 commit
962
- travis-ci: build Git during the 'script' phase
@@ -653,9 +965,9 @@ of the repositories listed at
965
cf. <5DE3FA05-2347-4BE7-8A1A-A6E5FEEC7C2B@gmail.com>
966
967
656
-* nd/fix-untracked-cache-invalidation (2018-01-24) 5 commits
968
+* nd/fix-untracked-cache-invalidation (2018-02-07) 5 commits
969
+ - dir.c: ignore paths containing .git when invalidating untracked cache
970
- dir.c: stop ignoring opendir() error in open_cached_dir()
658
- - update-index doc: note a fixed bug in the untracked cache
971
- dir.c: fix missing dir invalidation in untracked code
972
- dir.c: avoid stat() in valid_cached_dir()
973
- status: add a failing test showing a core.untrackedCache bug
@@ -670,11 +982,12 @@ of the repositories listed at
982
983
Code refactoring.
984
673
- Undecided.
985
+ Undecided but inclined to drop. A "refactor" without the code that
986
+ benefit from the refactoring is hard to tell from code churn whose
987
+ only effect is potential to introduce bugs.
988
989
676
-* ab/sha1dc-build (2017-12-12) 4 commits
677
- . Makefile: use the sha1collisiondetection submodule by default
990
+* ab/sha1dc-build (2017-12-08) 3 commits
991
- sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
992
- Makefile: under "make dist", include the sha1collisiondetection submodule
993
- Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
@@ -682,8 +995,7 @@ of the repositories listed at
995
Push the submodule version of collision-detecting SHA-1 hash
996
implementation a bit harder on builders.
997
685
- The earlier two may make sense, but leaning toward rejecting the last step.
686
- cf. <xmqqk1xw6c24.fsf@gitster.mtv.corp.google.com>
998
+ Will merge to 'next'.
999
1000
1001
* ab/simplify-perl-makefile (2018-01-03) 3 commits
@@ -697,7 +1009,7 @@ of the repositories listed at
1009
The build procedure for perl/ part has been greatly simplified by
1010
weaning ourselves off of MakeMaker.
1011
700
- Will cook in 'next'.
1012
+ Will merge to 'master'.
1013
1014
1015
* en/rename-directory-detection (2018-01-31) 31 commits
@@ -742,20 +1054,21 @@ of the repositories listed at
1054
1055
1056
* pw/sequencer-in-process-commit (2018-01-24) 14 commits
745
- - sequencer: run 'prepare-commit-msg' hook
746
- - t7505: add tests for cherry-pick and rebase -i/-p
747
- - t7505: style fixes
748
- - sequencer: assign only free()able strings to gpg_sign
749
- - sequencer: improve config handling
750
- - t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
751
- - sequencer: try to commit without forking 'git commit'
752
- - sequencer: load commit related config
753
- - sequencer: simplify adding Signed-off-by: trailer
754
- - commit: move print_commit_summary() to libgit
755
- - commit: move post-rewrite code to libgit
756
- - Add a function to update HEAD after creating a commit
757
- - commit: move empty message checks to libgit
758
- - t3404: check intermediate squash messages
1057
+ (merged to 'next' on 2018-02-07 at ab5961edd9)
1058
+ + sequencer: run 'prepare-commit-msg' hook
1059
+ + t7505: add tests for cherry-pick and rebase -i/-p
1060
+ + t7505: style fixes
1061
+ + sequencer: assign only free()able strings to gpg_sign
1062
+ + sequencer: improve config handling
1063
+ + t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
1064
+ + sequencer: try to commit without forking 'git commit'
1065
+ + sequencer: load commit related config
1066
+ + sequencer: simplify adding Signed-off-by: trailer
1067
+ + commit: move print_commit_summary() to libgit
1068
+ + commit: move post-rewrite code to libgit
1069
+ + Add a function to update HEAD after creating a commit
1070
+ + commit: move empty message checks to libgit
1071
+ + t3404: check intermediate squash messages
1072
1073
The sequencer infrastructure is shared across "git cherry-pick",
1074
"git rebase -i", etc., and has always spawned "git commit" when it
@@ -764,7 +1077,7 @@ of the repositories listed at
1077
gives performance boost for a few tens of percents in some sample
1078
scenarios.
1079
767
- Will merge to 'next'.
1080
+ Will merge to 'master'.
1081
1082
1083
* jh/fsck-promisors (2017-12-08) 10 commits
@@ -789,7 +1102,7 @@ of the repositories listed at
1102
packfile specially marked as coming from trusted repository that
1103
promises to make them available on-demand and lazily.
1104
792
- Will cook in 'next'.
1105
+ Will merge to 'master'.
1106
1107
1108
* jh/partial-clone (2017-12-08) 13 commits
@@ -818,14 +1131,4 @@ of the repositories listed at
1131
tolerate missing objects, taking advantage of the mechanism
1132
introduced by the jh/fsck-promisors topic.
1133
821
- Will cook in 'next'.
822
-
823
-
824
-* ot/mru-on-list (2017-10-01) 1 commit
825
- - mru: use double-linked list from list.h
826
- (this branch is used by gs/retire-mru.)
827
-
828
- The first step to getting rid of mru API and using the
829
- doubly-linked list API directly instead.
830
-
831
- Will merge to 'next'.
1134
+ Will merge to 'master'.