What's cooking (2017/06 #07)
Junio C Hamano committed
Jun 24, 2017 at 15:49 UTC
c0343afe6cce59e0b240324173675c3b784c53f8
1 file changed
+254
-329
whats-cooking.txt
+254
-329
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2017, #06; Thu, 22)
4
-X-master-at: 5402b1352f5181247405fbff1887008a0cb3b04a
5
-X-next-at: bc1a90f0778b337f20670d4cbce0a6e2c034cbf5
3
+Subject: What's cooking in git.git (Jun 2017, #07; Sat, 24)
4
+X-master-at: e629a7d28a405e48fae6b064a781a10e885159fc
5
+X-next-at: dfeb3b8721fab9939e46c1aea15c813423fe1de3
6
7
-What's cooking in git.git (Jun 2017, #06; Thu, 22)
7
+What's cooking in git.git (Jun 2017, #07; Sat, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,9 @@ 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
+A new maintenance release v2.13.2 has been tagged with various fixes
16
+that have been already in the 'master' branch.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
@@ -20,109 +23,243 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
23
-* ah/filter-branch-setup (2017-06-12) 2 commits
24
- (merged to 'next' on 2017-06-19 at f3440f2c1a)
25
- + filter-branch: add [--] to usage
26
- + filter-branch: add `--setup` step
26
+* ab/free-and-null (2017-06-16) 6 commits
27
+ (merged to 'next' on 2017-06-21 at a1825fabd8)
28
+ + *.[ch] refactoring: make use of the FREE_AND_NULL() macro
29
+ + coccinelle: make use of the "expression" FREE_AND_NULL() rule
30
+ + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
31
+ + coccinelle: make use of the "type" FREE_AND_NULL() rule
32
+ + coccinelle: add a rule to make "type" code use FREE_AND_NULL()
33
+ + git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
34
28
- "filter-branch" learned a pseudo filter "--setup" that can be used
29
- to define a common function/variable that can be used by other
30
- filters.
35
+ A common pattern to free a piece of memory and assign NULL to the
36
+ pointer that used to point at it has been replaced with a new
37
+ FREE_AND_NULL() macro.
38
39
33
-* km/test-mailinfo-b-failure (2017-06-12) 1 commit
34
- (merged to 'next' on 2017-06-19 at badc2c2337)
35
- + t5100: add some more mailinfo tests
40
+* ab/pcre-v2 (2017-06-21) 1 commit
41
+ (merged to 'next' on 2017-06-21 at fb6320213c)
42
+ + grep: fix erroneously copy/pasted variable in check/assert pattern
43
37
- New tests.
44
+ Hotfix for a topic already in 'master'.
45
46
40
-* ls/github (2017-06-13) 1 commit
41
- (merged to 'next' on 2017-06-19 at 4d2024615f)
42
- + Configure Git contribution guidelines for github.com
47
+* ab/wildmatch-glob-slash-test (2017-06-15) 1 commit
48
+ (merged to 'next' on 2017-06-21 at 8f4a056f5f)
49
+ + wildmatch test: cover a blind spot in "/" matching
50
44
- Help contributors that visit us at GitHub.
51
+ A new test to show the interaction between the pattern [^a-z]
52
+ (which matches '/') and a slash in a path has been added. The
53
+ pattern should not match the slash with "pathmatch", but should
54
+ with "wildmatch".
55
56
47
-* mh/fast-import-raise-default-depth (2017-06-12) 1 commit
48
- (merged to 'next' on 2017-06-19 at 7093c07b8e)
49
- + fast-import: increase the default pack depth to 50
57
+* ah/doc-gitattributes-empty-index (2017-06-15) 1 commit
58
+ (merged to 'next' on 2017-06-21 at f1dc92557b)
59
+ + doc: do not use `rm .git/index` when normalizing line endings
60
51
- "fast-import" uses a default pack chain depth that is consistent
52
- with other parts of the system.
61
+ An example in documentation that does not work in multi worktree
62
+ configuration has been corrected.
63
64
55
-* nd/fopen-errors (2017-06-15) 1 commit
56
- (merged to 'next' on 2017-06-15 at 86bcb7c082)
57
- + configure.ac: loosen FREAD_READS_DIRECTORIES test program
65
+* bw/config-h (2017-06-15) 6 commits
66
+ (merged to 'next' on 2017-06-21 at 15c5f34034)
67
+ + config: don't implicitly use gitdir or commondir
68
+ + config: respect commondir
69
+ + setup: teach discover_git_directory to respect the commondir
70
+ + config: don't include config.h by default
71
+ + config: remove git_config_iter
72
+ + config: create config.h
73
+ (this branch is used by bw/repo-object; uses js/alias-early-config.)
74
59
- Hotfix for a topic that is already in 'master'.
75
+ Fix configuration codepath to pay proper attention to commondir
76
+ that is used in multi-worktree situation, and isolate config API
77
+ into its own header file.
78
79
62
-* pc/dir-count-slashes (2017-06-12) 1 commit
63
- (merged to 'next' on 2017-06-19 at 57351a2771)
64
- + dir: create function count_slashes()
80
+* bw/ls-files-sans-the-index (2017-06-13) 17 commits
81
+ (merged to 'next' on 2017-06-21 at 39ce64f6c7)
82
+ + ls-files: factor out tag calculation
83
+ + ls-files: factor out debug info into a function
84
+ + ls-files: convert show_files to take an index
85
+ + ls-files: convert show_ce_entry to take an index
86
+ + ls-files: convert prune_cache to take an index
87
+ + ls-files: convert ce_excluded to take an index
88
+ + ls-files: convert show_ru_info to take an index
89
+ + ls-files: convert show_other_files to take an index
90
+ + ls-files: convert show_killed_files to take an index
91
+ + ls-files: convert write_eolinfo to take an index
92
+ + ls-files: convert overlay_tree_on_cache to take an index
93
+ + tree: convert read_tree to take an index parameter
94
+ + convert: convert renormalize_buffer to take an index
95
+ + convert: convert convert_to_git to take an index
96
+ + convert: convert convert_to_git_filter_fd to take an index
97
+ + convert: convert crlf_to_git to take an index
98
+ + convert: convert get_cached_convert_stats_ascii to take an index
99
+ (this branch is used by bw/repo-object.)
100
66
- Three instances of the same helper function have been consolidated
67
- to one.
101
+ Code clean-up.
102
103
70
-* ps/stash-push-pathspec-fix (2017-06-13) 1 commit
71
- (merged to 'next' on 2017-06-19 at 866c9035e0)
72
- + git-stash: fix pushing stash with pathspec from subdir
104
+* da/mergetools-meld-output-opt-on-macos (2017-06-18) 1 commit
105
+ (merged to 'next' on 2017-06-21 at de00cce3c0)
106
+ + mergetools/meld: improve compatibiilty with Meld on macOS X
107
74
- "git stash push <pathspec>" did not work from a subdirectory at all.
75
- Bugfix for a topic in v2.13
108
+ "git mergetool" learned to work around a wrapper MacOS X adds
109
+ around underlying meld.
110
111
78
-* rs/strbuf-addftime-zZ (2017-06-15) 3 commits
79
- (merged to 'next' on 2017-06-19 at 77480669f0)
80
- + date: use localtime() for "-local" time formats
81
- + t0006: check --date=format zone offsets
82
- + strbuf: let strbuf_addftime handle %z and %Z itself
112
+* jk/diff-highlight-module (2017-06-15) 1 commit
113
+ (merged to 'next' on 2017-06-21 at e418062ad2)
114
+ + diff-highlight: split code into module
115
84
- As there is no portable way to pass timezone information to
85
- strftime, some output format from "git log" and friends are
86
- impossible to produce. Teach our own strbuf_addftime to replace %z
87
- and %Z with caller-supplied values to help working around this.
116
+ The 'diff-highlight' program (in contrib/) has been restructured
117
+ for easier reuse by an external project 'diff-so-fancy'.
118
119
90
-* sb/t4005-modernize (2017-06-10) 1 commit
91
- (merged to 'next' on 2017-06-19 at beedeb757b)
92
- + t4005: modernize style and drop hard coded sha1
120
+* jk/warn-add-gitlink (2017-06-15) 2 commits
121
+ (merged to 'next' on 2017-06-21 at 7210ddbb2e)
122
+ + t: move "git add submodule" into test blocks
123
+ + add: warn when adding an embedded repository
124
94
- Test clean-up.
125
+ Using "git add d/i/r" when d/i/r is the top of the working tree of
126
+ a separate repository would create a gitlink in the index, which
127
+ would appear as a not-quite-initialized submodule to others. We
128
+ learned to give warnings when this happens.
129
130
97
-* sd/t3200-branch-m-test (2017-06-13) 1 commit
98
- (merged to 'next' on 2017-06-19 at 0fd712c46e)
99
- + t3200: add test for single parameter passed to -m option
131
+* js/alias-early-config (2017-06-15) 6 commits
132
+ (merged to 'next' on 2017-06-21 at ca4995aac2)
133
+ + alias: use the early config machinery to expand aliases
134
+ + t7006: demonstrate a problem with aliases in subdirectories
135
+ + t1308: relax the test verifying that empty alias values are disallowed
136
+ + help: use early config when autocorrecting aliases
137
+ + config: report correct line number upon error
138
+ + discover_git_directory(): avoid setting invalid git_dir
139
+ (this branch is used by bw/config-h and bw/repo-object.)
140
101
- New test.
141
+ The code to pick up and execute command alias definition from the
142
+ configuration used to switch to the top of the working tree and
143
+ then come back when the expanded alias was executed, which was
144
+ unnecessarilyl complex. Attempt to simplify the logic by using the
145
+ early-config mechanism that does not chdir around.
146
147
104
-* sg/revision-parser-skip-prefix (2017-06-12) 5 commits
105
- (merged to 'next' on 2017-06-19 at 0a90bec767)
106
- + revision.c: use skip_prefix() in handle_revision_pseudo_opt()
107
- + revision.c: use skip_prefix() in handle_revision_opt()
108
- + revision.c: stricter parsing of '--early-output'
109
- + revision.c: stricter parsing of '--no-{min,max}-parents'
110
- + revision.h: turn rev_info.early_output back into an unsigned int
148
+* rs/pretty-add-again (2017-06-15) 1 commit
149
+ (merged to 'next' on 2017-06-21 at 5128ad3632)
150
+ + pretty: recalculate duplicate short hashes
151
112
- Code clean-up.
152
+ The pretty-format specifiers like '%h', '%t', etc. had an
153
+ optimization that no longer works correctly. In preparation/hope
154
+ of getting it correctly implemented, first discard the optimization
155
+ that is broken.
156
+
157
+
158
+* sg/doc-pretty-formats (2017-06-15) 1 commit
159
+ (merged to 'next' on 2017-06-21 at 011df65cf5)
160
+ + docs/pretty-formats: stress that %- removes all preceding line-feeds
161
+
162
+ Doc update.
163
+
164
+
165
+* sn/reset-doc-typofix (2017-06-15) 1 commit
166
+ (merged to 'next' on 2017-06-21 at 3e629ac2cb)
167
+ + doc: git-reset: fix a trivial typo
168
+
169
+ Doc update.
170
171
--------------------------------------------------
172
[New Topics]
173
117
-* mh/packed-ref-store-prep-extra (2017-06-18) 1 commit
118
- - prefix_ref_iterator_advance(): relax the check of trim length
119
- (this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store.)
174
+* ab/wildmatch (2017-06-23) 4 commits
175
+ - SQUASH???
176
+ - wildmatch: make use of the interface for precompiling wildmatch() patterns
177
+ - wildmatch: add interface for precompiling wildmatch() patterns
178
+ - wildmatch: remove unused wildopts parameter
179
+
180
+ Prepare the wildmatch API for future enhancements to allow a
181
+ pattern that is repeatedly matched against many strings to be
182
+ precompiled.
183
+
184
+
185
+* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit
186
+ - doc: clarify syntax for %C(auto,...) in pretty formats
187
+
188
+ Doc update.
189
+
190
+ Will merge to 'next'.
191
121
- Split out of mh/packed-ref-store-prep; will drop.
192
193
+* cc/shared-index-permfix (2017-06-23) 3 commits
194
+ - t1700: make sure split-index respects core.sharedrepository
195
+ - t1301: move modebits() to test-lib-functions.sh
196
+ - read-cache: use shared perms when writing shared index
197
+
198
+ The split index code did not honor core.sharedrepository setting
199
+ correctly.
200
+
201
+ Expecting a reroll.
202
+ cf. <xmqqwp82bb39.fsf@gitster.mtv.corp.google.com>
203
+ The test looked flakey.
204
+
205
+
206
+* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
207
+ - pathspec: die on empty strings as pathspec
208
+ - t0027: do not use an empty string as a pathspec element
209
+
210
+ The final step to make an empty string as a pathspec element
211
+ illegal. We started this by first deprecating and warning a
212
+ pathspec that has such an element in 2.11 (Nov 2016).
213
+
214
+ Hopefully we can merge this down to the 'master' by the end of the
215
+ year? A deprecation warning period that is about 1 year does not
216
+ sound too bad.
217
+
218
+ Will merge to 'next.
219
+
220
+
221
+* sb/pull-rebase-submodule (2017-06-23) 3 commits
222
+ - pull: optionally rebase submodules (remote submodule changes only)
223
+ - builtin/fetch: parse recurse-submodules-default at default options parsing
224
+ - builtin/fetch: factor submodule recurse parsing out to submodule config
225
+
226
+ "git pull --rebase --recurse-submodules" learns to rebase the
227
+ branch in the submodules to an updated base.
228
+
229
+--------------------------------------------------
230
+[Stalled]
231
+
232
+* mg/status-in-progress-info (2017-05-10) 2 commits
233
+ - status --short --inprogress: spell it as --in-progress
234
+ - status: show in-progress info for short status
235
+
236
+ "git status" learns an option to report various operations
237
+ (e.g. "merging") that the user is in the middle of.
238
+
239
+ cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
240
+
241
+
242
+* nd/worktree-move (2017-04-20) 6 commits
243
+ - worktree remove: new command
244
+ - worktree move: refuse to move worktrees with submodules
245
+ - worktree move: accept destination as directory
246
+ - worktree move: new command
247
+ - worktree.c: add update_worktree_location()
248
+ - worktree.c: add validate_worktree()
249
+
250
+ "git worktree" learned move and remove subcommands.
251
+
252
+ Expecting a reroll.
253
+ cf. <20170420101024.7593-1-pclouds@gmail.com>
254
+ cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
255
+ cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
256
+
257
+--------------------------------------------------
258
+[Cooking]
259
260
* ab/die-errors-in-threaded (2017-06-21) 1 commit
125
- - die(): stop hiding errors due to overzealous recursion guard
261
+ (merged to 'next' on 2017-06-24 at 135fc4b963)
262
+ + die(): stop hiding errors due to overzealous recursion guard
263
264
Traditionally, the default die() routine had a code to prevent it
265
from getting called multiple times, which interacted badly when a
@@ -130,19 +267,10 @@ of the repositories listed at
267
be hidden and instead the only error message given to the user may
268
end up being "die recursion detected", which is not very useful).
269
133
- Will merge to 'next'.
134
-
135
-
136
-* ab/pcre-v2 (2017-06-21) 1 commit
137
- (merged to 'next' on 2017-06-21 at fb6320213c)
138
- + grep: fix erroneously copy/pasted variable in check/assert pattern
139
-
140
- Hotfix for a topic already in 'master'.
141
-
270
Will merge to 'master'.
271
272
145
-* bw/repo-object (2017-06-22) 21 commits
273
+* bw/repo-object (2017-06-23) 21 commits
274
- ls-files: use repository object
275
- repository: enable initialization of submodules
276
- submodule: convert is_submodule_initialized to work on a repository
@@ -163,13 +291,14 @@ of the repositories listed at
291
- environment: remove namespace_len variable
292
- setup: add comment indicating a hack
293
- setup: don't perform lazy initialization of repository state
166
- - Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into HEAD
167
- (this branch uses bw/config-h, bw/ls-files-sans-the-index and js/alias-early-config.)
294
+ - Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object
295
296
Introduce a "repository" object to eventually make it easier to
297
work in multiple repositories (the primary focus is to work with
298
the superproject and its submodules) in a single process.
299
300
+ Will merge to 'next'.
301
+
302
303
* dt/raise-core-packed-git-limit (2017-06-21) 1 commit
304
(merged to 'next' on 2017-06-22 at bc1a90f077)
@@ -211,20 +340,20 @@ of the repositories listed at
340
341
342
* ks/submodule-add-doc (2017-06-22) 1 commit
214
- - Documentation/git-submodule: cleanup "add" section
343
+ (merged to 'next' on 2017-06-24 at 26309b38f2)
344
+ + Documentation/git-submodule: cleanup "add" section
345
346
Doc update.
347
218
- Will merge to 'next'.
348
+ Will merge to 'master'.
349
350
221
-* pw/unquote-path-in-git-pm (2017-06-22) 5 commits
351
+* pw/unquote-path-in-git-pm (2017-06-24) 5 commits
352
- git-add--interactive.perl: Use unquote_path() from Git.pm
353
- Add tests for Git::unquote_path()
354
- Git::unquote_path() throw an exception on bad path
355
- Git::unquote_path() Handle '\a'
356
- Git.pm: add unquote_path()
227
- (this branch uses rs/sha1-name-readdir-optim.)
357
358
Code refactoring.
359
@@ -233,93 +362,17 @@ of the repositories listed at
362
result looked mostly OK.
363
364
236
-* rs/sha1-name-readdir-optim (2017-06-22) 1 commit
365
+* rs/sha1-name-readdir-optim (2017-06-24) 4 commits
366
+ - sha1_file: guard against invalid loose subdirectory numbers
367
+ - sha1_file: let for_each_file_in_obj_subdir() handle subdir names
368
+ - p4205: add perf test script for pretty log formats
369
- sha1_name: cache readdir(3) results in find_short_object_filename()
238
- (this branch is used by pw/unquote-path-in-git-pm.)
370
371
Optimize "what are the object names already taken in an alternate
372
object database?" query that is used to derive the length of prefix
373
an object name is uniquely abbreviated to.
374
244
- It would be nice to have some numbers, though.
245
-
246
---------------------------------------------------
247
-[Stalled]
248
-
249
-* mg/status-in-progress-info (2017-05-10) 2 commits
250
- - status --short --inprogress: spell it as --in-progress
251
- - status: show in-progress info for short status
252
-
253
- "git status" learns an option to report various operations
254
- (e.g. "merging") that the user is in the middle of.
255
-
256
- cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
257
-
258
-
259
-* nd/worktree-move (2017-04-20) 6 commits
260
- - worktree remove: new command
261
- - worktree move: refuse to move worktrees with submodules
262
- - worktree move: accept destination as directory
263
- - worktree move: new command
264
- - worktree.c: add update_worktree_location()
265
- - worktree.c: add validate_worktree()
266
-
267
- "git worktree" learned move and remove subcommands.
268
-
269
- Expecting a reroll.
270
- cf. <20170420101024.7593-1-pclouds@gmail.com>
271
- cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
272
- cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
273
-
274
---------------------------------------------------
275
-[Cooking]
276
-
277
-* ab/free-and-null (2017-06-16) 6 commits
278
- (merged to 'next' on 2017-06-21 at a1825fabd8)
279
- + *.[ch] refactoring: make use of the FREE_AND_NULL() macro
280
- + coccinelle: make use of the "expression" FREE_AND_NULL() rule
281
- + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
282
- + coccinelle: make use of the "type" FREE_AND_NULL() rule
283
- + coccinelle: add a rule to make "type" code use FREE_AND_NULL()
284
- + git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
285
-
286
- A common pattern to free a piece of memory and assign NULL to the
287
- pointer that used to point at it has been replaced with a new
288
- FREE_AND_NULL() macro.
289
-
290
- Will merge to 'master'.
291
-
292
-
293
-* ab/wildmatch-glob-slash-test (2017-06-15) 1 commit
294
- (merged to 'next' on 2017-06-21 at 8f4a056f5f)
295
- + wildmatch test: cover a blind spot in "/" matching
296
-
297
- A new test to show the interaction between the pattern [^a-z]
298
- (which matches '/') and a slash in a path has been added. The
299
- pattern should not match the slash with "pathmatch", but should
300
- with "wildmatch".
301
-
302
- Will merge to 'master'.
303
-
304
-
305
-* ah/doc-gitattributes-empty-index (2017-06-15) 1 commit
306
- (merged to 'next' on 2017-06-21 at f1dc92557b)
307
- + doc: do not use `rm .git/index` when normalizing line endings
308
-
309
- An example in documentation that does not work in multi worktree
310
- configuration has been corrected.
311
-
312
- Will merge to 'master'.
313
-
314
-
315
-* jk/diff-highlight-module (2017-06-15) 1 commit
316
- (merged to 'next' on 2017-06-21 at e418062ad2)
317
- + diff-highlight: split code into module
318
-
319
- The 'diff-highlight' program (in contrib/) has been restructured
320
- for easier reuse by an external project 'diff-so-fancy'.
321
-
322
- Will merge to 'master'.
375
+ Will merge to 'next'.
376
377
378
* jt/unify-object-info (2017-06-21) 8 commits
@@ -335,50 +388,12 @@ of the repositories listed at
388
Code clean-ups.
389
390
Looked sensible to me. Any further comments?
338
-
339
-
340
-* rs/pretty-add-again (2017-06-15) 1 commit
341
- (merged to 'next' on 2017-06-21 at 5128ad3632)
342
- + pretty: recalculate duplicate short hashes
343
-
344
- The pretty-format specifiers like '%h', '%t', etc. had an
345
- optimization that no longer works correctly. In preparation/hope
346
- of getting it correctly implemented, first discard the optimization
347
- that is broken.
348
-
349
- Will merge to 'master'.
350
-
351
-
352
-* sg/doc-pretty-formats (2017-06-15) 1 commit
353
- (merged to 'next' on 2017-06-21 at 011df65cf5)
354
- + docs/pretty-formats: stress that %- removes all preceding line-feeds
355
-
356
- Doc update.
357
-
358
- Will merge to 'master'.
359
-
360
-
361
-* sn/reset-doc-typofix (2017-06-15) 1 commit
362
- (merged to 'next' on 2017-06-21 at 3e629ac2cb)
363
- + doc: git-reset: fix a trivial typo
364
-
365
- Doc update.
366
-
367
- Will merge to 'master'.
368
-
369
-
370
-* da/mergetools-meld-output-opt-on-macos (2017-06-18) 1 commit
371
- (merged to 'next' on 2017-06-21 at de00cce3c0)
372
- + mergetools/meld: improve compatibiilty with Meld on macOS X
373
-
374
- "git mergetool" learned to work around a wrapper MacOS X adds
375
- around underlying meld.
376
-
377
- Will merge to 'master'.
391
+ cf. <20170624124522.p2dnwdah75e4ngya@sigill.intra.peff.net>
392
393
394
* ks/status-initial-commit (2017-06-21) 1 commit
381
- - status: contextually notify user about an initial commit
395
+ (merged to 'next' on 2017-06-24 at 940ffd5816)
396
+ + status: contextually notify user about an initial commit
397
398
"git status" has long shown essentially the same message as "git
399
commit"; the message it gives while preparing for the root commit,
@@ -387,7 +402,7 @@ of the repositories listed at
402
(rather than the commit the user is preparing for, which is more in
403
line with the focus of "git commit").
404
390
- Will merge to 'next'.
405
+ Will merge to 'master'.
406
407
408
* lb/status-stash-count (2017-06-18) 3 commits
@@ -402,8 +417,7 @@ of the repositories listed at
417
Will merge to 'master'.
418
419
405
-* mh/packed-ref-store (2017-06-19) 29 commits
406
- - SQUASH???
420
+* mh/packed-ref-store (2017-06-23) 29 commits
421
- read_packed_refs(): die if `packed-refs` contains bogus data
422
- repack_without_refs(): don't lock or unlock the packed refs
423
- commit_packed_refs(): remove call to `packed_refs_unlock()`
@@ -432,90 +446,11 @@ of the repositories listed at
446
- packed_ref_store: move `packed_refs_path` here
447
- packed_ref_store: new struct
448
- add_packed_ref(): teach function to overwrite existing refs
449
+ - t1408: add a test of stale packed refs covered by loose refs
450
(this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store-prep-extra.)
451
452
The "ref-store" code reorganization continues.
453
439
- Seems to break the promise that packed-refs are covered by loose
440
- refs and the former that points at a missing garbage is not an
441
- error.
442
- cf. <20170619195330.fhjlfiqmcwhgttaa@sigill.intra.peff.net>
443
-
444
-
445
-* js/alias-early-config (2017-06-15) 6 commits
446
- (merged to 'next' on 2017-06-21 at ca4995aac2)
447
- + alias: use the early config machinery to expand aliases
448
- + t7006: demonstrate a problem with aliases in subdirectories
449
- + t1308: relax the test verifying that empty alias values are disallowed
450
- + help: use early config when autocorrecting aliases
451
- + config: report correct line number upon error
452
- + discover_git_directory(): avoid setting invalid git_dir
453
- (this branch is used by bw/config-h and bw/repo-object.)
454
-
455
- The code to pick up and execute command alias definition from the
456
- configuration used to switch to the top of the working tree and
457
- then come back when the expanded alias was executed, which was
458
- unnecessarilyl complex. Attempt to simplify the logic by using the
459
- early-config mechanism that does not chdir around.
460
-
461
- Will merge to 'master'.
462
-
463
-
464
-* bw/config-h (2017-06-15) 6 commits
465
- (merged to 'next' on 2017-06-21 at 15c5f34034)
466
- + config: don't implicitly use gitdir or commondir
467
- + config: respect commondir
468
- + setup: teach discover_git_directory to respect the commondir
469
- + config: don't include config.h by default
470
- + config: remove git_config_iter
471
- + config: create config.h
472
- (this branch is used by bw/repo-object; uses js/alias-early-config.)
473
-
474
- Fix configuration codepath to pay proper attention to commondir
475
- that is used in multi-worktree situation, and isolate config API
476
- into its own header file.
477
-
478
- Will merge to 'master'.
479
-
480
-
481
-* bw/ls-files-sans-the-index (2017-06-13) 17 commits
482
- (merged to 'next' on 2017-06-21 at 39ce64f6c7)
483
- + ls-files: factor out tag calculation
484
- + ls-files: factor out debug info into a function
485
- + ls-files: convert show_files to take an index
486
- + ls-files: convert show_ce_entry to take an index
487
- + ls-files: convert prune_cache to take an index
488
- + ls-files: convert ce_excluded to take an index
489
- + ls-files: convert show_ru_info to take an index
490
- + ls-files: convert show_other_files to take an index
491
- + ls-files: convert show_killed_files to take an index
492
- + ls-files: convert write_eolinfo to take an index
493
- + ls-files: convert overlay_tree_on_cache to take an index
494
- + tree: convert read_tree to take an index parameter
495
- + convert: convert renormalize_buffer to take an index
496
- + convert: convert convert_to_git to take an index
497
- + convert: convert convert_to_git_filter_fd to take an index
498
- + convert: convert crlf_to_git to take an index
499
- + convert: convert get_cached_convert_stats_ascii to take an index
500
- (this branch is used by bw/repo-object.)
501
-
502
- Code clean-up.
503
-
504
- Will merge to 'master'.
505
-
506
-
507
-* jk/warn-add-gitlink (2017-06-15) 2 commits
508
- (merged to 'next' on 2017-06-21 at 7210ddbb2e)
509
- + t: move "git add submodule" into test blocks
510
- + add: warn when adding an embedded repository
511
-
512
- Using "git add d/i/r" when d/i/r is the top of the working tree of
513
- a separate repository would create a gitlink in the index, which
514
- would appear as a not-quite-initialized submodule to others. We
515
- learned to give warnings when this happens.
516
-
517
- Will merge to 'master'.
518
-
454
455
* mh/packed-ref-store-prep (2017-06-18) 2 commits
456
(merged to 'next' on 2017-06-22 at 3f7a4da1e8)
@@ -558,10 +493,13 @@ of the repositories listed at
493
The filter-process interface learned to allow a process with long
494
latency give a "delayed" response.
495
561
- Needs review.
496
+ Getting reviewed.
497
+ cf. <20170624142301.c5jl7xxf4ici3cug@sigill.intra.peff.net>
498
499
564
-* pw/rebase-i-regression-fix-tests (2017-06-19) 4 commits
500
+* pw/rebase-i-regression-fix-tests (2017-06-23) 5 commits
501
+ (merged to 'next' on 2017-06-23 at 835ae762f5)
502
+ + t3420: fix under GETTEXT_POISON build
503
(merged to 'next' on 2017-06-22 at d1dde1672a)
504
+ rebase: add more regression tests for console output
505
+ rebase: add regression tests for console output
@@ -583,8 +521,13 @@ of the repositories listed at
521
submodule.
522
523
Will keep in 'pu'.
586
- Impact to the various build and release infrastructure of using
587
- submodule is not yet fully known, but this lets us dip our toes.
524
+ cf. <xmqqefuab571.fsf@gitster.mtv.corp.google.com>
525
+
526
+ The only nit I may have is that we may possibly want to turn this
527
+ on in .travis.yml on MacOS before we move it forward (otherwise
528
+ we'd be shipping bundled one and submodule one without doing any
529
+ build on that platform)? Other than that, the topic seems ready to
530
+ be merged down.
531
532
533
* bp/fsmonitor (2017-06-12) 6 commits
@@ -597,10 +540,10 @@ of the repositories listed at
540
541
We learned to talk to watchman to speed up "git status".
542
600
- Waiting for discussion to settle.
543
+ No more comments or updates?
544
545
603
-* sb/diff-color-move (2017-06-21) 25 commits
546
+* sb/diff-color-move (2017-06-23) 25 commits
547
- diff: document the new --color-moved setting
548
- diff.c: add dimming to moved line detection
549
- diff.c: color moved lines differently, plain mode
@@ -615,9 +558,9 @@ of the repositories listed at
558
- diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
559
- diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
560
- diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
618
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR
561
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
562
- diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
620
- - diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS{_PORCELAIN}
563
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
564
- diff.c: migrate emit_line_checked to use emit_diff_symbol
565
- diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
566
- diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
@@ -631,8 +574,6 @@ of the repositories listed at
574
the same as deleted lines elsewhere differently from genuinely new
575
lines.
576
634
- Is any more update coming?
635
-
577
578
* xz/send-email-batch-size (2017-05-23) 1 commit
579
- send-email: --batch-size to work around some SMTP server limit
@@ -643,6 +584,11 @@ of the repositories listed at
584
585
Waiting for response.
586
cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>
587
+ cf. <xmqqo9tfff2w.fsf@gitster.mtv.corp.google.com>
588
+
589
+ """I thought your wish (which I found reasonable) was to record
590
+ whatever information that would help us in the future in the log
591
+ message? I was waiting for that to happen."""
592
593
594
* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
@@ -655,8 +601,9 @@ of the repositories listed at
601
variables take effect while the initial clone is happening,
602
e.g. these configuration variables could be fetch refspecs.
603
658
- Are we happy with these two?
604
+ Waiting for a response.
605
cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
606
+ cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
607
608
609
* js/rebase-i-final (2017-06-15) 10 commits
@@ -681,6 +628,13 @@ of the repositories listed at
628
--------------------------------------------------
629
[Discarded]
630
631
+* mh/packed-ref-store-prep-extra (2017-06-18) 1 commit
632
+ . prefix_ref_iterator_advance(): relax the check of trim length
633
+ (this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store.)
634
+
635
+ Split out of mh/packed-ref-store-prep.
636
+
637
+
638
* nd/prune-in-worktree (2017-04-24) 12 commits
639
. rev-list: expose and document --single-worktree
640
. revision.c: --reflog add HEAD reflog from all worktrees
@@ -700,32 +654,3 @@ of the repositories listed at
654
of other worktrees as the root for reachability traversal, making
655
objects that are in use only in other worktrees to be subject to
656
garbage collection.
703
-
704
-
705
-* jc/pretty-add-again (2017-06-13) 1 commit
706
- . add_again() off-by-one error in custom format
707
-
708
-
709
-* sk/dash-is-previous (2017-03-01) 5 commits
710
- . revert.c: delegate handling of "-" shorthand to setup_revisions
711
- . sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
712
- . revision.c: args starting with "-" might be a revision
713
- . revision.c: swap if/else blocks
714
- . revision.c: do not update argv with unknown option
715
-
716
- A dash "-" can be written to mean "the branch that was previously
717
- checked out" in more places.
718
-
719
- Ejected, as it seems that making -.. to mean @{-1}..HEAD etc. are
720
- going too far.
721
-
722
-
723
-* mg/name-rev-debug (2017-03-31) 2 commits
724
- . describe: pass --debug down to name-rev
725
- . name-rev: provide debug output
726
-
727
- "git describe --debug --contains" did not add any meaningful
728
- information, even though without "--contains" it did.
729
-
730
- Will discard for now.
731
- cf. <c85bc2a1-56d8-8a02-6089-2b8cb3d39e99@grubix.eu>