What's cooking (2017/03 #11)
Junio C Hamano committed
Mar 27, 2017 at 15:34 UTC
f605eebc2a60e1ab9abf06601fe6c211f10de443
1 file changed
+236
-246
whats-cooking.txt
+236
-246
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2017, #10; Fri, 24)
4
-X-master-at: 034667a458057ef1e571973a38ebbdf0045a63e9
5
-X-next-at: 063fe858b89ef8ee27965115fd6b1ed12e42e793
3
+Subject: What's cooking in git.git (Mar 2017, #11; Mon, 27)
4
+X-master-at: e0ef7fe78c46e6919d249b9547948a3bb7321dea
5
+X-next-at: f7d0c115f90496503bfc6438d37aefdbb8a4e9f5
6
7
-What's cooking in git.git (Mar 2017, #10; Fri, 24)
7
+What's cooking in git.git (Mar 2017, #11; Mon, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,6 @@ 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
-The second maintenance release for v2.12.x series has just been
16
-tagged.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -23,115 +20,59 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
26
-* dl/credential-cache-socket-in-xdg-cache (2017-03-17) 3 commits
27
- (merged to 'next' on 2017-03-20 at 9de71bcce8)
28
- + credential-cache: add tests for XDG functionality
29
- + credential-cache: use XDG_CACHE_HOME for socket
30
- + path.c: add xdg_cache_home
31
-
32
- The default location "~/.git-credential-cache/socket" for the
33
- socket used to communicate with the credential-cache daemon has
34
- been moved to "~/.cache/git/credential/socket".
35
-
36
-
37
-* jk/execv-dashed-external (2017-03-18) 1 commit
38
- (merged to 'next' on 2017-03-20 at 62119fa314)
39
- + run-command: fix segfault when cleaning forked async process
40
-
41
- Fix for NO_PTHREADS build.
42
-
43
-
44
-* jk/sha1dc (2017-03-17) 6 commits
45
- (merged to 'next' on 2017-03-20 at 3455b6c19f)
46
- + Makefile: make DC_SHA1 the default
47
- + t0013: add a basic sha1 collision detection test
48
- + Makefile: add DC_SHA1 knob
49
- + sha1dc: disable safe_hash feature
50
- + sha1dc: adjust header includes for git
51
- + sha1dc: add collision-detecting sha1 implementation
52
-
53
- The "detect attempt to create collisions" variant of SHA-1
54
- implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft)
55
- has been integrated and made the default.
56
-
57
-
58
-* js/regexec-buf (2017-03-18) 1 commit
59
- (merged to 'next' on 2017-03-20 at 7381595eb7)
60
- + pickaxe: fix segfault with '-S<...> --pickaxe-regex'
23
+* jc/lint-runaway-here-doc (2017-03-23) 1 commit
24
+ (merged to 'next' on 2017-03-24 at c1f1ca1bd7)
25
+ + tests: lint for run-away here-doc
26
62
- Fix for potential segv introduced in v2.11.0 and later (also
63
- v2.10.2).
27
+ The test framework learned to detect unterminated here documents.
28
29
66
-* rs/http-push-cleanup (2017-03-18) 1 commit
67
- (merged to 'next' on 2017-03-20 at fcf8d30bc0)
68
- + http-push: don't check return value of lookup_unknown_object()
30
+* jk/prefix-filename (2017-03-21) 6 commits
31
+ (merged to 'next' on 2017-03-22 at 6d180ed430)
32
+ + bundle: use prefix_filename with bundle path
33
+ + prefix_filename: simplify windows #ifdef
34
+ + prefix_filename: return newly allocated string
35
+ + prefix_filename: drop length parameter
36
+ + prefix_filename: move docstring to header file
37
+ + hash-object: fix buffer reuse with --path in a subdirectory
38
70
- Code clean-up.
39
+ Code clean-up with minor bugfixes.
40
41
73
-* rs/path-name-safety-cleanup (2017-03-18) 1 commit
74
- (merged to 'next' on 2017-03-20 at 78ea574469)
75
- + revision: remove declaration of path_name()
42
+* jk/quote-env-path-list-component (2017-03-22) 1 commit
43
+ (merged to 'next' on 2017-03-24 at 78843c4f9d)
44
+ + t5615: fix a here-doc syntax error
45
77
- Code clean-up.
46
+ A test fix.
47
48
80
-* rs/shortlog-cleanup (2017-03-18) 1 commit
81
- (merged to 'next' on 2017-03-20 at a826dff5cf)
82
- + shortlog: don't set after_subject to an empty string
49
+* km/config-grammofix (2017-03-23) 1 commit
50
+ (merged to 'next' on 2017-03-24 at 75ddbbc6f9)
51
+ + doc/config: grammar fixes for core.{editor,commentChar}
52
84
- Code clean-up.
53
+ Doc update.
54
55
87
-* rs/update-hook-optim (2017-03-18) 1 commit
88
- (merged to 'next' on 2017-03-20 at f36ede55be)
89
- + receive-pack: simplify run_update_post_hook()
56
+* km/t1400-modernization (2017-03-21) 5 commits
57
+ (merged to 'next' on 2017-03-22 at e9c3154ca4)
58
+ + t1400: use test_when_finished for cleanup
59
+ + t1400: remove a set of unused output files
60
+ + t1400: use test_path_is_* helpers
61
+ + t1400: set core.logAllRefUpdates in "logged by touch" tests
62
+ + t1400: rename test descriptions to be unique
63
64
Code clean-up.
65
66
94
-* sg/test-with-stdin (2017-03-18) 2 commits
95
- (merged to 'next' on 2017-03-20 at a66fec5692)
96
- + tests: make the 'test_pause' helper work in non-verbose mode
97
- + tests: create an interactive gdb session with the 'debug' helper
98
-
99
- Teach the "debug" helper used in the test framework that allows a
100
- command to run under "gdb" to make the session interactive.
101
-
102
---------------------------------------------------
103
-[New Topics]
104
-
105
-* ab/test-readme-updates (2017-03-23) 4 commits
106
- - SQUASH???
107
- - t/README: clarify the test_have_prereq documentation
108
- - t/README: change "Inside <X> part" to "Inside the <X> part"
109
- - t/README: link to metacpan.org, not search.cpan.org
110
-
111
- Doc updates.
112
-
113
- Waiting for a reaction to SQUASH???
114
-
115
-
116
-* jk/quote-env-path-list-component (2017-03-22) 1 commit
117
- (merged to 'next' on 2017-03-24 at 78843c4f9d)
118
- + t5615: fix a here-doc syntax error
119
-
120
- A test fix.
121
-
122
- Will merge to 'master'.
123
-
124
-
125
-* js/rebase-i-reword-to-run-hooks (2017-03-23) 4 commits
126
- - SQUASH???
127
- - sequencer: allow the commit-msg hooks to run during a `reword`
128
- - sequencer: make commit options more extensible
129
- - t7504: document regression: reword no longer calls commit-msg
130
-
131
- A recent update to "rebase -i" stopped running hooks for the "git
132
- commit" command during "reword" action, which has been fixed.
67
+* sb/describe-broken (2017-03-22) 1 commit
68
+ (merged to 'next' on 2017-03-24 at 2262cbf415)
69
+ + builtin/describe: introduce --broken flag
70
134
- Waiting for a reaction to SQUASH???
71
+ "git describe --dirty" dies when it cannot be determined if the
72
+ state in the working tree matches that of HEAD (e.g. broken
73
+ repository or broken submodule). The command learned a new option
74
+ "git describe --broken" to give "$name-broken" (where $name is the
75
+ description of HEAD) in such a case.
76
77
78
* sb/push-options-via-transport (2017-03-22) 2 commits
@@ -143,8 +84,6 @@ of the repositories listed at
84
external remote helper interface; now the "smart HTTP" remote
85
helper understands what to do with the passed information.
86
146
- Will merge to 'master'.
147
-
87
88
* sb/submodule-update-initial-runs-custom-script (2017-03-22) 1 commit
89
(merged to 'next' on 2017-03-24 at 628200c3b1)
@@ -152,92 +91,97 @@ of the repositories listed at
91
92
A test fix.
93
155
- Will merge to 'master'.
156
-
94
158
-* ab/branch-list-doc (2017-03-24) 2 commits
159
- - branch doc: update description for `--list`
160
- - branch doc: change `git branch <pattern>` to use `<branchname>`
161
-
162
- Doc update.
163
-
164
- Will merge to 'next'.
95
+* sb/t3600-rephrase (2017-03-22) 1 commit
96
+ (merged to 'next' on 2017-03-24 at 5ec1eee490)
97
+ + t3600: rename test to describe its functionality
98
99
+ A test retitling.
100
167
-* km/config-grammofix (2017-03-23) 1 commit
168
- (merged to 'next' on 2017-03-24 at 75ddbbc6f9)
169
- + doc/config: grammar fixes for core.{editor,commentChar}
101
171
- Doc update.
102
+* st/verify-tag (2017-03-24) 1 commit
103
+ (merged to 'next' on 2017-03-24 at d26313d4ab)
104
+ + t7004, t7030: fix here-doc syntax errors
105
173
- Will merge to 'master'.
106
+ A few unterminated here documents in tests were fixed, which in
107
+ turn revealed incorrect expectations the tests make. These tests
108
+ have been updated.
109
110
+--------------------------------------------------
111
+[New Topics]
112
176
-* sg/completion-ctags (2017-03-23) 3 commits
177
- - completion: offer ctags symbol names for 'git log -S', '-G' and '-L:'
178
- - completion: extract completing ctags symbol names into helper function
179
- - completion: put matching ctags symbol names directly into COMPREPLY
180
- (this branch uses sg/completion-refs-speedup.)
113
+* ab/case-insensitive-upstream-and-push-marker (2017-03-27) 1 commit
114
+ - rev-parse: match @{upstream}, @{u} and @{push} case-insensitively
115
182
- Command line completion updates.
116
+ On many keyboards, typing "@{" involves holding down SHIFT key and
117
+ one can easily end up with "@{Up..." when typing "@{upstream}". As
118
+ the upstream/push keywords do not appear anywhere else in the syntax,
119
+ we can safely accept them case insensitively without introducing
120
+ ambiguity or confusion to solve this.
121
122
Will merge to 'next'.
123
124
187
-* sg/skip-prefix-in-prettify-refname (2017-03-23) 1 commit
188
- - refs.c: use skip_prefix() in prettify_refname()
189
-
190
- Code cleanup.
125
+* bc/object-id (2017-03-26) 21 commits
126
+ - Documentation: update and rename api-sha1-array.txt
127
+ - Rename sha1_array to oid_array
128
+ - Convert sha1_array_for_each_unique and for_each_abbrev to object_id
129
+ - Convert sha1_array_lookup to take struct object_id
130
+ - Convert remaining callers of sha1_array_lookup to object_id
131
+ - Make sha1_array_append take a struct object_id *
132
+ - sha1-array: convert internal storage for struct sha1_array to object_id
133
+ - builtin/pull: convert to struct object_id
134
+ - submodule: convert check_for_new_submodule_commits to object_id
135
+ - sha1_name: convert disambiguate_hint_fn to take object_id
136
+ - sha1_name: convert struct disambiguate_state to object_id
137
+ - test-sha1-array: convert most code to struct object_id
138
+ - parse-options-cb: convert sha1_array_append caller to struct object_id
139
+ - fsck: convert init_skiplist to struct object_id
140
+ - builtin/receive-pack: convert portions to struct object_id
141
+ - builtin/receive-pack: fix incorrect pointer arithmetic
142
+ - builtin/pull: convert portions to struct object_id
143
+ - builtin/diff: convert to struct object_id
144
+ - Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ
145
+ - Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
146
+ - Define new hash-size constants for allocating memory
147
+
148
+ Conversion from unsigned char [40] to struct object_id continues.
149
+
150
+
151
+* rs/freebsd-getcwd-workaround (2017-03-26) 1 commit
152
+ - strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD
153
+
154
+ FreeBSD implementation of getcwd(3) behaved differently when an
155
+ intermediate directory is unreadable/unsearchable depending on the
156
+ length of the buffer provided, which our strbuf_getcwd() was not
157
+ aware of. strbuf_getcwd() has been taught to cope with it better.
158
159
Will merge to 'next'.
160
161
195
-* jc/lint-runaway-here-doc (2017-03-23) 1 commit
196
- (merged to 'next' on 2017-03-24 at c1f1ca1bd7)
197
- + tests: lint for run-away here-doc
198
-
199
- The test framework learned to detect unterminated here documents.
200
-
201
- Will wait until all the other topics that correct unterminated here-doc
202
- graduates.
162
+* jk/sha1dc (2017-03-26) 1 commit
163
+ (merged to 'next' on 2017-03-27 at 91bf9f06b4)
164
+ + sha1dc: avoid CPP macro collisions
165
204
-
205
-* sb/submodule-short-status (2017-03-24) 7 commits
206
- - submodule.c: correctly handle nested submodules in is_submodule_modified
207
- - short status: improve reporting for submodule changes
208
- - submodule.c: stricter checking for submodules in is_submodule_modified
209
- - submodule.c: port is_submodule_modified to use porcelain 2
210
- - submodule.c: convert is_submodule_modified to use strbuf_getwholeline
211
- - submodule.c: factor out early loop termination in is_submodule_modified
212
- - submodule.c: use argv_array in is_submodule_modified
213
-
214
-
215
-* st/verify-tag (2017-03-24) 1 commit
216
- (merged to 'next' on 2017-03-24 at d26313d4ab)
217
- + t7004, t7030: fix here-doc syntax errors
218
-
219
- A few unterminated here documents in tests were fixed, which in
220
- turn revealed incorrect expectations the tests make. These tests
221
- have been updated.
166
+ sha1dc/sha1.c wanted to check the endianness of the target platform
167
+ at compilation time and used a CPP macro with a rather overly
168
+ generic name, "BIGENDIAN", to pass the result of the check around
169
+ in the file. It wasn't prepared for the same macro set to 0
170
+ (false) by the platform to signal that the target is _not_ a big
171
+ endian box, and assumed that the endianness detection logic it has
172
+ alone would be the one that is setting the macro, resulting in a
173
+ breakage on Windows. This has been fixed by using a bit less
174
+ generic name for the same purpose.
175
176
Will merge to 'master'.
177
178
226
-* jk/fast-import-cleanup (2017-03-24) 4 commits
227
- - pack.h: define largest possible encoded object size
228
- - encode_in_pack_object_header: respect output buffer length
229
- - fast-import: use xsnprintf for formatting headers
230
- - fast-import: use xsnprintf for writing sha1s
179
+* mg/describe-debug-l10n (2017-03-27) 2 commits
180
+ - l10n: de: translate describe debug terms
181
+ - describe: localize debug output fully
182
232
- Code clean-up.
233
-
234
- Will merge to 'next'.
235
-
236
-
237
-* jk/pager-in-use (2017-03-24) 1 commit
238
- - pager_in_use: use git_env_bool()
239
-
240
- Code clean-up.
183
+ Some debugging output from "git describe" were marked for l10n,
184
+ but some weren't. Mark missing ones for l10n.
185
186
Will merge to 'next'.
187
@@ -250,6 +194,7 @@ of the repositories listed at
194
Expecting a reroll.
195
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
196
cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
197
+ Some nits but looks ok.
198
199
200
* sk/dash-is-previous (2017-03-01) 5 commits
@@ -364,6 +309,98 @@ of the repositories listed at
309
--------------------------------------------------
310
[Cooking]
311
312
+* ab/test-readme-updates (2017-03-26) 3 commits
313
+ - t/README: clarify the test_have_prereq documentation
314
+ - t/README: change "Inside <X> part" to "Inside the <X> part"
315
+ - t/README: link to metacpan.org, not search.cpan.org
316
+
317
+ Doc updates.
318
+
319
+ Will merge to 'next'.
320
+
321
+
322
+* js/rebase-i-reword-to-run-hooks (2017-03-27) 3 commits
323
+ - sequencer: allow the commit-msg hooks to run during a `reword`
324
+ - sequencer: make commit options more extensible
325
+ - t7504: document regression: reword no longer calls commit-msg
326
+
327
+ A recent update to "rebase -i" stopped running hooks for the "git
328
+ commit" command during "reword" action, which has been fixed.
329
+
330
+ Will merge to 'next'.
331
+
332
+
333
+* ab/branch-list-doc (2017-03-24) 2 commits
334
+ (merged to 'next' on 2017-03-27 at 4bb47907ee)
335
+ + branch doc: update description for `--list`
336
+ + branch doc: change `git branch <pattern>` to use `<branchname>`
337
+
338
+ Doc update.
339
+
340
+ Will merge to 'master'.
341
+
342
+
343
+* sg/completion-ctags (2017-03-23) 3 commits
344
+ (merged to 'next' on 2017-03-27 at cf8c081f7d)
345
+ + completion: offer ctags symbol names for 'git log -S', '-G' and '-L:'
346
+ + completion: extract completing ctags symbol names into helper function
347
+ + completion: put matching ctags symbol names directly into COMPREPLY
348
+ (this branch uses sg/completion-refs-speedup.)
349
+
350
+ Command line completion updates.
351
+
352
+ Will merge to 'master'.
353
+
354
+
355
+* sg/skip-prefix-in-prettify-refname (2017-03-23) 1 commit
356
+ (merged to 'next' on 2017-03-27 at f7d0c115f9)
357
+ + refs.c: use skip_prefix() in prettify_refname()
358
+
359
+ Code cleanup.
360
+
361
+ Will merge to 'master'.
362
+
363
+
364
+* sb/submodule-short-status (2017-03-27) 7 commits
365
+ - submodule.c: correctly handle nested submodules in is_submodule_modified
366
+ - short status: improve reporting for submodule changes
367
+ - submodule.c: stricter checking for submodules in is_submodule_modified
368
+ - submodule.c: port is_submodule_modified to use porcelain 2
369
+ - submodule.c: convert is_submodule_modified to use strbuf_getwholeline
370
+ - submodule.c: factor out early loop termination in is_submodule_modified
371
+ - submodule.c: use argv_array in is_submodule_modified
372
+
373
+ The output from "git status --short" has been extended to show
374
+ various kinds of dirtyness in submodules differently; instead of to
375
+ "M" for modified, 'm' and '?' can be shown to signal changes only
376
+ to the working tree of the submodule but not the commit that is
377
+ checked out.
378
+
379
+ Waiting for further comments.
380
+ The endgame looked mostly OK.
381
+
382
+
383
+* jk/fast-import-cleanup (2017-03-24) 4 commits
384
+ (merged to 'next' on 2017-03-27 at 9f6058007f)
385
+ + pack.h: define largest possible encoded object size
386
+ + encode_in_pack_object_header: respect output buffer length
387
+ + fast-import: use xsnprintf for formatting headers
388
+ + fast-import: use xsnprintf for writing sha1s
389
+
390
+ Code clean-up.
391
+
392
+ Will merge to 'master'.
393
+
394
+
395
+* jk/pager-in-use (2017-03-24) 1 commit
396
+ (merged to 'next' on 2017-03-27 at 513f007025)
397
+ + pager_in_use: use git_env_bool()
398
+
399
+ Code clean-up.
400
+
401
+ Will merge to 'master'.
402
+
403
+
404
* jh/memihash-opt (2017-03-24) 8 commits
405
(merged to 'next' on 2017-03-24 at f1aa0c4d37)
406
+ name-hash: add test-lazy-init-name-hash to .gitignore
@@ -383,20 +420,21 @@ of the repositories listed at
420
421
422
* sg/completion-refs-speedup (2017-03-23) 14 commits
386
- - completion: speed up branch and tag completion
387
- - completion: fill COMPREPLY directly when completing fetch refspecs
388
- - completion: fill COMPREPLY directly when completing refs
389
- - completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
390
- - completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
391
- - completion: let 'for-each-ref' strip the remote name from remote branches
392
- - completion: let 'for-each-ref' and 'ls-remote' filter matching refs
393
- - completion: don't disambiguate short refs
394
- - completion: don't disambiguate tags and branches
395
- - completion: support excluding full refs
396
- - completion: support completing fully qualified non-fast-forward refspecs
397
- - completion: support completing full refs after '--option=refs/<TAB>'
398
- - completion: wrap __git_refs() for better option parsing
399
- - completion: remove redundant __gitcomp_nl() options from _git_commit()
423
+ (merged to 'next' on 2017-03-27 at 6bb275710d)
424
+ + completion: speed up branch and tag completion
425
+ + completion: fill COMPREPLY directly when completing fetch refspecs
426
+ + completion: fill COMPREPLY directly when completing refs
427
+ + completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
428
+ + completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
429
+ + completion: let 'for-each-ref' strip the remote name from remote branches
430
+ + completion: let 'for-each-ref' and 'ls-remote' filter matching refs
431
+ + completion: don't disambiguate short refs
432
+ + completion: don't disambiguate tags and branches
433
+ + completion: support excluding full refs
434
+ + completion: support completing fully qualified non-fast-forward refspecs
435
+ + completion: support completing full refs after '--option=refs/<TAB>'
436
+ + completion: wrap __git_refs() for better option parsing
437
+ + completion: remove redundant __gitcomp_nl() options from _git_commit()
438
(this branch is used by sg/completion-ctags.)
439
440
The refs completion for large number of refs has been sped up,
@@ -404,10 +442,10 @@ of the repositories listed at
442
eliminating most of the shell processing between 'git for-each-ref'
443
and 'ls-remote' and Bash's completion facility.
444
407
- Will merge to 'next'.
445
+ Will merge to 'master'.
446
447
410
-* mh/separate-ref-cache (2017-03-20) 20 commits
448
+* mh/separate-ref-cache (2017-03-27) 20 commits
449
- do_for_each_entry_in_dir(): delete function
450
- files_pack_refs(): use reference iteration
451
- commit_packed_refs(): use reference iteration
@@ -436,33 +474,6 @@ of the repositories listed at
474
Waiting for nd/files-backend-git-dir to settle.
475
476
439
-* jk/prefix-filename (2017-03-21) 6 commits
440
- (merged to 'next' on 2017-03-22 at 6d180ed430)
441
- + bundle: use prefix_filename with bundle path
442
- + prefix_filename: simplify windows #ifdef
443
- + prefix_filename: return newly allocated string
444
- + prefix_filename: drop length parameter
445
- + prefix_filename: move docstring to header file
446
- + hash-object: fix buffer reuse with --path in a subdirectory
447
-
448
- Code clean-up with minor bugfixes.
449
-
450
- Will merge to 'master'.
451
-
452
-
453
-* km/t1400-modernization (2017-03-21) 5 commits
454
- (merged to 'next' on 2017-03-22 at e9c3154ca4)
455
- + t1400: use test_when_finished for cleanup
456
- + t1400: remove a set of unused output files
457
- + t1400: use test_path_is_* helpers
458
- + t1400: set core.logAllRefUpdates in "logged by touch" tests
459
- + t1400: rename test descriptions to be unique
460
-
461
- Code clean-up.
462
-
463
- Will merge to 'master'.
464
-
465
-
477
* ah/log-decorate-default-to-auto (2017-03-24) 1 commit
478
(merged to 'next' on 2017-03-24 at ce353ebfb5)
479
+ log: if --decorate is not given, default to --decorate=auto
@@ -473,36 +484,13 @@ of the repositories listed at
484
Will merge to 'master'.
485
486
476
-* sb/describe-broken (2017-03-22) 1 commit
477
- (merged to 'next' on 2017-03-24 at 2262cbf415)
478
- + builtin/describe: introduce --broken flag
479
-
480
- "git describe --dirty" dies when it cannot be determined if the
481
- state in the working tree matches that of HEAD (e.g. broken
482
- repository or broken submodule). The command learned a new option
483
- "git describe --broken" to give "$name-broken" (where $name is the
484
- description of HEAD) in such a case.
485
-
486
- Will merge to 'master'.
487
-
488
-
489
-* sb/t3600-rephrase (2017-03-22) 1 commit
490
- (merged to 'next' on 2017-03-24 at 5ec1eee490)
491
- + t3600: rename test to describe its functionality
492
-
493
- A test retitling.
494
-
495
- Will merge to 'master'.
496
-
497
-
498
-* ab/doc-submitting (2017-03-21) 3 commits
499
- - SQUASH??? remove "alias" thing
487
+* ab/doc-submitting (2017-03-26) 2 commits
488
- doc/SubmittingPatches: show how to get a CLI commit summary
489
- doc/SubmittingPatches: clarify the casing convention for "area: change..."
490
491
Doc update.
492
505
- Any further comments?
493
+ Will merge to 'next'.
494
495
496
* bw/grep-recurse-submodules (2017-03-18) 2 commits
@@ -539,7 +527,7 @@ of the repositories listed at
527
Will merge to 'master'.
528
529
542
-* nd/prune-in-worktree (2017-03-18) 12 commits
530
+* nd/prune-in-worktree (2017-03-27) 12 commits
531
- rev-list: expose and document --single-worktree
532
- revision.c: --reflog add HEAD reflog from all worktrees
533
- files-backend: make reflog iterator go through per-worktree reflog
@@ -563,7 +551,7 @@ of the repositories listed at
551
Waiting for nd/files-backend-git-dir to settle.
552
553
566
-* nd/worktree-kill-parse-ref (2017-03-18) 4 commits
554
+* nd/worktree-kill-parse-ref (2017-03-27) 4 commits
555
- refs: kill set_worktree_head_symref()
556
- worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
557
- refs: introduce get_worktree_ref_store()
@@ -576,7 +564,7 @@ of the repositories listed at
564
Waiting for nd/files-backend-git-dir to settle.
565
566
579
-* nd/files-backend-git-dir (2017-03-18) 27 commits
567
+* nd/files-backend-git-dir (2017-03-27) 28 commits
568
- refs.h: add a note about sorting order of for_each_ref_*
569
- t1406: new tests for submodule ref store
570
- t1405: some basic tests on main ref store
@@ -595,13 +583,14 @@ of the repositories listed at
583
- refs: rename lookup_ref_store() to lookup_submodule_ref_store()
584
- refs.c: introduce get_main_ref_store()
585
- files-backend: remove the use of git_path()
598
- - files-backend: add and use files_refname_path()
586
+ - files-backend: add and use files_ref_path()
587
- files-backend: add and use files_reflog_path()
588
- files-backend: move "logs/" out of TMP_RENAMED_LOG
589
- files-backend: convert git_path() to strbuf_git_path()
590
- files-backend: make sure files_rename_ref() always reach the end
591
- files-backend: add and use files_packed_refs_path()
592
- files-backend: delete dead code in files_init_db()
593
+ - files-backend.c: delete dead code in files_ref_iterator_begin()
594
- files-backend: make files_log_ref_write() static
595
- refs.h: add forward declaration for structs used in this file
596
(this branch is used by mh/separate-ref-cache, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
@@ -611,11 +600,8 @@ of the repositories listed at
600
when dealing with ref_store that represents the set of refs visible
601
from the other worktrees.
602
614
- Expecting a reroll.
615
- cf. <CACsJy8A6mZGjNdFbhKgWAR=XSK+2mO-HG7Vayp7VODRJwu1ixA@mail.gmail.com>
616
- cf. <CACsJy8CC-BDHPLnE8DAXCxpttwgEsrQU9gzzc=PGsmFnh=XNpw@mail.gmail.com>
617
- cf. <20170322133412.e2oqmqekreyuf4gr@sigill.intra.peff.net>
618
- It is almost there; only a few minor niggles remain.
603
+ Will merge to 'next' after waiting for a few days for further comments.
604
+ Looking good.
605
606
607
* ab/ref-filter-no-contains (2017-03-24) 16 commits
@@ -644,7 +630,7 @@ of the repositories listed at
630
only the refs that are not descendants of X) has been added to
631
them.
632
647
- This looks ready for 'next'. Any comments?
633
+ Will merge to 'next'.
634
635
636
* jc/name-rev (2017-03-16) 2 commits
@@ -656,7 +642,7 @@ of the repositories listed at
642
Give the same precedence to lightweight tags as annotated tags as
643
the base for naming a commit.
644
659
- Any further comments?
645
+ Waiting for jc/p4-current-branch-fix to settle.
646
647
648
* bw/recurse-submodules-relative-fix (2017-03-17) 5 commits
@@ -670,14 +656,18 @@ of the repositories listed at
656
option misbehaved when started from a subdirectory of the
657
superproject.
658
659
+ Will merge to 'next'.
660
+
661
674
-* jc/p4-current-branch-fix (2017-03-17) 1 commit
662
+* jc/p4-current-branch-fix (2017-03-27) 2 commits
663
- DONTMERGE git-p4: "name-rev HEAD" is not a way to find the current branch
664
+ - git-p4: add failing test for name-rev rather than symbolic-ref
665
666
"git p4" used "name-rev HEAD" when it wants to learn what branch is
667
checked out; it should use "symbolic-ref HEAD".
668
680
- Waiting for git-p4 folks to send a finished patch.
669
+ The tip one (i.e. real fix) needs to be redone by somebody
670
+ competent with Python and git-p4 codebase.
671
672
673
* bw/submodule-is-active (2017-03-18) 10 commits