What's cooking (2016/06 #02)
Junio C Hamano committed
Jun 6, 2016 at 20:06 UTC
33678c59ed77213ac060f8832aa7b37d67f21b39
1 file changed
+387
-227
whats-cooking.txt
+387
-227
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2016, #01; Thu, 2)
4
-X-master-at: 60bd4b1c513bb652cdffad44382046ca872140eb
5
-X-next-at: 8a191e187a9dca3d786c0197f9610e627b4f4137
3
+Subject: What's cooking in git.git (Jun 2016, #02; Mon, 6)
4
+X-master-at: 49fa3dc76179e04b0833542fa52d0f287a4955ac
5
+X-next-at: 3cd93d08f085fd56ac81614bd2e920c3b50eacec
6
7
-What's cooking in git.git (Jun 2016, #01; Thu, 2)
7
+What's cooking in git.git (Jun 2016, #02; Mon, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +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.9-rc2 is scheduled for early next week. A handful low-impact
16
-topics are expected to be in 'master' by then.
15
+The hopefully final release candidate 2.9-rc2 together with 2.8.4
16
+has been pushed out.
17
+
18
+By the way, the tip of 'pu' is not expected to pass its own test
19
+suite, due to multiple broken topics queued near its tip. Earlier
20
+there was a talk about automatically bisecting breakage on 'pu', but
21
+tonight's pushout is a good illustration why that would not be very
22
+useful. What would be useful is (1) enumeration of commits on the
23
+first parent chain on master..pu, (2) test of the second parent of
24
+each of the commits found in (1), and (3) bisection between the
25
+broken commits in (2) and 'master', which would highlight broken
26
+topics and the commit(s) that might be responsible for each broken
27
+topic.
28
29
You can find the changes described here in the integration branches
30
of the repositories listed at
@@ -21,44 +32,79 @@ of the repositories listed at
32
http://git-blame.blogspot.com/p/git-public-repositories.html
33
34
--------------------------------------------------
24
-[New Topics]
35
+[Graduated to "master"]
36
26
-* et/add-chmod-x (2016-06-01) 2 commits
27
- - SQUASH??? add: add --chmod=+x / --chmod=-x options
28
- - add: add --chmod=+x / --chmod=-x options
37
+* bd/readme.markdown-more (2016-05-31) 1 commit
38
+ (merged to 'next' on 2016-06-02 at 1de7554)
39
+ + README.md: format CLI commands with code syntax
40
30
- Waiting for a reroll (or ack for proposed fixup).
41
+ The mark-up in the top-level README.md file has been updated to
42
+ typeset CLI command names differently from the body text.
43
44
33
-* jc/t2300-setup (2016-06-01) 1 commit
34
- - t2300: run git-sh-setup in an environment that better mimics the real life
45
+* em/man-bold-literal (2016-05-31) 1 commit
46
+ (merged to 'next' on 2016-06-02 at efb4156)
47
+ + Documentation: bold literals in man
48
36
- A test fix.
49
+ The manpage output of our documentation did not render well in
50
+ terminal; typeset literals in bold by default to make them stand
51
+ out more.
52
38
- Will merge to 'next'.
53
54
+* js/perf-rebase-i (2016-05-31) 1 commit
55
+ (merged to 'next' on 2016-05-31 at 39d8dc8)
56
+ + perf: make the tests work without a worktree
57
41
-* jk/shell-portability (2016-06-01) 2 commits
42
- - t5500 & t7403: lose bash-ism "local"
43
- - test-lib: add in-shell "env" replacement
58
+ The one in 'master' has a brown-paper-bag bug that breaks the perf
59
+ test when used inside a usual Git repository with a working tree.
60
45
- test fixes.
61
47
- Will merge to 'next'.
62
+* js/rebase-i-dedup-call-to-rerere (2016-05-31) 1 commit
63
+ (merged to 'next' on 2016-05-31 at db1f9e3)
64
+ + rebase -i: remove an unnecessary 'rerere' invocation
65
66
+ "git rebase -i", after it fails to auto-resolve the conflict, had
67
+ an unnecessary call to "git rerere" from its very early days, which
68
+ was spotted recently; the call has been removed.
69
50
-* mh/connect (2016-06-01) 9 commits
51
- - connect: move ssh command line preparation to a separate function
52
- - connect: actively reject git:// urls with a user part
53
- - connect: change the --diag-url output to separate user and host
54
- - connect: make parse_connect_url() return the user part of the url as a separate value
55
- - connect: group CONNECT_DIAG_URL handling code
56
- - connect: make parse_connect_url() return separated host and port
57
- - connect: re-derive a host:port string from the separate host and port variables
58
- - connect: call get_host_and_port() earlier
59
- - connect: document why we sometimes call get_port after get_host_and_port
70
61
- Needs review.
71
+* mm/makefile-developer-can-be-in-config-mak (2016-06-01) 2 commits
72
+ (merged to 'next' on 2016-06-02 at f3a0678)
73
+ + Makefile: add $(DEVELOPER_CFLAGS) variable
74
+ + Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
75
+
76
+ "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
77
+ config.mak didn't.
78
+
79
+
80
+* mr/send-email-doc-gmail-2fa (2016-06-01) 1 commit
81
+ (merged to 'next' on 2016-06-02 at cd2ade8)
82
+ + Documentation/git-send-email: fix typo in gmail 2FA section
83
+
84
+ Typofix.
85
+
86
+
87
+* pa/cherry-pick-doc-typo (2016-05-29) 1 commit
88
+ (merged to 'next' on 2016-06-02 at e2c2457)
89
+ + git-cherry-pick.txt: correct a small typo
90
+
91
+ "git cherry-pick --help" had three instances of word "behavior",
92
+ one of which was spelled "behaviour", which is updated to match the
93
+ other two.
94
+
95
+
96
+* rs/apply-name-terminate (2016-05-29) 1 commit
97
+ (merged to 'next' on 2016-06-02 at 8df9332)
98
+ + apply: remove unused parameters from name_terminate()
99
+
100
+ Code clean-up.
101
+
102
+
103
+* rs/patch-id-use-skip-prefix (2016-05-29) 1 commit
104
+ (merged to 'next' on 2016-06-02 at c993de3)
105
+ + patch-id: use starts_with() and skip_prefix()
106
+
107
+ Code clean-up.
108
109
110
* sb/submodule-helper-list-signal-unmatch-via-exit-status (2016-06-01) 1 commit
@@ -69,8 +115,6 @@ of the repositories listed at
115
The way how "submodule--helper list" signals unmatch error to its
116
callers has been updated.
117
72
- Will merge to 'master'.
73
-
118
119
* sb/submodule-helper-relative-path (2016-06-01) 1 commit
120
(merged to 'next' on 2016-06-02 at 8a191e1)
@@ -80,38 +124,159 @@ of the repositories listed at
124
A bash-ism "local" has been removed from "git submodule" scripted
125
Porcelain.
126
83
- Will merge to 'master'.
127
+--------------------------------------------------
128
+[New Topics]
129
130
+* wd/userdiff-css (2016-06-03) 1 commit
131
+ (merged to 'next' on 2016-06-06 at 536102f)
132
+ + userdiff: add built-in pattern for CSS
133
86
-* mr/send-email-doc-gmail-2fa (2016-06-01) 1 commit
87
- (merged to 'next' on 2016-06-02 at cd2ade8)
88
- + Documentation/git-send-email: fix typo in gmail 2FA section
134
+ Update the funcname definition to support css files.
135
90
- Typofix.
136
+ Will merge to 'master' after 2.9 final.
137
92
- Will merge to 'master'.
138
139
+* jc/attr-more (2016-06-03) 2 commits
140
+ - attr.c: pass struct git_attr_check down the callchain
141
+ - attr.c: add push_stack() helper
142
+ (this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)
143
95
-* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
96
- - upload-pack.c: use parse-options API
144
+ The beginning of long and tortuous journey to clean-up attribute
145
+ subsystem implementation.
146
98
- "git upload-pack" command has been updated to use the parse-options
99
- API.
147
101
- Will merge to 'next'.
148
+* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
149
+ (merged to 'next' on 2016-06-06 at dd9b30f)
150
+ + rev-list: disable bitmaps when "-n" is used with listing objects
151
+ + rev-list: "adjust" results of "--count --use-bitmap-index -n"
152
153
+ "git rev-list --count" whose walk-length is limited with "-n"
154
+ option did not work well with the counting optimized to look at the
155
+ bitmap index.
156
104
-* jc/clear-pathspec (2016-06-02) 1 commit
105
- - pathspec: rename free_pathspec() to clear_pathspec()
157
+ Will merge to 'master' after 2.9 final.
158
107
- We usually call a function that clears the contents a data
108
- structure X without freeing the structure itself clear_X(), and
109
- call a function that does clear_X() and also frees it free_X().
110
- free_pathspec() function has been renamed to clear_pathspec()
111
- to avoid confusion.
159
+
160
+* mh/ref-iterators (2016-06-03) 13 commits
161
+ (merged to 'next' on 2016-06-06 at c8e79dc)
162
+ + for_each_reflog(): reimplement using iterators
163
+ + dir_iterator: new API for iterating over a directory tree
164
+ + for_each_reflog(): don't abort for bad references
165
+ + do_for_each_ref(): reimplement using reference iteration
166
+ + refs: introduce an iterator interface
167
+ + ref_resolves_to_object(): new function
168
+ + entry_resolves_to_object(): rename function from ref_resolves_to_object()
169
+ + get_ref_cache(): only create an instance if there is a submodule
170
+ + remote rm: handle symbolic refs correctly
171
+ + delete_refs(): add a flags argument
172
+ + refs: use name "prefix" consistently
173
+ + do_for_each_ref(): move docstring to the header file
174
+ + refs: remove unnecessary "extern" keywords
175
+ (this branch uses mh/split-under-lock.)
176
+
177
+ The API to iterate over all the refs (i.e. for_each_ref(), etc.)
178
+ has been revamped.
179
+
180
+ Will merge to 'master' after 2.9 final.
181
+
182
+
183
+* ew/mboxrd-format-am (2016-06-06) 3 commits
184
+ - am: support --patch-format=mboxrd
185
+ - mailsplit: support unescaping mboxrd messages
186
+ - pretty: support "mboxrd" output format
187
+
188
+ Teach format-patch and mailsplit (hence "am") how a line that
189
+ happens to begin with "From " in the e-mail message is quoted with
190
+ ">", so that these lines can be restored to their original shape.
191
+
192
+
193
+* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
194
+ - receive-pack: send auto-gc output over sideband 2
195
+
196
+ Allow messages that are generated by auto gc during "git push" on
197
+ the receiving end to be explicitly passed back to the sending end
198
+ over sideband, so that they are shown with "remote: " prefix to
199
+ avoid confusing the users.
200
+
201
+
202
+* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
203
+ - cherry-pick: allow to pick to unborn branches
204
+
205
+ "git cherry-pick A" worked on an unborn branch, but "git
206
+ cherry-pick A..B" didn't.
207
+
208
+
209
+* mj/log-show-signature-conf (2016-06-06) 2 commits
210
+ - log: "--no-show-signature" commmand-line option
211
+ - log: add "log.showsignature" configuration variable
212
+
213
+ "git log" learns log.showSignature configuration variable, and a
214
+ command line option "--no-show-signature" to countermand it.
215
+
216
+ The order of the commits in the topic need to be reversed.
217
+
218
+
219
+* nd/i-t-a-commitable (2016-06-06) 3 commits
220
+ - commit: don't count i-t-a entries when checking if the new commit is empty
221
+ - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
222
+ - diff.h: extend "flags" field to 64 bits because we're out of bits
223
+
224
+
225
+* sg/reflog-past-root (2016-06-06) 1 commit
226
+ - reflog: continue walking the reflog past root commits
227
+
228
+ "git reflog" stopped upon seeing an entry that denotes a branch
229
+ creation event (aka "unborn"), which made it appear as if the
230
+ reflog was truncated.
231
+
232
+
233
+* tb/complete-status (2016-06-06) 3 commits
234
+ - completion: add git status
235
+ - completion: add __git_get_option_value helper
236
+ - completion: factor out untracked file modes into a variable
237
+
238
+ The completion script (in contrib/) learned to complete "git
239
+ status" options.
240
+
241
+
242
+* tr/doc-tt (2016-06-06) 3 commits
243
+ - doc: change configuration variables format
244
+ - doc: change environment variables format
245
+ - doc: clearer rule about formatting literals
246
+
247
+ The documentation set has been updated so that literal commands,
248
+ configuration variables and environment variables are consistently
249
+ typeset in fixed-width font and bold in manpages.
250
+
251
+
252
+* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
253
+ - git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
254
+
255
+ The git-prompt scriptlet (in contrib/) was not friendly with those
256
+ who uses "set -u", which has been fixed.
257
+
258
+
259
+* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
260
+ - regex: fix a SIZE_MAX macro redefinition warning
261
+
262
+ A compilation fix.
263
264
Will merge to 'next'.
265
266
+
267
+* bc/cocci-object-id (2016-06-06) 8 commits
268
+ - merge-recursive: convert merge_recursive_generic to object_id
269
+ - merge-recursive: convert leaf functions to use struct object_id
270
+ - merge-recursive: convert struct merge_file_info to object_id
271
+ - merge-recursive: convert struct stage_data to use object_id
272
+ - Rename struct diff_filespec's sha1_valid member.
273
+ - Convert struct diff_filespec to struct object_id
274
+ - Apply standard object_id Coccinelle transformations.
275
+ - Add basic Coccinelle transforms.
276
+
277
+ Move from "unsigned char [20]" to "struct object_id" continues,
278
+ with help from an automated tool.
279
+
280
--------------------------------------------------
281
[Stalled]
282
@@ -330,17 +495,70 @@ of the repositories listed at
495
--------------------------------------------------
496
[Cooking]
497
333
-* js/rebase-i-dedup-call-to-rerere (2016-05-31) 1 commit
334
- (merged to 'next' on 2016-05-31 at db1f9e3)
335
- + rebase -i: remove an unnecessary 'rerere' invocation
498
+* et/add-chmod-x (2016-06-01) 2 commits
499
+ - SQUASH??? add: add --chmod=+x / --chmod=-x options
500
+ - add: add --chmod=+x / --chmod=-x options
501
337
- "git rebase -i", after it fails to auto-resolve the conflict, had
338
- an unnecessary call to "git rerere" from its very early days, which
339
- was spotted recently; the call has been removed.
502
+ Waiting for a reroll (or ack for proposed fixup).
503
+
504
+
505
+* jc/t2300-setup (2016-06-01) 1 commit
506
+ (merged to 'next' on 2016-06-06 at 20f7f83)
507
+ + t2300: run git-sh-setup in an environment that better mimics the real life
508
+
509
+ A test fix.
510
511
Will merge to 'master'.
512
513
514
+* jk/shell-portability (2016-06-01) 2 commits
515
+ (merged to 'next' on 2016-06-06 at 5de784e)
516
+ + t5500 & t7403: lose bash-ism "local"
517
+ + test-lib: add in-shell "env" replacement
518
+
519
+ test fixes.
520
+
521
+ Will merge to 'master'.
522
+
523
+
524
+* mh/connect (2016-06-06) 10 commits
525
+ - connect: [host:port] is legacy for ssh
526
+ - connect: move ssh command line preparation to a separate function
527
+ - connect: actively reject git:// urls with a user part
528
+ - connect: change the --diag-url output to separate user and host
529
+ - connect: make parse_connect_url() return the user part of the url as a separate value
530
+ - connect: group CONNECT_DIAG_URL handling code
531
+ - connect: make parse_connect_url() return separated host and port
532
+ - connect: re-derive a host:port string from the separate host and port variables
533
+ - connect: call get_host_and_port() earlier
534
+ - connect: document why we sometimes call get_port after get_host_and_port
535
+
536
+ Ok, folks, is everybody happy with this version?
537
+
538
+
539
+* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
540
+ (merged to 'next' on 2016-06-06 at 505f1ee)
541
+ + upload-pack.c: use parse-options API
542
+
543
+ "git upload-pack" command has been updated to use the parse-options
544
+ API.
545
+
546
+ Will merge to 'master' after 2.9 final.
547
+
548
+
549
+* jc/clear-pathspec (2016-06-02) 1 commit
550
+ (merged to 'next' on 2016-06-06 at 9e7e291)
551
+ + pathspec: rename free_pathspec() to clear_pathspec()
552
+
553
+ We usually call a function that clears the contents a data
554
+ structure X without freeing the structure itself clear_X(), and
555
+ call a function that does clear_X() and also frees it free_X().
556
+ free_pathspec() function has been renamed to clear_pathspec()
557
+ to avoid confusion.
558
+
559
+ Will merge to 'master' after 2.9 final.
560
+
561
+
562
* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
563
(merged to 'next' on 2016-05-31 at 1ee161c)
564
+ submodule update: learn `--[no-]recommend-shallow` option
@@ -389,27 +607,6 @@ of the repositories listed at
607
Is everybody happy with this version?
608
609
392
-* bd/readme.markdown-more (2016-05-31) 1 commit
393
- (merged to 'next' on 2016-06-02 at 1de7554)
394
- + README.md: format CLI commands with code syntax
395
-
396
- The mark-up in the top-level README.md file has been updated to
397
- typeset CLI command names differently from the body text.
398
-
399
- Will merge to 'master'.
400
-
401
-
402
-* em/man-bold-literal (2016-05-31) 1 commit
403
- (merged to 'next' on 2016-06-02 at efb4156)
404
- + Documentation: bold literals in man
405
-
406
- The manpage output of our documentation did not render well in
407
- terminal; typeset literals in bold by default to make them stand
408
- out more.
409
-
410
- Will merge to 'master'.
411
-
412
-
610
* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
611
(merged to 'next' on 2016-06-02 at 3959ef6)
612
+ worktree: allow "-" short-hand for @{-1} in add command
@@ -420,16 +617,6 @@ of the repositories listed at
617
Will merge to 'master' after 2.9 final.
618
619
423
-* js/perf-rebase-i (2016-05-31) 1 commit
424
- (merged to 'next' on 2016-05-31 at 39d8dc8)
425
- + perf: make the tests work without a worktree
426
-
427
- The one in 'master' has a brown-paper-bag bug that breaks the perf
428
- test when used inside a usual Git repository with a working tree.
429
-
430
- Will merge to 'master'.
431
-
432
-
620
* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
621
- blame: require 0 context lines while finding moved lines with -M
622
@@ -438,23 +625,12 @@ of the repositories listed at
625
We may want to squash a test or two to this commit. Volunteers?
626
627
441
-* mm/makefile-developer-can-be-in-config-mak (2016-06-01) 2 commits
442
- (merged to 'next' on 2016-06-02 at f3a0678)
443
- + Makefile: add $(DEVELOPER_CFLAGS) variable
444
- + Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
445
-
446
- "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
447
- config.mak didn't.
448
-
449
- Will merge to 'master' after 2.9 final.
450
-
451
-
452
-* nd/worktree-lock (2016-05-31) 6 commits
628
+* nd/worktree-lock (2016-06-03) 6 commits
629
+ - worktree.c: find_worktree() search by path suffix
630
- worktree: add "unlock" command
631
- worktree: add "lock" command
455
- - worktree.c: retrieve lock status (and optionally reason) in get_worktrees()
632
+ - worktree.c: add is_worktree_locked()
633
- worktree.c: add is_main_worktree()
457
- - worktree.c: find_worktree() learns to identify worktrees by basename
634
- worktree.c: add find_worktree()
635
(this branch uses nd/worktree-cleanup-post-head-protection.)
636
@@ -463,36 +639,7 @@ of the repositories listed at
639
command learned a dedicated command pair to create and remoev such
640
a file, so that the users do not have to do this with editor.
641
466
- Expecting a reroll.
467
-
468
-
469
-* pa/cherry-pick-doc-typo (2016-05-29) 1 commit
470
- (merged to 'next' on 2016-06-02 at e2c2457)
471
- + git-cherry-pick.txt: correct a small typo
472
-
473
- "git cherry-pick --help" had three instances of word "behavior",
474
- one of which was spelled "behaviour", which is updated to match the
475
- other two.
476
-
477
- Will merge to 'master'.
478
-
479
-
480
-* rs/apply-name-terminate (2016-05-29) 1 commit
481
- (merged to 'next' on 2016-06-02 at 8df9332)
482
- + apply: remove unused parameters from name_terminate()
483
-
484
- Code clean-up.
485
-
486
- Will merge to 'master'.
487
-
488
-
489
-* rs/patch-id-use-skip-prefix (2016-05-29) 1 commit
490
- (merged to 'next' on 2016-06-02 at c993de3)
491
- + patch-id: use starts_with() and skip_prefix()
492
-
493
- Code clean-up.
494
-
495
- Will merge to 'master'.
642
+ Ok, folks, is everybody happy with this version?
643
644
645
* et/pretty-format-c-auto (2016-05-27) 1 commit
@@ -563,7 +710,7 @@ of the repositories listed at
710
Will merge to 'master' after 2.9 final.
711
712
566
-* sb/submodule-default-paths (2016-05-26) 7 commits
713
+* sb/submodule-default-paths (2016-05-26) 11 commits
714
- clone: add --init-submodule=<pathspec> switch
715
- submodule update: add `--init-default-path` switch
716
- Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
@@ -571,9 +718,14 @@ of the repositories listed at
718
- Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
719
- Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
720
- Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
574
- (this branch uses jc/attr and sb/pathspec-label.)
721
+ (merged to 'next' on 2016-05-31 at e72b604)
722
+ + pathspec: allow querying for attributes
723
+ + pathspec: move prefix check out of the inner loop
724
+ + pathspec: move long magic parsing out of prefix_pathspec
725
+ + Documentation: fix a typo
726
+ (this branch uses jc/attr; is tangled with jc/attr-more and sb/pathspec-label.)
727
576
- Will merge to 'next'.
728
+ Will hold.
729
730
731
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
@@ -616,62 +768,65 @@ of the repositories listed at
768
+ attr.c: update a stale comment on "struct match_attr"
769
+ attr.c: use strchrnul() to scan for one line
770
+ commit.c: use strchrnul() to scan for one line
619
- (this branch is used by sb/pathspec-label and sb/submodule-default-paths.)
771
+ (this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
772
773
The attributes API has been updated so that it can later be
774
optimized using the knowledge of which attributes are queried.
775
776
625
-* cc/apply-introduce-state (2016-06-01) 49 commits
626
- - builtin/apply: move 'newfd' global into 'struct apply_state'
627
- - builtin/apply: move 'lock_file' global into 'struct apply_state'
628
- - builtin/apply: move applying patches into apply_all_patches()
629
- - builtin/apply: move 'state' check into check_apply_state()
630
- - builtin/apply: move 'symlink_changes' global into 'struct apply_state'
631
- - builtin/apply: move 'fn_table' global into 'struct apply_state'
632
- - builtin/apply: move 'state_linenr' global into 'struct apply_state'
633
- - builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
634
- - builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
635
- - builtin/apply: move 'ws_error_action' into 'struct apply_state'
636
- - builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
637
- - builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
638
- - builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
639
- - builtin/apply: move 'whitespace_option' into 'struct apply_state'
640
- - builtin/apply: move 'whitespace_error' global into 'struct apply_state'
641
- - builtin/apply: move 'root' global into 'struct apply_state'
642
- - builtin/apply: move 'p_value_known' global into 'struct apply_state'
643
- - builtin/apply: move 'p_value' global into 'struct apply_state'
644
- - builtin/apply: move 'has_include' global into 'struct apply_state'
645
- - builtin/apply: move 'limit_by_name' global into 'struct apply_state'
646
- - builtin/apply: move 'patch_input_file' global into 'struct apply_state'
647
- - builtin/apply: move 'apply' global into 'struct apply_state'
648
- - builtin/apply: move 'p_context' global into 'struct apply_state'
649
- - builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
650
- - builtin/apply: move 'line_termination' global into 'struct apply_state'
651
- - builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
652
- - builtin/apply: move 'no_add' global into 'struct apply_state'
653
- - builtin/apply: move 'threeway' global into 'struct apply_state'
654
- - builtin/apply: move 'summary' global into 'struct apply_state'
655
- - builtin/apply: move 'numstat' global into 'struct apply_state'
656
- - builtin/apply: move 'diffstat' global into 'struct apply_state'
657
- - builtin/apply: move 'cached' global into 'struct apply_state'
658
- - builtin/apply: move 'allow_overlap' global into 'struct apply_state'
659
- - builtin/apply: move 'update_index' global into 'struct apply_state'
660
- - builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
661
- - builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
662
- - builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
663
- - builtin/apply: move 'check_index' global into 'struct apply_state'
664
- - builtin/apply: move 'check' global into 'struct apply_state'
665
- - builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
666
- - builtin/apply: move 'state' init into init_apply_state()
667
- - builtin/apply: introduce 'struct apply_state' to start libifying
668
- - builtin/apply: move 'read_stdin' global into cmd_apply()
669
- - builtin/apply: move 'options' variable into cmd_apply()
670
- - builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
671
- - builtin/apply: avoid local variable shadowing 'len' parameter
672
- - builtin/apply: avoid parameter shadowing 'linenr' global
673
- - builtin/apply: avoid parameter shadowing 'p_value' global
674
- - builtin/apply: make gitdiff_verify_name() return void
777
+* cc/apply-introduce-state (2016-06-06) 50 commits
778
+ (merged to 'next' on 2016-06-06 at 9f6bdcb)
779
+ + builtin/apply: remove misleading comment on lock_file field
780
+ (merged to 'next' on 2016-06-03 at 1ab0cf9)
781
+ + builtin/apply: move 'newfd' global into 'struct apply_state'
782
+ + builtin/apply: add 'lock_file' pointer into 'struct apply_state'
783
+ + builtin/apply: move applying patches into apply_all_patches()
784
+ + builtin/apply: move 'state' check into check_apply_state()
785
+ + builtin/apply: move 'symlink_changes' global into 'struct apply_state'
786
+ + builtin/apply: move 'fn_table' global into 'struct apply_state'
787
+ + builtin/apply: move 'state_linenr' global into 'struct apply_state'
788
+ + builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
789
+ + builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
790
+ + builtin/apply: move 'ws_error_action' into 'struct apply_state'
791
+ + builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
792
+ + builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
793
+ + builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
794
+ + builtin/apply: move 'whitespace_option' into 'struct apply_state'
795
+ + builtin/apply: move 'whitespace_error' global into 'struct apply_state'
796
+ + builtin/apply: move 'root' global into 'struct apply_state'
797
+ + builtin/apply: move 'p_value_known' global into 'struct apply_state'
798
+ + builtin/apply: move 'p_value' global into 'struct apply_state'
799
+ + builtin/apply: move 'has_include' global into 'struct apply_state'
800
+ + builtin/apply: move 'limit_by_name' global into 'struct apply_state'
801
+ + builtin/apply: move 'patch_input_file' global into 'struct apply_state'
802
+ + builtin/apply: move 'apply' global into 'struct apply_state'
803
+ + builtin/apply: move 'p_context' global into 'struct apply_state'
804
+ + builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
805
+ + builtin/apply: move 'line_termination' global into 'struct apply_state'
806
+ + builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
807
+ + builtin/apply: move 'no_add' global into 'struct apply_state'
808
+ + builtin/apply: move 'threeway' global into 'struct apply_state'
809
+ + builtin/apply: move 'summary' global into 'struct apply_state'
810
+ + builtin/apply: move 'numstat' global into 'struct apply_state'
811
+ + builtin/apply: move 'diffstat' global into 'struct apply_state'
812
+ + builtin/apply: move 'cached' global into 'struct apply_state'
813
+ + builtin/apply: move 'allow_overlap' global into 'struct apply_state'
814
+ + builtin/apply: move 'update_index' global into 'struct apply_state'
815
+ + builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
816
+ + builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
817
+ + builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
818
+ + builtin/apply: move 'check_index' global into 'struct apply_state'
819
+ + builtin/apply: move 'check' global into 'struct apply_state'
820
+ + builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
821
+ + builtin/apply: move 'state' init into init_apply_state()
822
+ + builtin/apply: introduce 'struct apply_state' to start libifying
823
+ + builtin/apply: move 'read_stdin' global into cmd_apply()
824
+ + builtin/apply: move 'options' variable into cmd_apply()
825
+ + builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
826
+ + builtin/apply: avoid local variable shadowing 'len' parameter
827
+ + builtin/apply: avoid parameter shadowing 'linenr' global
828
+ + builtin/apply: avoid parameter shadowing 'p_value' global
829
+ + builtin/apply: make gitdiff_verify_name() return void
830
831
The "git apply" standalone program is being libified; this is the
832
first step to move many state variables into a structure that can
@@ -684,8 +839,7 @@ of the repositories listed at
839
review the above first and give the remainder of the series a solid
840
base to build on.
841
687
- Expecting an update.
688
- ($gmane/296136)
842
+ Will hold.
843
844
845
* pb/bisect (2016-05-24) 3 commits
@@ -696,19 +850,24 @@ of the repositories listed at
850
Beginning of GSoC "git bisect" project.
851
852
699
-* sb/pathspec-label (2016-05-25) 4 commits
853
+* sb/pathspec-label (2016-06-03) 6 commits
854
+ (merged to 'next' on 2016-06-03 at 362f097)
855
+ + pathspec: disable preload-index when attribute pathspec magic is in use
856
+ + pathspec: allow escaped query values
857
(merged to 'next' on 2016-05-31 at e72b604)
858
+ pathspec: allow querying for attributes
859
+ pathspec: move prefix check out of the inner loop
860
+ pathspec: move long magic parsing out of prefix_pathspec
861
+ Documentation: fix a typo
705
- (this branch is used by sb/submodule-default-paths; uses jc/attr.)
862
+ (this branch uses jc/attr; is tangled with jc/attr-more and sb/submodule-default-paths.)
863
864
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
865
to limit paths that match $pattern further by attribute settings.
866
+ The preload-index mechanism is disabled when the new pathspec magic
867
+ is in use (at least for now), because the attribute subsystem is
868
+ not thread-ready.
869
710
- This breaks anything that uses preload-index with the new pathspec
711
- magic, because the attribute subsystem is not thread-ready.
870
+ Will hold.
871
872
873
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
@@ -727,45 +886,46 @@ of the repositories listed at
886
887
888
* mh/split-under-lock (2016-05-13) 33 commits
730
- - lock_ref_sha1_basic(): only handle REF_NODEREF mode
731
- - commit_ref_update(): remove the flags parameter
732
- - lock_ref_for_update(): don't resolve symrefs
733
- - lock_ref_for_update(): don't re-read non-symbolic references
734
- - refs: resolve symbolic refs first
735
- - ref_transaction_update(): check refname_is_safe() at a minimum
736
- - unlock_ref(): move definition higher in the file
737
- - lock_ref_for_update(): new function
738
- - add_update(): initialize the whole ref_update
739
- - verify_refname_available(): adjust constness in declaration
740
- - refs: don't dereference on rename
741
- - refs: allow log-only updates
742
- - delete_branches(): use resolve_refdup()
743
- - ref_transaction_commit(): correctly report close_ref() failure
744
- - ref_transaction_create(): disallow recursive pruning
745
- - refs: make error messages more consistent
746
- - lock_ref_sha1_basic(): remove unneeded local variable
747
- - read_raw_ref(): move docstring to header file
748
- - read_raw_ref(): improve docstring
749
- - read_raw_ref(): rename symref argument to referent
750
- - read_raw_ref(): clear *type at start of function
751
- - read_raw_ref(): rename flags argument to type
752
- - ref_transaction_commit(): remove local variable n
753
- - rename_ref(): remove unneeded local variable
754
- - commit_ref_update(): write error message to *err, not stderr
755
- - refname_is_safe(): insist that the refname already be normalized
756
- - refname_is_safe(): don't allow the empty string
757
- - refname_is_safe(): use skip_prefix()
758
- - remove_dir_recursively(): add docstring
759
- - safe_create_leading_directories(): improve docstring
760
- - read_raw_ref(): don't get confused by an empty directory
761
- - commit_ref(): if there is an empty dir in the way, delete it
762
- - t1404: demonstrate a bug resolving references
889
+ (merged to 'next' on 2016-06-03 at 2e71330)
890
+ + lock_ref_sha1_basic(): only handle REF_NODEREF mode
891
+ + commit_ref_update(): remove the flags parameter
892
+ + lock_ref_for_update(): don't resolve symrefs
893
+ + lock_ref_for_update(): don't re-read non-symbolic references
894
+ + refs: resolve symbolic refs first
895
+ + ref_transaction_update(): check refname_is_safe() at a minimum
896
+ + unlock_ref(): move definition higher in the file
897
+ + lock_ref_for_update(): new function
898
+ + add_update(): initialize the whole ref_update
899
+ + verify_refname_available(): adjust constness in declaration
900
+ + refs: don't dereference on rename
901
+ + refs: allow log-only updates
902
+ + delete_branches(): use resolve_refdup()
903
+ + ref_transaction_commit(): correctly report close_ref() failure
904
+ + ref_transaction_create(): disallow recursive pruning
905
+ + refs: make error messages more consistent
906
+ + lock_ref_sha1_basic(): remove unneeded local variable
907
+ + read_raw_ref(): move docstring to header file
908
+ + read_raw_ref(): improve docstring
909
+ + read_raw_ref(): rename symref argument to referent
910
+ + read_raw_ref(): clear *type at start of function
911
+ + read_raw_ref(): rename flags argument to type
912
+ + ref_transaction_commit(): remove local variable n
913
+ + rename_ref(): remove unneeded local variable
914
+ + commit_ref_update(): write error message to *err, not stderr
915
+ + refname_is_safe(): insist that the refname already be normalized
916
+ + refname_is_safe(): don't allow the empty string
917
+ + refname_is_safe(): use skip_prefix()
918
+ + remove_dir_recursively(): add docstring
919
+ + safe_create_leading_directories(): improve docstring
920
+ + read_raw_ref(): don't get confused by an empty directory
921
+ + commit_ref(): if there is an empty dir in the way, delete it
922
+ + t1404: demonstrate a bug resolving references
923
+ (this branch is used by mh/ref-iterators.)
924
925
Further preparatory work on the refs API before the pluggable
926
backend series can land.
927
767
- Updated (again). Will wait for comments for the last time, and
768
- then merge to 'next'.
928
+ Will merge to 'master' after 2.9 final.
929
930
931
* ew/fast-import-unpack-limit (2016-05-29) 2 commits