What's cooking (2017/10 #03)
Junio C Hamano committed
Oct 16, 2017 at 15:52 UTC
46d2baa7dc4f96355e507a0e3a4be70ea2eb0e8a
1 file changed
+190
-362
whats-cooking.txt
+190
-362
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2017, #02; Wed, 11)
3
+Subject: What's cooking in git.git (Oct 2017, #03; Mon, 16)
4
X-master-at: 111ef79afe185f8731920569450f6a65320f5d5f
5
-X-next-at: 92ea9504509327dacaba929d631d198e57533c14
5
+X-next-at: 2b38de12cc0e926ec9a73ad73767e578a81645ba
6
7
-What's cooking in git.git (Oct 2017, #02; Wed, 11)
7
+What's cooking in git.git (Oct 2017, #03; Mon, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,19 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-2.15-rc1 has been tagged. Some of the topic marked "Will merge to
16
-'master'" below might still become part of 2.15 final, while others
17
-may be left to be merged after the final, to become part of the
18
-release after that one (2.16?).
15
+2.15-rc1 has been tagged, but 2.15-rc2 is going to slip. The topics
16
+that are cooking in 'next' that are not urgent fixes are classified
17
+as "Will cook in 'next'", and will not graduate to 'master' until
18
+the final.
19
+
20
+We haven't decided how to resolve the "git add -i" regression (see
21
+the thread at
22
+https://public-inbox.org/git/xmqqzi8vvht6.fsf@gitster.mtv.corp.google.com/
23
+for the two approaches), and 'next' has one of them ("demote
24
+'always' to 'auto' when given to color.ui from the configuration
25
+file"), while 'pu' has f6b2410f20 that takes a different approach
26
+("It was a mistake to allow plumbing to pay attention to color.ui
27
+config, so revert it to unbreak 'add -i'").
28
29
You can find the changes described here in the integration branches
30
of the repositories listed at
@@ -23,285 +32,132 @@ of the repositories listed at
32
http://git-blame.blogspot.com/p/git-public-repositories.html
33
34
--------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* ar/request-pull-phrasofix (2017-10-03) 1 commit
29
- (merged to 'next' on 2017-10-03 at 07807bba90)
30
- + request-pull: capitalise "Git" to make it a proper noun
31
-
32
- Spell the name of our system as "Git" in the output from
33
- request-pull script.
34
-
35
-
36
-* ds/avoid-overflow-in-midpoint-computation (2017-10-10) 1 commit
37
- (merged to 'next' on 2017-10-10 at 6279867a5d)
38
- + cleanup: fix possible overflow errors in binary search
39
-
40
- Code clean-up.
41
-
42
-
43
-* er/fast-import-dump-refs-on-checkpoint (2017-09-29) 1 commit
44
- (merged to 'next' on 2017-10-03 at 4e7b0e7ec1)
45
- + fast-import: checkpoint: dump branches/tags/marks even if object_count==0
46
-
47
- The checkpoint command "git fast-import" did not flush updates to
48
- refs and marks unless at least one object was created since the
49
- last checkpoint, which has been corrected, as these things can
50
- happen without any new object getting created.
51
-
52
-
53
-* hn/string-list-doc (2017-10-06) 1 commit
54
- (merged to 'next' on 2017-10-10 at d214a7c369)
55
- + api-argv-array.txt: remove broken link to string-list API
56
-
57
- Docfix.
58
-
59
-
60
-* jk/refs-df-conflict (2017-10-07) 2 commits
61
- (merged to 'next' on 2017-10-10 at d5953a1ced)
62
- + refs_resolve_ref_unsafe: handle d/f conflicts for writes
63
- + t3308: create a real ref directory/file conflict
64
-
65
- An ancient bug that made Git misbehave with creation/renaming of
66
- refs has been fixed.
67
-
68
-
69
-* jk/sha1-loose-object-info-fix (2017-10-06) 1 commit
70
- (merged to 'next' on 2017-10-10 at bcfd9c4e3f)
71
- + sha1_loose_object_info: handle errors from unpack_sha1_rest
72
-
73
- Leakfix and futureproofing.
74
-
75
-
76
-* jk/ui-color-always-to-auto (2017-10-04) 3 commits
77
- (merged to 'next' on 2017-10-05 at 792ae936cf)
78
- + Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto
79
- + t7301: use test_terminal to check color
80
- + t4015: use --color with --color-moved
81
- (this branch uses jk/ui-color-always-to-auto-maint.)
82
-
83
- Fix regression of "git add -p" for users with "color.ui = always"
84
- in their configuration, by merging the topic below and adjusting it
85
- for the 'master' front.
86
-
87
-
88
-* jk/ui-color-always-to-auto-maint (2017-10-04) 10 commits
89
- + color: make "always" the same as "auto" in config
90
- + provide --color option for all ref-filter users
91
- + t3205: use --color instead of color.branch=always
92
- + t3203: drop "always" color test
93
- + t6006: drop "always" color config tests
94
- + t7502: use diff.noprefix for --verbose test
95
- + t7508: use test_terminal for color output
96
- + t3701: use test-terminal to collect color output
97
- + t4015: prefer --color to -c color.diff=always
98
- + test-terminal: set TERM=vt100
99
- (this branch is used by jk/ui-color-always-to-auto.)
100
-
101
- Users with "color.ui = always" in their configuration were broken
102
- by a recent change that made plumbing commands to pay attention to
103
- them as the patch created internally by "git add -p" were colored
104
- (heh) and made unusable. Fix this regression by redefining
105
- 'always' to mean the same thing as 'auto'.
106
-
107
-
108
-* jn/strbuf-doc-re-reuse (2017-10-04) 1 commit
109
- (merged to 'next' on 2017-10-04 at 5940d412d9)
110
- + strbuf doc: reuse after strbuf_release is fine
111
-
112
-
113
-* jr/hash-migration-plan-doc (2017-09-28) 1 commit
114
- (merged to 'next' on 2017-10-04 at b47b3bb656)
115
- + technical doc: add a design doc for hash function transition
116
-
117
- Lay out plans for weaning us off of SHA-1.
118
-
119
-
120
-* jt/oidmap (2017-10-01) 1 commit
121
- (merged to 'next' on 2017-10-05 at e41445fc33)
122
- + oidmap: map with OID as key
123
-
124
- Introduce a new "oidmap" API and rewrite oidset to use it.
125
-
126
-
127
-* ks/branch-tweak-error-message-for-extra-args (2017-10-04) 1 commit
128
- (merged to 'next' on 2017-10-05 at aa0b656bf0)
129
- + branch: change the error messages to be more meaningful
130
-
131
- Error message tweak.
132
-
133
-
134
-* ks/verify-filename-non-option-error-message-tweak (2017-10-04) 1 commit
135
- (merged to 'next' on 2017-10-05 at 2a7030f6fe)
136
- + setup: update error message to be more meaningful
137
-
138
- Error message tweak.
139
-
140
-
141
-* ls/filter-process-delayed (2017-10-10) 5 commits
142
- (merged to 'next' on 2017-10-10 at 7b26d72991)
143
- + write_entry: untangle symlink and regular-file cases
144
- + write_entry: avoid reading blobs in CE_RETRY case
145
- + write_entry: fix leak when retrying delayed filter
146
- + entry.c: check if file exists after checkout
147
- + entry.c: update cache entry only for existing files
148
-
149
- Bugfixes to an already graduated series.
150
-
151
-
152
-* ma/builtin-unleak (2017-10-02) 1 commit
153
- (merged to 'next' on 2017-10-05 at 380cb74320)
154
- + builtin/: add UNLEAKs
155
-
156
- Many variables that points at a region of memory that will live
157
- throughout the life of the program have been marked with UNLEAK
158
- marker to help the leak checkers concentrate on real leaks..
159
-
160
-
161
-* rb/compat-poll-fix (2017-09-29) 1 commit
162
- (merged to 'next' on 2017-10-05 at c31029202d)
163
- + poll.c: always set revents, even if to zero
164
-
165
- Backports a moral equivalent of 2015 fix to the poll emulation from
166
- the upstream gnulib to fix occasional breakages on HPE NonStop.
167
-
168
-
169
-* rs/cleanup-strbuf-users (2017-10-02) 3 commits
170
- (merged to 'next' on 2017-10-03 at 322ec33ad8)
171
- + graph: use strbuf_addchars() to add spaces
172
- + use strbuf_addstr() for adding strings to strbufs
173
- + path: use strbuf_add_real_path()
174
-
175
- Code clean-up.
176
-
177
-
178
-* rs/cocci-de-paren-call-params (2017-10-02) 1 commit
179
- (merged to 'next' on 2017-10-03 at ee97fe5c24)
180
- + coccinelle: remove parentheses that become unnecessary
181
-
182
- Code clean-up.
183
-
35
+[New Topics]
36
185
-* rs/fsck-null-return-from-lookup (2017-10-06) 1 commit
186
- (merged to 'next' on 2017-10-10 at 32dfa424cf)
187
- + fsck: handle NULL return of lookup_blob() and lookup_tree()
37
+* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits
38
+ (merged to 'next' on 2017-10-13 at bb16e1edc8)
39
+ + color: document that "git -c color.*=always" is a bit special
40
+ + color: downgrade "always" to "auto" only for on-disk configuration
41
189
- Improve behaviour of "git fsck" upon finding a missing object.
42
+ It turns out that "git -c color.ui=always cmd" is relied on by many
43
+ third-party tools as a way to force coloured output no matter what
44
+ the end-user configuration is, and a recent attempt to downgrade
45
+ 'always' to 'auto' to fix the regression to "git add -p" broke it.
46
47
192
-* rs/qsort-s (2017-10-04) 1 commit
193
- (merged to 'next' on 2017-10-04 at 5f10a6e263)
194
- + test-stringlist: avoid buffer underrun when sorting nothing
48
+* jk/ref-filter-colors-fix (2017-10-14) 4 commits
49
+ - tag: respect color.ui config
50
+ - Revert "color: check color.ui in git_default_config()"
51
+ - Revert "t6006: drop "always" color config tests"
52
+ - Revert "color: make "always" the same as "auto" in config"
53
54
+ This is the "theoretically more correct" approach of simply
55
+ stepping back to the state before plumbing commands started paying
56
+ attention to "color.ui" configuration variable.
57
197
-* rs/resolve-ref-optional-result (2017-10-01) 2 commits
198
- (merged to 'next' on 2017-10-03 at f129d4b0e9)
199
- + refs: pass NULL to resolve_refdup() if hash is not needed
200
- + refs: pass NULL to refs_resolve_refdup() if hash is not needed
58
202
- Code clean-up.
59
+* jc/branch-name-sanity (2017-10-14) 3 commits
60
+ (merged to 'next' on 2017-10-16 at 174646d1c3)
61
+ + branch: forbid refs/heads/HEAD
62
+ + branch: split validate_new_branchname() into two
63
+ + branch: streamline "attr_only" handling in validate_new_branchname()
64
65
+ "git branch" and "git checkout -b" are now forbidden from creating
66
+ a branch whose name is "HEAD".
67
205
-* rs/rs-mailmap (2017-10-06) 1 commit
206
- (merged to 'next' on 2017-10-10 at 020d29b68c)
207
- + .mailmap: normalize name for René Scharfe
68
+ Will cook in 'next'.
69
70
210
-* rs/run-command-use-alloc-array (2017-10-03) 1 commit
211
- (merged to 'next' on 2017-10-03 at e3869b6c32)
212
- + run-command: use ALLOC_ARRAY
71
+* jk/revision-pruning-optim (2017-10-14) 1 commit
72
+ (merged to 'next' on 2017-10-16 at 2662baa21d)
73
+ + revision: quit pruning diff more quickly when possible
74
214
- Code clean-up.
75
+ Pathspec-limited revision traversal was taught not to keep finding
76
+ unneeded differences once it knows two trees are different inside
77
+ given pathspec.
78
79
+ Will cook in 'next'.
80
217
-* rs/tag-null-pointer-arith-fix (2017-10-02) 1 commit
218
- (merged to 'next' on 2017-10-03 at e05d92fec9)
219
- + tag: avoid NULL pointer arithmetic
81
221
- Code clean-up.
82
+* js/rebase-i-final (2017-10-16) 1 commit
83
+ (merged to 'next' on 2017-10-16 at 72362f5f9c)
84
+ + sequencer.c: fix and unify error messages in rearrange_squash()
85
86
+ Error message fix.
87
224
-* rs/use-free-and-null (2017-10-02) 1 commit
225
- (merged to 'next' on 2017-10-03 at 6340234d67)
226
- + repository: use FREE_AND_NULL
88
+ Will merge to 'master'.
89
228
- Code clean-up.
90
91
+* wk/merge-options-gpg-sign-doc (2017-10-12) 1 commit
92
+ (merged to 'next' on 2017-10-16 at ae61d824da)
93
+ + Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
94
231
-* sb/branch-avoid-repeated-strbuf-release (2017-10-04) 1 commit
232
- (merged to 'next' on 2017-10-04 at bd86ef77fc)
233
- + branch: reset instead of release a strbuf
95
+ Doc updates.
96
97
+ Will cook in 'next'.
98
236
-* sb/git-clang-format (2017-10-02) 1 commit
237
- (merged to 'next' on 2017-10-03 at b40d47b9d5)
238
- + clang-format: add a comment about the meaning/status of the
99
240
- Add comment to clarify that the style file is meant to be used with
241
- clang-5 and the rules are still work in progress.
100
+* wk/pull-signoff (2017-10-13) 1 commit
101
+ (merged to 'next' on 2017-10-16 at 5e48f349d9)
102
+ + pull: pass --signoff/--no-signoff to "git merge"
103
104
+ "git pull" has been taught to accept "--[no-]signoff" option and
105
+ pass it down to "git merge".
106
244
-* sb/test-cmp-expect-actual (2017-10-07) 1 commit
245
- (merged to 'next' on 2017-10-10 at c47a4dcc72)
246
- + tests: fix diff order arguments in test_cmp
107
+ Will cook in 'next'.
108
248
- Test tweak.
109
110
+* sb/diff-color-move (2017-10-16) 1 commit
111
+ (merged to 'next' on 2017-10-16 at 69de1bad9d)
112
+ + diff: fix infinite loop with --color-moved --ignore-space-change
113
251
-* tb/complete-describe (2017-10-07) 1 commit
252
- (merged to 'next' on 2017-10-10 at 2607253946)
253
- + completion: add --broken and --dirty to describe
114
+ A recently added "--color-moved" feature of "diff" fell into
115
+ infinite loop when ignoring whitespace changes, which has been
116
+ fixed.
117
255
- Docfix.
118
+ Will merge to 'master'.
119
120
+--------------------------------------------------
121
+[Stalled]
122
258
-* tb/delimit-pretty-trailers-args-with-comma (2017-10-02) 1 commit
259
- (merged to 'next' on 2017-10-04 at de5446a01c)
260
- + pretty.c: delimit "%(trailers)" arguments with ","
261
- (this branch is used by tb/show-trailers-in-ref-filter.)
123
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
124
+ . zlib.c: use size_t for size
125
263
- The feature that allows --pretty='%(trailers)' to take modifiers
264
- like "fold" and "only" used to separate these modifiers with a
265
- comma, i.e. "%(trailers:fold:only)", but we changed our mind and
266
- use a comma, i.e. "%(trailers:fold,only)". Fast track this change
267
- before this new feature becomes part of any official release.
126
+ The wrapper to call into zlib followed our long tradition to use
127
+ "unsigned long" for sizes of regions in memory, which have been
128
+ updated to use "size_t".
129
130
+ Needs resurrecting by making sure the fix is good and still applies
131
+ (or adjusted to today's codebase).
132
270
-* tb/ref-filter-empty-modifier (2017-10-05) 1 commit
271
- (merged to 'next' on 2017-10-05 at 62cb67688a)
272
- + ref-filter.c: pass empty-string as NULL to atom parsers
133
274
- In the "--format=..." option of the "git for-each-ref" command (and
275
- its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)"
276
- (e.g. "%(refname:)", "%(body:)" used to error out. Instead, treat
277
- them as if the colon and an empty string that follows it were not
278
- there.
134
+* mg/status-in-progress-info (2017-05-10) 2 commits
135
+ - status --short --inprogress: spell it as --in-progress
136
+ - status: show in-progress info for short status
137
138
+ "git status" learns an option to report various operations
139
+ (e.g. "merging") that the user is in the middle of.
140
281
-* tb/show-trailers-in-ref-filter (2017-10-02) 6 commits
282
- (merged to 'next' on 2017-10-05 at c7a697f15d)
283
- + ref-filter.c: parse trailers arguments with %(contents) atom
284
- + ref-filter.c: use trailer_opts to format trailers
285
- + t6300: refactor %(trailers) tests
286
- + doc: use "`<literal>`"-style quoting for literal strings
287
- + doc: 'trailers' is the preferred way to format trailers
288
- + t4205: unfold across multiple lines
141
+ cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
142
290
- "git for-each-ref --format=..." learned a new format element,
291
- %(trailers), to show only the commit log trailer part of the log
292
- message.
143
144
+* nd/worktree-move (2017-04-20) 6 commits
145
+ - worktree remove: new command
146
+ - worktree move: refuse to move worktrees with submodules
147
+ - worktree move: accept destination as directory
148
+ - worktree move: new command
149
+ - worktree.c: add update_worktree_location()
150
+ - worktree.c: add validate_worktree()
151
295
-* tg/memfixes (2017-10-04) 3 commits
296
- (merged to 'next' on 2017-10-04 at fb338a5531)
297
- + sub-process: use child_process.args instead of child_process.argv
298
- + http-push: fix construction of hex value from path
299
- + path.c: fix uninitialized memory access
152
+ "git worktree" learned move and remove subcommands.
153
301
- Fixes for a handful memory access issues identified by valgrind.
154
+ Expecting a reroll.
155
+ cf. <20170420101024.7593-1-pclouds@gmail.com>
156
+ cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
157
+ cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
158
159
--------------------------------------------------
304
-[New Topics]
160
+[Cooking]
161
162
* dm/run-command-ignored-hook-advise (2017-10-10) 1 commit
163
(merged to 'next' on 2017-10-10 at 0827814922)
@@ -334,28 +190,31 @@ of the repositories listed at
190
that is affected for 'upstream' and 'push' via "%(push:remotename)"
191
and friends.
192
193
+ Needs a bit more work on the documentation part?
194
+
195
196
* pb/bisect-helper (2017-10-06) 6 commits
339
- - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
340
- - t6030: explicitly test for bisection cleanup
341
- - bisect--helper: `bisect_clean_state` shell function in C
342
- - bisect--helper: `write_terms` shell function in C
343
- - bisect--helper: rewrite `check_term_format` shell function in C
344
- - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
197
+ (merged to 'next' on 2017-10-13 at ffc9aefe63)
198
+ + bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
199
+ + t6030: explicitly test for bisection cleanup
200
+ + bisect--helper: `bisect_clean_state` shell function in C
201
+ + bisect--helper: `write_terms` shell function in C
202
+ + bisect--helper: rewrite `check_term_format` shell function in C
203
+ + bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
204
205
An early part of piece-by-piece rewrite of "git bisect".
206
348
- Will merge to 'next'.
207
+ Will cook in 'next'.
208
209
351
-* bc/object-id (2017-10-09) 24 commits
210
+* bc/object-id (2017-10-16) 25 commits
211
- refs/files-backend: convert static functions to object_id
212
- refs: convert read_raw_ref backends to struct object_id
213
- refs: convert peel_object to struct object_id
214
- refs: convert resolve_ref_unsafe to struct object_id
215
- worktree: convert struct worktree to object_id
216
- refs: convert resolve_gitlink_ref to struct object_id
358
- - resolve_gitlink_ref(): convert remaining callers to object_id
217
+ - Convert remaining callers of resolve_gitlink_ref to object_id
218
- sha1_file: convert index_path and index_fd to struct object_id
219
- refs: convert reflog_expire parameter to struct object_id
220
- refs: convert read_ref_at to struct object_id
@@ -367,86 +226,37 @@ of the repositories listed at
226
- refs: convert dwim_ref and expand_ref to struct object_id
227
- refs: convert read_ref and read_ref_full to object_id
228
- refs: convert resolve_refdup and refs_resolve_refdup to struct object_id
370
- - check_connected(): use struct object_id
229
+ - Convert check_connected to use struct object_id
230
- refs: update ref transactions to use struct object_id
231
+ - refs: prevent accidental NULL dereference in write_pseudoref
232
- refs: convert update_ref and refs_update_ref to use struct object_id
233
- refs: convert delete_ref and refs_delete_ref to struct object_id
234
- refs/files-backend: convert struct ref_to_prune to object_id
235
- walker: convert to struct object_id
236
237
+ Conversion from uchar[20] to struct object_id continues.
238
+
239
240
* jc/no-cmd-as-subroutine (2017-10-11) 2 commits
379
- - merge-ours: do not use cmd_*() as a subroutine
380
- - describe: do not use cmd_*() as a subroutine
241
+ (merged to 'next' on 2017-10-16 at 5f4ee919ac)
242
+ + merge-ours: do not use cmd_*() as a subroutine
243
+ + describe: do not use cmd_*() as a subroutine
244
245
Calling cmd_foo() as if it is a general purpose helper function is
246
a no-no. Correct two instances of such to set an example.
247
248
+ Will cook in 'next'.
249
+
250
251
* jc/doc-checkout (2017-10-11) 1 commit
387
- - checkout doc: clarify command line args for "checkout paths" mode
252
+ (merged to 'next' on 2017-10-13 at c000f4bd84)
253
+ + checkout doc: clarify command line args for "checkout paths" mode
254
255
Doc update.
256
391
- Will merge to 'next'.
392
-
393
---------------------------------------------------
394
-[Stalled]
395
-
396
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
397
- . zlib.c: use size_t for size
398
-
399
- The wrapper to call into zlib followed our long tradition to use
400
- "unsigned long" for sizes of regions in memory, which have been
401
- updated to use "size_t".
402
-
403
- Needs resurrecting by making sure the fix is good and still applies
404
- (or adjusted to today's codebase).
405
-
406
-
407
-* mg/status-in-progress-info (2017-05-10) 2 commits
408
- - status --short --inprogress: spell it as --in-progress
409
- - status: show in-progress info for short status
410
-
411
- "git status" learns an option to report various operations
412
- (e.g. "merging") that the user is in the middle of.
413
-
414
- cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
415
-
416
-
417
-* nd/worktree-move (2017-04-20) 6 commits
418
- - worktree remove: new command
419
- - worktree move: refuse to move worktrees with submodules
420
- - worktree move: accept destination as directory
421
- - worktree move: new command
422
- - worktree.c: add update_worktree_location()
423
- - worktree.c: add validate_worktree()
424
-
425
- "git worktree" learned move and remove subcommands.
426
-
427
- Expecting a reroll.
428
- cf. <20170420101024.7593-1-pclouds@gmail.com>
429
- cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
430
- cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
257
+ Will merge to 'master'.
258
259
433
-* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
434
- - Documentation/clone: document ignored configuration variables
435
- - clone: respect additional configured fetch refspecs during initial fetch
436
- (this branch is used by sg/remote-no-string-refspecs.)
437
-
438
- "git clone -c var=val" is a way to set configuration variables in
439
- the resulting repository, but it is more useful to also make these
440
- variables take effect while the initial clone is happening,
441
- e.g. these configuration variables could be fetch refspecs.
442
-
443
- Waiting for a response.
444
- cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
445
- cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
446
-
447
---------------------------------------------------
448
-[Cooking]
449
-
260
* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
261
- merge: teach -Xours/-Xtheirs to symbolic link merge
262
@@ -480,29 +290,31 @@ of the repositories listed at
290
depending more on its remote repository---this is the beginning of
291
it.
292
483
- Needs review.
293
+ Expecting a reroll.
294
+ cf. <CAGf8dgLu-TeK8KbHv-U+18O+L2TxKcGv5vFFHy38J6a_YXRfew@mail.gmail.com>
295
296
297
* ma/lockfile-fixes (2017-10-07) 12 commits
487
- - read_cache: roll back lock in `update_index_if_able()`
488
- - read-cache: leave lock in right state in `write_locked_index()`
489
- - read-cache: drop explicit `CLOSE_LOCK`-flag
490
- - cache.h: document `write_locked_index()`
491
- - apply: remove `newfd` from `struct apply_state`
492
- - apply: move lockfile into `apply_state`
493
- - cache-tree: simplify locking logic
494
- - checkout-index: simplify locking logic
495
- - tempfile: fix documentation on `delete_tempfile()`
496
- - lockfile: fix documentation on `close_lock_file_gently()`
497
- - treewide: prefer lockfiles on the stack
498
- - sha1_file: do not leak `lock_file`
298
+ (merged to 'next' on 2017-10-16 at 19fae5c138)
299
+ + read_cache: roll back lock in `update_index_if_able()`
300
+ + read-cache: leave lock in right state in `write_locked_index()`
301
+ + read-cache: drop explicit `CLOSE_LOCK`-flag
302
+ + cache.h: document `write_locked_index()`
303
+ + apply: remove `newfd` from `struct apply_state`
304
+ + apply: move lockfile into `apply_state`
305
+ + cache-tree: simplify locking logic
306
+ + checkout-index: simplify locking logic
307
+ + tempfile: fix documentation on `delete_tempfile()`
308
+ + lockfile: fix documentation on `close_lock_file_gently()`
309
+ + treewide: prefer lockfiles on the stack
310
+ + sha1_file: do not leak `lock_file`
311
312
An earlier update made it possible to use an on-stack in-core
313
lockfile structure (as opposed to having to deliberately leak an
314
on-heap one). Many codepaths have been updated to take advantage
315
of this new facility.
316
505
- Looking good. Is this ready for 'next'?
317
+ Will cook in 'next'.
318
319
320
* ot/mru-on-list (2017-10-01) 1 commit
@@ -553,16 +365,16 @@ of the repositories listed at
365
What's the doneness of this one?
366
367
556
-* ds/find-unique-abbrev-optim (2017-10-09) 4 commits
557
- - sha1_name: minimize OID comparisons during disambiguation
558
- - sha1_name: parse less while finding common prefix
559
- - sha1_name: unroll len loop in find_unique_abbrev_r()
560
- - p4211-line-log.sh: add log --online --raw --parents perf test
368
+* ds/find-unique-abbrev-optim (2017-10-13) 4 commits
369
+ (merged to 'next' on 2017-10-16 at 7f4479ac52)
370
+ + sha1_name: minimize OID comparisons during disambiguation
371
+ + sha1_name: parse less while finding common prefix
372
+ + sha1_name: unroll len loop in find_unique_abbrev_r()
373
+ + p4211-line-log.sh: add log --online --raw --parents perf test
374
375
Optimize the code to find shortest unique prefix of object names.
376
564
- Almost there.
565
- cf. <20171009134933.vmba67adelqbkx4y@sigill.intra.peff.net>
377
+ Will cook in 'next'.
378
379
380
* cc/perf-run-config (2017-09-24) 9 commits
@@ -579,18 +391,6 @@ of the repositories listed at
391
Needs review.
392
393
582
-* mg/merge-pre-merge-hook (2017-09-24) 4 commits
583
- - t7503: add tests for pre-merge-hook
584
- - merge: --no-verify to bypass pre-merge hook
585
- - merge: do no-verify like commit
586
- - git-merge: honor pre-merge hook
587
-
588
- "git merge" learned a 'pre-merge' hook, that would be triggered
589
- before the merge commit is created by a clean auto-merge.
590
-
591
- Waiting for review to conclude.
592
-
593
-
394
* bp/fsmonitor (2017-10-05) 15 commits
395
(merged to 'next' on 2017-10-05 at 964a029d13)
396
+ fsmonitor: preserve utf8 filenames in fsmonitor-watchman log
@@ -640,12 +440,13 @@ of the repositories listed at
440
441
442
* pc/submodule-helper (2017-10-07) 3 commits
643
- - submodule: port submodule subcommand 'status' from shell to C
644
- - submodule--helper: introduce for_each_listed_submodule()
645
- - submodule--helper: introduce get_submodule_displaypath()
443
+ (merged to 'next' on 2017-10-16 at 2b38de12cc)
444
+ + submodule: port submodule subcommand 'status' from shell to C
445
+ + submodule--helper: introduce for_each_listed_submodule()
446
+ + submodule--helper: introduce get_submodule_displaypath()
447
448
GSoC.
648
- Is this ready for 'next'?
449
+ Will merge to 'master'.
450
451
452
* bc/hash-algo (2017-10-04) 6 commits
@@ -689,21 +490,11 @@ of the repositories listed at
490
* jk/check-ref-format-oor-fix (2017-07-14) 1 commit
491
- check-ref-format: require a repository for --branch
492
692
- Discussion slowly continues...
493
+ Discussion slowly continued but then stalled.
494
cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>
495
cf. <20170817102217.3yw7uxnkupdy3lh5@sigill.intra.peff.net>
496
497
697
-* rs/sha1-file-micro-optim (2017-07-09) 2 commits
698
- - SQUASH???
699
- - sha1_file: add slash once in for_each_file_in_obj_subdir()
700
-
701
- Code cleanup.
702
-
703
- Perhaps drop.
704
- cf. <f59c8256-716b-9305-2a4f-d4fe49f666ff@web.de>
705
-
706
-
498
* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
499
(merged to 'next' on 2017-08-14 at 24db08a6e8)
500
+ pathspec: die on empty strings as pathspec
@@ -724,7 +515,7 @@ of the repositories listed at
515
--------------------------------------------------
516
[Discarded]
517
727
-* jc/ref-filter-colors-fix (2017-10-03) 2 commits
518
+* jc/ref-filter-colors-fix (2017-10-14) 2 commits
519
. colors: git_default_config() does not read color.ui
520
. Revert "color: check color.ui in git_default_config()"
521
@@ -753,3 +544,40 @@ of the repositories listed at
544
a discussion to replace the DWIM heuristics with a better one, which
545
deserves to be its own topic.
546
cf. <alpine.DEB.2.21.1.1707131435220.4193@virtualbox>
547
+
548
+
549
+* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
550
+ . Documentation/clone: document ignored configuration variables
551
+ . clone: respect additional configured fetch refspecs during initial fetch
552
+ (this branch is used by sg/remote-no-string-refspecs.)
553
+
554
+ "git clone -c var=val" is a way to set configuration variables in
555
+ the resulting repository, but it is more useful to also make these
556
+ variables take effect while the initial clone is happening,
557
+ e.g. these configuration variables could be fetch refspecs.
558
+
559
+ Got tired of waiting for a response.
560
+ cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
561
+ cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
562
+
563
+
564
+* rs/sha1-file-micro-optim (2017-07-09) 2 commits
565
+ . SQUASH???
566
+ . sha1_file: add slash once in for_each_file_in_obj_subdir()
567
+
568
+ Code cleanup.
569
+
570
+ Perhaps drop.
571
+ cf. <f59c8256-716b-9305-2a4f-d4fe49f666ff@web.de>
572
+
573
+
574
+* mg/merge-pre-merge-hook (2017-09-24) 4 commits
575
+ - t7503: add tests for pre-merge-hook
576
+ - merge: --no-verify to bypass pre-merge hook
577
+ - merge: do no-verify like commit
578
+ - git-merge: honor pre-merge hook
579
+
580
+ "git merge" learned a 'pre-merge' hook, that would be triggered
581
+ before the merge commit is created by a clean auto-merge.
582
+
583
+ What's the doneness of this? Is everybody happy?