What's cooking (2015-08 #06)
Junio C Hamano committed
Aug 31, 2015 at 16:20 UTC
cb6ee5233818c36b6fd27e3b6635c5efba285f4b
1 file changed
+253
-288
whats-cooking.txt
+253
-288
@@ -1,16 +1,23 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2015, #05; Fri, 28)
4
-X-master-at: aecce6d0eff68a7144e32247d2e02d9974772ab1
5
-X-next-at: bcd55f746af0c6584187e548b53df1562e68a14d
3
+Subject: What's cooking in git.git (Aug 2015, #06; Mon, 31)
4
+X-master-at: 16163602bacb2804d00d599049a62b7af0b0b7b6
5
+X-next-at: 7a4f88f1005d1360c4762c403490bf540d65766b
6
7
-What's cooking in git.git (Aug 2015, #05; Fri, 28)
7
+What's cooking in git.git (Aug 2015, #06; Mon, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
+A handful of topics have been merged to 'master'. Because there
15
+still are a few obviously good and trivially safe fixes cooking in
16
+'next', it would be pretty much meaningless to tag today's state
17
+as -rc0 (not that -rc0 has meant that much in the first place), so
18
+I'll wait for a few days and merge the remaining such topics from
19
+'next' to 'master' and then tag the -rc0.
20
+
21
You can find the changes described here in the integration branches
22
of the repositories listed at
23
@@ -19,196 +26,181 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
22
-* as/docfix-reflog-expire-unreachable (2015-08-21) 1 commit
23
- (merged to 'next' on 2015-08-25 at eb75d55)
24
- + Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable
25
-
26
- Docfix.
27
-
28
-
29
-* cc/trailers-corner-case-fix (2015-08-21) 1 commit
30
- (merged to 'next' on 2015-08-25 at ac25d80)
31
- + trailer: ignore first line of message
32
-
33
- "interpret-trailers" helper mistook a single-liner log message that
34
- has a colon as the end of existing trailer.
35
-
36
-
37
-* dt/untracked-sparse (2015-08-19) 1 commit
38
- (merged to 'next' on 2015-08-25 at 2501a7e)
39
- + t7063: use --force-untracked-cache to speed up a bit
40
- (this branch is used by dt/untracked-subdir.)
41
-
42
- Test update.
43
-
44
-
45
-* dt/untracked-subdir (2015-08-19) 2 commits
46
- (merged to 'next' on 2015-08-25 at ab4fd04)
47
- + untracked cache: fix entry invalidation
48
- + untracked-cache: fix subdirectory handling
49
- (this branch uses dt/untracked-sparse.)
29
+* db/push-sign-if-asked (2015-08-19) 9 commits
30
+ (merged to 'next' on 2015-08-26 at a7a32e9)
31
+ + push: add a config option push.gpgSign for default signed pushes
32
+ + push: support signing pushes iff the server supports it
33
+ + builtin/send-pack.c: use parse_options API
34
+ + config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool
35
+ + transport: remove git_transport_options.push_cert
36
+ + gitremote-helpers.txt: document pushcert option
37
+ + Documentation/git-send-pack.txt: document --signed
38
+ + Documentation/git-send-pack.txt: wrap long synopsis line
39
+ + Documentation/git-push.txt: document when --signed may fail
40
51
- The experimental untracked-cache feature were buggy when paths with
52
- a few levels of subdirectories are involved.
41
+ The client side codepaths in "git push" have been cleaned up
42
+ and the user can request to perform an optional "signed push",
43
+ i.e. sign only when the other end accepts signed push.
44
45
55
-* ep/http-configure-ssl-version (2015-08-17) 1 commit
56
- (merged to 'next' on 2015-08-19 at aab726b)
57
- + http: add support for specifying the SSL version
46
+* hv/submodule-config (2015-08-19) 4 commits
47
+ (merged to 'next' on 2015-08-25 at 82adb30)
48
+ + submodule: allow erroneous values for the fetchRecurseSubmodules option
49
+ + submodule: use new config API for worktree configurations
50
+ + submodule: extract functions for config set and lookup
51
+ + submodule: implement a config API for lookup of .gitmodules values
52
+ (this branch is used by sb/submodule-helper.)
53
59
- A new configuration variable http.sslVersion can be used to specify
60
- what specific version of SSL/TLS to use to make a connection.
54
+ The gitmodules API accessed from the C code learned to cache stuff
55
+ lazily.
56
57
63
-* jc/calloc-pathspec (2015-08-20) 1 commit
64
- (merged to 'next' on 2015-08-25 at 877490c)
65
- + ps_matched: xcalloc() takes nmemb and then element size
58
+* jc/am-state-fix (2015-08-25) 5 commits
59
+ (merged to 'next' on 2015-08-25 at 4efcd88)
60
+ + write_file(): drop caller-supplied LF from calls to create a one-liner file
61
+ + write_file_v(): do not leave incomplete line at the end
62
+ + write_file(): drop "fatal" parameter
63
+ + builtin/am: make sure state files are text
64
+ + builtin/am: introduce write_state_*() helper functions
65
67
- Minor code cleanup.
66
+ Recent reimplementation of "git am" changed the format of state
67
+ files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
68
+ primarily because write_file() API was cumbersome to use and it was
69
+ easy to mistakenly make text files with incomplete lines. Update
70
+ write_file() interface to make it harder to misuse.
71
72
70
-* jv/send-email-selective-smtp-auth (2015-08-17) 1 commit
71
- (merged to 'next' on 2015-08-19 at 3f0c693)
72
- + send-email: provide whitelist of SMTP AUTH mechanisms
73
+* jc/log-p-cc (2015-08-25) 4 commits
74
+ (merged to 'next' on 2015-08-25 at 2d6a6d4)
75
+ + builtin/log.c: minor reformat
76
+ + log: show merge commit when --cc is given
77
+ + log: when --cc is given, default to -p unless told otherwise
78
+ + log: rename "tweak" helpers
79
74
- "git send-email" learned a new option --smtp-auth to limit the SMTP
75
- AUTH mechanisms to be used to a subset of what the system library
76
- supports.
80
+ "git log --cc" did not show any patch, even though most of the time
81
+ the user meant "git log --cc -p -m" to see patch output for commits
82
+ with a single parent, and combined diff for merge commits. The
83
+ command is taught to DWIM "--cc" (without "--raw" and other forms
84
+ of output specification) to "--cc -p -m".
85
86
79
-* po/po-readme (2015-08-17) 1 commit
80
- (merged to 'next' on 2015-08-19 at 1899e59)
81
- + po/README: Update directions for l10n contributors
87
+* jk/fix-alias-pager-config-key-warnings (2015-08-24) 1 commit
88
+ (merged to 'next' on 2015-08-25 at 89eac5a)
89
+ + config: silence warnings for command names with invalid keys
90
83
- Doc updates for i18n.
91
+ Because the configuration system does not allow "alias.0foo" and
92
+ "pager.0foo" as the configuration key, the user cannot use '0foo'
93
+ as a custom command name anyway, but "git 0foo" tried to look these
94
+ keys up and emitted useless warnings before saying '0foo is not a
95
+ git command'. These warning messages have been squelched.
96
97
86
-* pt/am-builtin-abort-fix (2015-08-19) 1 commit
87
- (merged to 'next' on 2015-08-19 at 729e682)
88
- + am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
98
+* jk/notes-merge-config (2015-08-17) 6 commits
99
+ (merged to 'next' on 2015-08-26 at 6dd2286)
100
+ + notes: teach git-notes about notes.<name>.mergeStrategy option
101
+ + notes: add notes.mergeStrategy option to select default strategy
102
+ + notes: add tests for --commit/--abort/--strategy exclusivity
103
+ + notes: extract parse_notes_merge_strategy to notes-utils
104
+ + notes: extract enum notes_merge_strategy to notes-utils.h
105
+ + notes: document cat_sort_uniq rewriteMode
106
90
- "git am" that was recently reimplemented in C had a performance
91
- regression in "git am --abort" that goes back to the version before
92
- an attempted (and failed) patch application.
107
+ "git notes merge" can be told with "--strategy=<how>" option how to
108
+ automatically handle conflicts; this can now be configured by
109
+ setting notes.mergeStrategy configuration variable.
110
111
95
-* sg/help-group (2015-08-25) 1 commit
96
- (merged to 'next' on 2015-08-25 at 907e5a8)
97
- + generate-cmdlist: re-implement as shell script
112
+* jk/rev-list-has-no-notes (2015-08-24) 1 commit
113
+ (merged to 'next' on 2015-08-25 at 73cb2ad)
114
+ + rev-list: make it obvious that we do not support notes
115
99
- We rewrote one of the build scripts in Perl but this reimplements
100
- in Bourne shell.
116
+ "git rev-list" does not take "--notes" option, but did not complain
117
+ when one is given.
118
119
103
-* sg/t3020-typofix (2015-08-20) 1 commit
104
- (merged to 'next' on 2015-08-25 at 051d6c0)
105
- + t3020: fix typo in test description
120
+* sg/config-name-only (2015-08-20) 6 commits
121
+ (merged to 'next' on 2015-08-25 at 6cb3b7d)
122
+ + get_urlmatch: avoid useless strbuf write
123
+ + format_config: simplify buffer handling
124
+ + format_config: don't init strbuf
125
+ + config: restructure format_config() for better control flow
126
+ (merged to 'next' on 2015-08-12 at c658fe4)
127
+ + completion: list variable names reliably with 'git config --name-only'
128
+ + config: add '--name-only' option to list only variable names
129
130
+ "git config --list" output was hard to parse when values consist of
131
+ multiple lines. "--name-only" option is added to help this.
132
108
-* sg/wt-status-header-inclusion (2015-08-21) 1 commit
109
- (merged to 'next' on 2015-08-25 at fa5b2b2)
110
- + wt-status: move #include "pathspec.h" to the header
133
134
+* sg/describe-contains (2015-08-25) 1 commit
135
+ (merged to 'next' on 2015-08-26 at a7c66d9)
136
+ + describe --contains: default to HEAD when no commit-ish is given
137
113
-* ss/fix-config-fd-leak (2015-08-14) 1 commit
114
- (merged to 'next' on 2015-08-19 at 80d4880)
115
- + config: close config file handle in case of error
138
+ "git describe" without argument defaulted to describe the HEAD
139
+ commit, but "git describe --contains" didn't. Arguably, in a
140
+ repository used for active development, such defaulting would not
141
+ be very useful as the tip of branch is typically not tagged, but it
142
+ is better to be consistent.
143
144
--------------------------------------------------
145
[New Topics]
146
120
-* ah/pack-objects-usage-strings (2015-08-28) 1 commit
121
- - pack-objects: place angle brackets around placeholders in usage strings
122
-
123
- Usage string fix.
124
-
125
- Will merge to 'next'.
126
-
127
-
128
-* ah/read-tree-usage-string (2015-08-28) 1 commit
129
- - read-tree: replace bracket set with parentheses to clarify usage
130
-
131
- Usage string fix.
132
-
133
- Will merge to 'next'.
134
-
135
-
136
-* ah/reflog-typofix-in-error (2015-08-28) 1 commit
137
- - reflog: add missing single quote to error message
138
-
139
- Error string fix.
140
-
141
- Will merge to 'next'.
142
-
143
-
144
-* ah/submodule-typofix-in-error (2015-08-28) 1 commit
145
- - git-submodule: remove extraneous space from error message
147
+* ah/show-ref-usage-string (2015-08-31) 1 commit
148
+ - show-ref: place angle brackets around variables in usage string
149
147
- Error string fix.
150
+ Both "git show-ref -h" and "git show-ref --help" illustrated that the
151
+ "--exclude-existing" option makes the command read list of refs
152
+ from its standard input. Change only the "show-ref -h" output to
153
+ have a pair of "<>" around the placeholder that designate an input
154
+ file, i.e. "git show-ref --exclude-existing < <ref-list>".
155
149
- Will merge to 'next'.
156
157
+* cc/trailers-corner-case-fix (2015-08-31) 1 commit
158
+ - trailer: support multiline title
159
152
-* br/svn-doc-include-paths-config (2015-08-26) 1 commit
153
- - git-svn doc: mention "svn-remote.<name>.include-paths"
160
+ The "interpret-trailers" helper mistook a multi-paragraph title of
161
+ a commit log message with a colon in it as the end of the trailer
162
+ block.
163
164
Will merge to 'next'.
165
166
158
-* dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update (2015-08-28) 1 commit
159
- - commit: don't rewrite shared index unnecessarily
160
-
161
- When re-priming the cache-tree opportunistically while committing
162
- the in-core index as-is, we mistakenly invalidated the in-core
163
- index too aggressively, causing the experimental split-index code
164
- to unnecessarily rewrite the on-disk index file(s).
167
+* ee/clean-test-fixes (2015-08-31) 1 commit
168
+ - t7300: fix broken && chains
169
170
Will merge to 'next'.
171
172
169
-* dt/refs-bisection (2015-08-28) 5 commits
170
- - bisect: make bisection refs per-worktree
171
- - refs: make refs/worktree/* per-worktree
173
+* jk/date-local (2015-08-31) 3 commits
174
- SQUASH???
173
- - path: optimize common dir checking
174
- - refs: clean up common_list
175
+ - date: make "local" orthogonal to date format
176
+ - fast-import: switch crash-report date to iso8601
177
176
- Move the refs used during a "git bisect" session to per-worktree
177
- hierarchy refs/worktree/* so that independent bisect sessions can
178
- be done in different worktrees.
178
+ "git log --date=local" used to only allow to show the normal
179
+ (default) format in the local timezone. The command learned to take
180
+ 'local' as an instruction to use the local timezone with other
181
+ formats, e.g. "git show --date=rfc-local".
182
180
- Will merge to 'next' after squashing the update in.
183
184
+* nk/stash-show-config (2015-08-31) 1 commit
185
+ - stash: allow "stash show" diff output configurable
186
183
-* ld/p4-import-labels (2015-08-28) 3 commits
184
- - git-p4: fix P4 label import for unprocessed commits
185
- - git-p4: do not terminate creating tag for unknown commit
186
- - git-p4: failing test for ignoring invalid p4 labels
187
-
187
+ Users who are too busy to type three extra keystrokes to ask for
188
+ "git stash show -p" can now set stash.showPatch configuration
189
+ varible to true to always see the actual patch, not just the list
190
+ of paths affected with feel for the extent of damage via diffstat.
191
189
-* ls/p4-fold-case-client-specs (2015-08-28) 1 commit
190
- - git-p4: honor core.ignorecase when using P4 client specs
192
192
- On case insensitive systems, "git p4" did not work well with client
193
- specs.
193
+* sb/read-cache-one-indent-style-fix (2015-08-31) 1 commit
194
+ - read-cache: fix indentation in read_index_from
195
196
Will merge to 'next'.
197
197
-* rs/archive-zip-many (2015-08-28) 3 commits
198
- - archive-zip: support more than 65535 entries
199
- - archive-zip: use a local variable to store the creator version
200
- - t5004: test ZIP archives with many entries
198
202
- "git archive" did not use zip64 extension when creating an archive
203
- with more than 64k entries, which nobody should need, right ;-)?
204
-
205
- Will merge to 'next'.
206
-
207
-
208
-* rt/remove-hold-lockfile-for-append (2015-08-28) 1 commit
209
- - lockfile: remove function "hold_lock_file_for_append"
199
+* ls/p4-path-encoding (2015-08-31) 1 commit
200
+ - git-p4: add "--path-encoding" option
201
211
- Will merge to 'next'.
202
+ "git p4" learned to reencode the pathname it uses to communicate
203
+ with the p4 depot with a new option.
204
205
--------------------------------------------------
206
[Stalled]
@@ -338,15 +330,6 @@ of the repositories listed at
330
Waiting for a reroll.
331
332
341
-* jk/log-missing-default-HEAD (2015-06-03) 1 commit
342
- - log: diagnose empty HEAD more clearly
343
-
344
- "git init empty && git -C empty log" said "bad default revision 'HEAD'",
345
- which was found to be a bit confusing to new users.
346
-
347
- What's the status of this one?
348
-
349
-
333
* wp/sha1-name-negative-match (2015-06-08) 2 commits
334
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
335
- test for '!' handling in rev-parse's named commits
@@ -379,25 +362,6 @@ of the repositories listed at
362
($gmane/272180).
363
364
382
-* ad/bisect-terms (2015-08-03) 4 commits
383
- - bisect: allow setting any user-specified in 'git bisect start'
384
- - bisect: add 'git bisect terms' to view the current terms
385
- - bisect: add the terms old/new
386
- - bisect: sanity check on terms
387
-
388
- The use of 'good/bad' in "git bisect" made it confusing to use when
389
- hunting for a state change that is not a regression (e.g. bugfix).
390
- The command learned 'old/new' and then allows the end user to
391
- say e.g. "bisect start --term-old=fast --term=new=slow" to find a
392
- performance regression.
393
-
394
- Michael's idea to make 'good/bad' more intelligent does have
395
- certain attractiveness ($gname/272867), and makes some of the work
396
- on this topic a moot point.
397
-
398
- Will hold.
399
-
400
-
365
* mh/notes-allow-reading-treeish (2015-07-13) 1 commit
366
- notes: allow treeish expressions as notes ref
367
@@ -475,58 +439,137 @@ of the repositories listed at
439
--------------------------------------------------
440
[Cooking]
441
478
-* jc/am-state-fix (2015-08-25) 5 commits
479
- (merged to 'next' on 2015-08-25 at 4efcd88)
480
- + write_file(): drop caller-supplied LF from calls to create a one-liner file
481
- + write_file_v(): do not leave incomplete line at the end
482
- + write_file(): drop "fatal" parameter
483
- + builtin/am: make sure state files are text
484
- + builtin/am: introduce write_state_*() helper functions
442
+* ad/bisect-terms (2015-08-03) 4 commits
443
+ - bisect: allow setting any user-specified in 'git bisect start'
444
+ - bisect: add 'git bisect terms' to view the current terms
445
+ - bisect: add the terms old/new
446
+ - bisect: sanity check on terms
447
+
448
+ The use of 'good/bad' in "git bisect" made it confusing to use when
449
+ hunting for a state change that is not a regression (e.g. bugfix).
450
+ The command learned 'old/new' and then allows the end user to
451
+ say e.g. "bisect start --term-old=fast --term=new=slow" to find a
452
+ performance regression.
453
+
454
+ Michael's idea to make 'good/bad' more intelligent does have
455
+ certain attractiveness ($gname/272867), and makes some of the work
456
+ on this topic a moot point.
457
+
458
+ Will merge to 'next'.
459
+
460
+
461
+* jk/log-missing-default-HEAD (2015-08-31) 1 commit
462
+ - log: diagnose empty HEAD more clearly
463
+
464
+ "git init empty && git -C empty log" said "bad default revision 'HEAD'",
465
+ which was found to be a bit confusing to new users.
466
+
467
+ Will merge to 'next'.
468
486
- Recent reimplementation of "git am" changed the format of state
487
- files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
488
- primarily because write_file() API was cumbersome to use and it was
489
- easy to mistakenly make text files with incomplete lines. Update
490
- write_file() interface to make it harder to misuse.
469
+
470
+* ah/pack-objects-usage-strings (2015-08-28) 1 commit
471
+ (merged to 'next' on 2015-08-31 at 78c8240)
472
+ + pack-objects: place angle brackets around placeholders in usage strings
473
+
474
+ Usage string fix.
475
476
Will merge to 'master'.
477
478
495
-* jc/log-p-cc (2015-08-25) 4 commits
496
- (merged to 'next' on 2015-08-25 at 2d6a6d4)
497
- + builtin/log.c: minor reformat
498
- + log: show merge commit when --cc is given
499
- + log: when --cc is given, default to -p unless told otherwise
500
- + log: rename "tweak" helpers
479
+* ah/read-tree-usage-string (2015-08-28) 1 commit
480
+ (merged to 'next' on 2015-08-31 at fbaa7bd)
481
+ + read-tree: replace bracket set with parentheses to clarify usage
482
502
- "git log --cc" did not show any patch, even though most of the time
503
- the user meant "git log --cc -p -m" to see patch output for commits
504
- with a single parent, and combined diff for merge commits. The
505
- command is taught to DWIM "--cc" (without "--raw" and other forms
506
- of output specification) to "--cc -p -m".
483
+ Usage string fix.
484
485
Will merge to 'master'.
486
487
511
-* jk/fix-alias-pager-config-key-warnings (2015-08-24) 1 commit
512
- (merged to 'next' on 2015-08-25 at 89eac5a)
513
- + config: silence warnings for command names with invalid keys
488
+* ah/reflog-typofix-in-error (2015-08-28) 1 commit
489
+ (merged to 'next' on 2015-08-31 at 1b37218)
490
+ + reflog: add missing single quote to error message
491
515
- Because the configuration system does not allow "alias.0foo" and
516
- "pager.0foo" as the configuration key, the user cannot use '0foo'
517
- as a custom command name anyway, but "git 0foo" tried to look these
518
- keys up and emitted useless warnings before saying '0foo is not a
519
- git command'. These warning messages have been squelched.
492
+ Error string fix.
493
494
Will merge to 'master'.
495
496
524
-* jk/rev-list-has-no-notes (2015-08-24) 1 commit
525
- (merged to 'next' on 2015-08-25 at 73cb2ad)
526
- + rev-list: make it obvious that we do not support notes
497
+* ah/submodule-typofix-in-error (2015-08-28) 1 commit
498
+ (merged to 'next' on 2015-08-31 at 5a20628)
499
+ + git-submodule: remove extraneous space from error message
500
528
- "git rev-list" does not take "--notes" option, but did not complain
529
- when one is given.
501
+ Error string fix.
502
+
503
+ Will merge to 'master'.
504
+
505
+
506
+* br/svn-doc-include-paths-config (2015-08-26) 1 commit
507
+ (merged to 'next' on 2015-08-31 at 27a305f)
508
+ + git-svn doc: mention "svn-remote.<name>.include-paths"
509
+
510
+ Will merge to 'master'.
511
+
512
+
513
+* dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update (2015-08-31) 1 commit
514
+ (merged to 'next' on 2015-08-31 at c4133fb)
515
+ + commit: don't rewrite shared index unnecessarily
516
+
517
+ When re-priming the cache-tree opportunistically while committing
518
+ the in-core index as-is, we mistakenly invalidated the in-core
519
+ index too aggressively, causing the experimental split-index code
520
+ to unnecessarily rewrite the on-disk index file(s).
521
+
522
+ Will merge to 'master'.
523
+
524
+
525
+* dt/refs-bisection (2015-08-31) 5 commits
526
+ - bisect: make bisection refs per-worktree
527
+ - refs: make refs/worktree/* per-worktree
528
+ - SQUASH???
529
+ - path: optimize common dir checking
530
+ - refs: clean up common_list
531
+
532
+ Move the refs used during a "git bisect" session to per-worktree
533
+ hierarchy refs/worktree/* so that independent bisect sessions can
534
+ be done in different worktrees.
535
+
536
+ $gmane/276765. We do not need to move (which can break third-party
537
+ tools) in order to make the hierarchy per-worktree.
538
+
539
+
540
+* ld/p4-import-labels (2015-08-28) 3 commits
541
+ - git-p4: fix P4 label import for unprocessed commits
542
+ - git-p4: do not terminate creating tag for unknown commit
543
+ - git-p4: failing test for ignoring invalid p4 labels
544
+
545
+ Will merge to 'next'.
546
+
547
+
548
+* ls/p4-fold-case-client-specs (2015-08-28) 1 commit
549
+ (merged to 'next' on 2015-08-31 at f25a3bd)
550
+ + git-p4: honor core.ignorecase when using P4 client specs
551
+
552
+ On case insensitive systems, "git p4" did not work well with client
553
+ specs.
554
+
555
+ Will merge to 'master'.
556
+
557
+
558
+* rs/archive-zip-many (2015-08-28) 3 commits
559
+ (merged to 'next' on 2015-08-31 at b799358)
560
+ + archive-zip: support more than 65535 entries
561
+ + archive-zip: use a local variable to store the creator version
562
+ + t5004: test ZIP archives with many entries
563
+
564
+ "git archive" did not use zip64 extension when creating an archive
565
+ with more than 64k entries, which nobody should need, right ;-)?
566
+
567
+ Will merge to 'master'.
568
+
569
+
570
+* rt/remove-hold-lockfile-for-append (2015-08-28) 1 commit
571
+ (merged to 'next' on 2015-08-31 at caabe4b)
572
+ + lockfile: remove function "hold_lock_file_for_append"
573
574
Will merge to 'master'.
575
@@ -583,38 +626,6 @@ of the repositories listed at
626
Waiting for a reroll.
627
628
586
-* sg/describe-contains (2015-08-25) 1 commit
587
- (merged to 'next' on 2015-08-26 at a7c66d9)
588
- + describe --contains: default to HEAD when no commit-ish is given
589
-
590
- "git describe" without argument defaulted to describe the HEAD
591
- commit, but "git describe --contains" didn't. Arguably, in a
592
- repository used for active development, such defaulting would not
593
- be very useful as the tip of branch is typically not tagged, but it
594
- is better to be consistent.
595
-
596
- Will merge to 'master'.
597
-
598
-
599
-* db/push-sign-if-asked (2015-08-19) 9 commits
600
- (merged to 'next' on 2015-08-26 at a7a32e9)
601
- + push: add a config option push.gpgSign for default signed pushes
602
- + push: support signing pushes iff the server supports it
603
- + builtin/send-pack.c: use parse_options API
604
- + config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool
605
- + transport: remove git_transport_options.push_cert
606
- + gitremote-helpers.txt: document pushcert option
607
- + Documentation/git-send-pack.txt: document --signed
608
- + Documentation/git-send-pack.txt: wrap long synopsis line
609
- + Documentation/git-push.txt: document when --signed may fail
610
-
611
- The client side codepaths in "git push" have been cleaned up
612
- and the user can request to perform an optional "signed push",
613
- i.e. sign only when the other end accepts signed push.
614
-
615
- Will merge to 'master'.
616
-
617
-
629
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
630
- DONTMERGE: log message, grace-period and tests $gmane/276058
631
- gc: remove stale .idx files without corresponding .pack file
@@ -636,47 +647,17 @@ of the repositories listed at
647
($gmane/275401)
648
649
639
-* jk/notes-merge-config (2015-08-17) 6 commits
640
- (merged to 'next' on 2015-08-26 at 6dd2286)
641
- + notes: teach git-notes about notes.<name>.mergeStrategy option
642
- + notes: add notes.mergeStrategy option to select default strategy
643
- + notes: add tests for --commit/--abort/--strategy exclusivity
644
- + notes: extract parse_notes_merge_strategy to notes-utils
645
- + notes: extract enum notes_merge_strategy to notes-utils.h
646
- + notes: document cat_sort_uniq rewriteMode
647
-
648
- "git notes merge" can be told with "--strategy=<how>" option how to
649
- automatically handle conflicts; this can now be configured by
650
- setting notes.merge configuration variable.
651
-
652
- Will merge to 'master'.
653
-
654
-
655
-* hv/submodule-config (2015-08-19) 4 commits
656
- (merged to 'next' on 2015-08-25 at 82adb30)
657
- + submodule: allow erroneous values for the fetchRecurseSubmodules option
658
- + submodule: use new config API for worktree configurations
659
- + submodule: extract functions for config set and lookup
660
- + submodule: implement a config API for lookup of .gitmodules values
661
- (this branch is used by sb/submodule-helper.)
662
-
663
- The gitmodules API accessed from the C code learned to cache stuff
664
- lazily.
665
-
666
- Will merge to 'master'.
667
-
668
-
669
-* sb/submodule-helper (2015-08-26) 6 commits
670
- - submodule: helper to run foreach in parallel
671
- - thread-utils: add a threaded task queue
650
+* sb/submodule-helper (2015-08-31) 5 commits
651
- submodule: implement `module_clone` as a builtin helper
652
- submodule: implement `module_name` as a builtin helper
653
+ - SQUASH???
654
- submodule: implement `module_list` as a builtin helper
655
- Merge 'hv/submodule-config' to 'sb/submodule-helper'
676
- (this branch uses hv/submodule-config.)
656
657
The infrastructure to rewrite "git submodule" in C is being built
679
- incrementally. These early part looks promising.
658
+ incrementally. Let's polish these early parts well enough and make
659
+ them graduate to 'next' and 'master', so that the more involved
660
+ follow-up can start cooking on a solid ground.
661
662
663
* ad/cygwin-wants-rename (2015-08-07) 1 commit
@@ -686,22 +667,6 @@ of the repositories listed at
667
($gmane/275680).
668
669
689
-* sg/config-name-only (2015-08-20) 6 commits
690
- (merged to 'next' on 2015-08-25 at 6cb3b7d)
691
- + get_urlmatch: avoid useless strbuf write
692
- + format_config: simplify buffer handling
693
- + format_config: don't init strbuf
694
- + config: restructure format_config() for better control flow
695
- (merged to 'next' on 2015-08-12 at c658fe4)
696
- + completion: list variable names reliably with 'git config --name-only'
697
- + config: add '--name-only' option to list only variable names
698
-
699
- "git config --list" output was hard to parse when values consist of
700
- multiple lines. "--name-only" option is added to help this.
701
-
702
- Will merge to 'master'.
703
-
704
-
670
* kn/for-each-tag-branch (2015-08-03) 11 commits
671
(merged to 'next' on 2015-08-03 at d9e94b9)
672
+ for-each-ref: add '--contains' option