What's cooking (2016/04 #04)
Junio C Hamano committed
Apr 12, 2016 at 16:06 UTC
774cfec45389c93556cb9cebc787bfce4a8f506e
1 file changed
+266
-369
whats-cooking.txt
+266
-369
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2016, #03; Thu, 7)
4
-X-master-at: 72d917a7f9a5123ef7c0d6db306bbc0d385227e2
5
-X-next-at: 209d99dbd5bc1cff6fe9618b5ae6dc65a6d421d9
3
+Subject: What's cooking in git.git (Apr 2016, #04; Tue, 12)
4
+X-master-at: 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355
5
+X-next-at: f4fac6784293189f836875527464b8e7b234cb96
6
7
-What's cooking in git.git (Apr 2016, #03; Thu, 7)
7
+What's cooking in git.git (Apr 2016, #04; Tue, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,7 @@ 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 'master' branch now has the second batch of topics of this
15
+The 'master' branch now has the third batch of topics of this
16
cycle.
17
18
There are a handful of topics that are stuck; they are marked as
@@ -26,282 +26,212 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
29
-* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
30
- (merged to 'next' on 2016-04-04 at 26f94c0)
31
- + Documentation: talk about pager in api-trace.txt
32
-
33
- Originally merged to 'next' on 2016-03-23
34
-
35
- A minor documentation update.
36
-
37
-
38
-* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
39
- (merged to 'next' on 2016-04-04 at 34e645f)
40
- + mergetool: honor tempfile configuration when resolving delete conflicts
41
- + mergetool: support delete/delete conflicts
42
-
43
- Originally merged to 'next' on 2016-03-15
44
-
45
- "git mergetool" did not work well with conflicts that both sides
46
- deleted.
47
-
48
-
49
-* jk/credential-cache-comment-exit (2016-03-18) 1 commit
50
- (merged to 'next' on 2016-04-04 at 50427fe)
51
- + credential-cache--daemon: clarify "exit" action semantics
52
-
53
- Originally merged to 'next' on 2016-03-23
54
-
55
- A code clarification.
56
-
57
-
58
-* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
59
- (merged to 'next' on 2016-04-04 at 4d54956)
60
- + send-email: ignore trailing whitespace in mailrc alias file
61
-
62
- Originally merged to 'next' on 2016-03-23
63
-
64
- "git send-email" had trouble parsing alias file in mailrc format
65
- when lines in it had trailing whitespaces on them.
66
-
67
-
68
-* jk/submodule-c-credential (2016-03-23) 7 commits
69
- (merged to 'next' on 2016-04-04 at 8de8e8c)
70
- + git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
71
- + git: submodule honor -c credential.* from command line
72
- + quote: implement sq_quotef()
73
- + submodule: fix segmentation fault in submodule--helper clone
74
- + submodule: fix submodule--helper clone usage
75
- + submodule: check argc count for git submodule--helper clone
76
- + submodule: don't pass empty string arguments to submodule--helper clone
77
-
78
- Originally merged to 'next' on 2016-03-23
79
-
80
- "git -c credential.<var>=<value> submodule" can now be used to
81
- propagate configuration variables related to credential helper
82
- down to the submodules.
83
-
84
-
85
-* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
86
- (merged to 'next' on 2016-04-04 at 5fa6274)
87
- + t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
29
+* jc/merge-refuse-new-root (2016-03-23) 1 commit
30
+ (merged to 'next' on 2016-04-04 at cd70fd6)
31
+ + merge: refuse to create too cool a merge by default
32
33
Originally merged to 'next' on 2016-03-23
34
91
- The tests that involve running httpd leaked the system-wide
92
- configuration in /etc/gitconfig to the tested environment.
93
-
94
-
95
-* jv/merge-nothing-into-void (2016-03-23) 1 commit
96
- (merged to 'next' on 2016-04-04 at aa37405)
97
- + merge: fix NULL pointer dereference when merging nothing into void
35
+ "git merge" used to allow merging two branches that have no common
36
+ base by default, which led to a brand new history of an existing
37
+ project created and then get pulled by an unsuspecting maintainer,
38
+ which allowed an unnecessary parallel history merged into the
39
+ existing project. The command has been taught not to allow this by
40
+ default, with an escape hatch "--allow-unrelated-histories" option
41
+ to be used in a rare event that merges histories of two projects
42
+ that started their lives independently.
43
99
- Originally merged to 'next' on 2016-03-23
44
101
- "git merge FETCH_HEAD" dereferenced NULL pointer when merging
102
- nothing into an unborn history (which is arguably unusual usage,
103
- which perhaps was the reason why nobody noticed it).
45
+* nd/apply-doc (2016-03-24) 2 commits
46
+ (merged to 'next' on 2016-04-06 at f9bd355)
47
+ + git-apply.txt: mention the behavior inside a subdir
48
+ + git-apply.txt: remove a space
49
50
+ A minor documentation update.
51
106
-* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
107
- (merged to 'next' on 2016-04-04 at a49ec4a)
108
- + tag: add the option to force signing of annotated tags
52
110
- Originally merged to 'next' on 2016-03-24
53
+* nd/apply-report-skip (2016-03-24) 1 commit
54
+ (merged to 'next' on 2016-04-06 at ae2c824)
55
+ + apply: report patch skipping in verbose mode
56
112
- "git tag" can create an annotated tag without explicitly given an
113
- "-a" (or "-s") option (i.e. when a tag message is given). A new
114
- configuration variable, tag.forceSignAnnotated, can be used to tell
115
- the command to create signed tag in such a situation.
57
+ "git apply -v" learned to report paths in the patch that were
58
+ skipped via --include/--exclude mechanism or being outside the
59
+ current working directory.
60
61
118
-* ls/p4-map-user (2016-03-15) 1 commit
119
- (merged to 'next' on 2016-04-04 at a56b011)
120
- + git-p4: map a P4 user to Git author name and email address
62
+* oa/doc-diff-check (2016-03-29) 1 commit
63
+ (merged to 'next' on 2016-04-06 at e3d6e8d)
64
+ + Documentation: git diff --check detects conflict markers
65
122
- Originally merged to 'next' on 2016-03-23
66
+ A minor documentation update.
67
124
- "git p4" now allows P4 author names to be mapped to Git author
125
- names.
68
69
+* pb/opt-cmdmode-doc (2016-03-25) 1 commit
70
+ (merged to 'next' on 2016-04-06 at a5f3835)
71
+ + api-parse-options.txt: document OPT_CMDMODE()
72
128
-* pb/t7502-drop-dup (2016-03-11) 1 commit
129
- (merged to 'next' on 2016-04-04 at 4799cad)
130
- + t/t7502 : drop duplicate test
131
- (this branch is used by pb/commit-verbose-config.)
73
+ Minor API documentation update.
74
133
- Originally merged to 'next' on 2016-03-15
75
135
- Code clean-up.
76
+* ss/msvc (2016-03-30) 2 commits
77
+ (merged to 'next' on 2016-04-06 at 4b53bce)
78
+ + MSVC: use shipped headers instead of fallback definitions
79
+ + MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
80
81
+ Build updates for MSVC.
82
138
-* sb/clone-t57-t56 (2016-03-16) 1 commit
139
- (merged to 'next' on 2016-04-04 at 5c20247)
140
- + clone tests: rename t57* => t56*
83
+--------------------------------------------------
84
+[New Topics]
85
142
- Originally merged to 'next' on 2016-03-23
86
+* ad/commit-have-m-option (2016-04-07) 2 commits
87
+ - commit: do not ignore an empty message given by -m ''
88
+ - commit: --amend -m '' silently fails to wipe message
89
144
- Rename bunch of tests on "git clone" for better organization.
90
+ "git commit" misbehaved in a few minor ways when an empty message
91
+ is given via -m '', all of which has been corrected.
92
93
+ Will merge to 'next'.
94
147
-* sb/rebase-x (2016-03-18) 2 commits
148
- (merged to 'next' on 2016-04-04 at feda620)
149
- + t3404: cleanup double empty lines between tests
150
- + rebase: decouple --exec from --interactive
95
152
- Originally merged to 'next' on 2016-03-23
96
+* jc/xstrfmt-null-with-prec-0 (2016-04-07) 1 commit
97
+ - setup.c: do not feed NULL to "%.*s" even with precision 0
98
154
- "git rebase -x" can be used without passing "-i" option.
99
+ Will merge to 'next'.
100
101
157
-* sb/submodule-parallel-update (2016-03-01) 10 commits
158
- (merged to 'next' on 2016-04-04 at a0aea8d)
159
- + clone: allow an explicit argument for parallel submodule clones
160
- + submodule update: expose parallelism to the user
161
- + submodule helper: remove double 'fatal: ' prefix
162
- + git submodule update: have a dedicated helper for cloning
163
- + run_processes_parallel: rename parameters for the callbacks
164
- + run_processes_parallel: treat output of children as byte array
165
- + submodule update: direct error message to stderr
166
- + fetching submodules: respect `submodule.fetchJobs` config option
167
- + submodule-config: drop check against NULL
168
- + submodule-config: keep update strategy around
169
- (this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
102
+* dt/pre-refs-backend (2016-04-10) 24 commits
103
+ - refs: on symref reflog expire, lock symref not referrent
104
+ - refs: move resolve_ref_unsafe into common code
105
+ - show_head_ref(): check the result of resolve_ref_namespace()
106
+ - check_aliased_update(): check that dst_name is non-NULL
107
+ - checkout_paths(): remove unneeded flag variable
108
+ - cmd_merge(): remove unneeded flag variable
109
+ - fsck_head_link(): remove unneeded flag variable
110
+ - read_raw_ref(): change flags parameter to unsigned int
111
+ - files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
112
+ - read_raw_ref(): manage own scratch space
113
+ - files-backend: break out ref reading
114
+ - resolve_ref_1(): eliminate local variable "bad_name"
115
+ - resolve_ref_1(): reorder code
116
+ - resolve_ref_1(): eliminate local variable
117
+ - resolve_ref_unsafe(): ensure flags is always set
118
+ - resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
119
+ - resolve_missing_loose_ref(): simplify semantics
120
+ - t1430: improve test coverage of deletion of badly-named refs
121
+ - t1430: test for-each-ref in the presence of badly-named refs
122
+ - t1430: don't rely on symbolic-ref for creating broken symrefs
123
+ - t1430: clean up broken refs/tags/shadow
124
+ - t1430: test the output and error of some commands more carefully
125
+ - refs: move for_each_*ref* functions into common code
126
+ - refs: move head_ref{,_submodule} to the common code
127
+ (this branch uses jk/check-repository-format.)
128
+
129
+ Code restructuring around the "refs" area to prepare for pluggable
130
+ refs backends.
131
171
- Originally merged to 'next' on 2016-03-15
132
+ Will merge to 'next'.
133
173
- A major part of "git submodule update" has been ported to C to take
174
- advantage of the recently added framework to run download tasks in
175
- parallel.
134
135
+* ky/imap-send (2016-04-08) 2 commits
136
+ - imap-send: fix CRAM-MD5 response calculation
137
+ - imap-send: check for NOLOGIN capability only when using LOGIN command
138
178
-* ss/commit-squash-msg (2016-03-21) 1 commit
179
- (merged to 'next' on 2016-04-04 at d389f19)
180
- + commit: do not lose SQUASH_MSG contents
139
+ Support for CRAM-MD5 authentication method in "git imap-send" did
140
+ not work well.
141
182
- Originally merged to 'next' on 2016-03-23
142
+ Will merge to 'next'.
143
184
- When "git merge --squash" stopped due to conflict, the concluding
185
- "git commit" failed to read in the SQUASH_MSG that shows the log
186
- messages from all the squashed commits.
144
145
+* ky/imap-send-openssl-1.1.0 (2016-04-08) 4 commits
146
+ - configure: remove checking for HMAC_CTX_cleanup
147
+ - imap-send: avoid deprecated TLSv1_method()
148
+ - imap-send: check NULL return of SSL_CTX_new()
149
+ - imap-send: use HMAC() function provided by OpenSSL
150
189
-* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
190
- (merged to 'next' on 2016-04-04 at 9f0207e)
191
- + dir: store EXC_FLAG_* values in unsigned integers
151
+ Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
152
+ we use in imap-send, which has been adjusted for the change.
153
193
- Originally merged to 'next' on 2016-03-04
154
+ Will merge to 'next'.
155
195
- Code clean-up.
156
157
+* jc/http-socks5h (2016-04-10) 1 commit
158
+ - http: differentiate socks5:// and socks5h://
159
198
-* ss/receive-pack-parse-options (2016-03-01) 1 commit
199
- (merged to 'next' on 2016-04-04 at fd6ab4c)
200
- + builtin/receive-pack.c: use parse_options API
160
+ The socks5:// proxy support added back in 2.6.4 days was not aware
161
+ that socks5h:// proxies behave differently.
162
202
- Originally merged to 'next' on 2016-03-04
163
+ Will merge to 'next'.
164
204
- The command line argument parser for "receive-pack" has been
205
- rewritten to use parse-options.
165
207
---------------------------------------------------
208
-[New Topics]
166
+* jc/send-email-skip-backup (2016-04-12) 1 commit
167
+ - send-email: detect and offer to skip backup files
168
210
-* jc/drop-git-spec-in (2016-04-06) 1 commit
211
- - Makefile: stop pretending to support rpmbuild
169
+ A careless invocation of "git send-email directory/" after editing
170
+ 0001-change.patch with an editor often ends up sending both
171
+ 0001-change.patch and its backup file, 0001-change.patch~, causing
172
+ embarrassment and a minor confusion. Detect such an input and
173
+ offer to skip the backup files when sending the patches out.
174
213
- As nobody maintains our in-tree git.spec.in and distros use their
214
- own spec file, we stopped pretending that we support "make rpm".
175
+ Needs review.
176
177
217
-* jc/makefile-redirection-stderr (2016-04-05) 1 commit
218
- (merged to 'next' on 2016-04-06 at e3f2ded)
219
- + Makefile: fix misdirected redirections
178
+* jk/do-not-printf-NULL (2016-04-10) 3 commits
179
+ - git_config_set_multivar_in_file: handle "unset" errors
180
+ - git_config_set_multivar_in_file: all non-zero returns are errors
181
+ - config: lower-case first word of error strings
182
221
- A minor fix in the Makefile.
183
+ "git config" had a codepath that tried to pass a NULL to
184
+ printf("%s"), which nobody seems to have noticed.
185
223
- Will merge to 'master'.
186
+ Will merge to 'next'.
187
188
226
-* js/mingw-tests-2.8 (2016-04-04) 1 commit
227
- (merged to 'next' on 2016-04-06 at f85a013)
228
- + Windows: shorten code by re-using convert_slashes()
189
+* jk/use-write-script-more (2016-04-12) 3 commits
190
+ - t3404: use write_script
191
+ - t1020: do not overuse printf and use write_script
192
+ - t5532: use write_script
193
194
Code clean-up.
195
232
- Will merge to 'master'.
233
-
234
-
235
-* ar/diff-args-osx-precompose (2016-04-05) 1 commit
236
- - diff: run arguments through precompose_argv
237
-
238
- Many commands normalize command line arguments from NFD to NFC
239
- variant of UTF-8 on OSX, but commands in the "diff" family did
240
- not, causing "git diff $path" to complain that no such path is
241
- known to Git. They have been taught to do the normalization.
242
-
243
- Will be rerolled?
244
- ($gmane/290724)
245
-
246
-
247
-* ep/trace-doc-sample-fix (2016-04-05) 1 commit
248
- (merged to 'next' on 2016-04-06 at 0df7357)
249
- + api-trace.txt: fix typo
250
-
251
- Fix a typo in an example in the trace API documentation.
252
-
253
- Will merge to 'master'.
254
-
255
-
256
-* ew/send-email-readable-message-id (2016-04-06) 1 commit
257
- - send-email: more meaningful Message-ID
258
-
259
- "git send-email" now uses a more readable timestamps when
260
- formulating a message ID.
261
-
196
Will merge to 'next'.
197
198
265
-* mg/complete-cherry-mark-to-log (2016-04-05) 1 commit
266
- (merged to 'next' on 2016-04-06 at 3002be6)
267
- + completion: complete --cherry-mark for git log
268
-
269
- The completion scripts (in contrib/) did not include the
270
- "--cherry-mark" option when completing "git log <HT>".
271
-
272
- Will merge to 'master'.
273
-
274
-
275
-* tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit
276
- (merged to 'next' on 2016-04-06 at 263bba8)
277
- + correct blame for files commited with CRLF
278
-
279
- When running "git blame $path" with unnormalized data in the index
280
- for the path, the data in the working tree was blamed, even though
281
- "git add" would not have changed what is already in the index, due
282
- to "safe crlf" that disables the line-end conversion. It has been
283
- corrected.
199
+* nf/mergetool-prompt (2016-04-12) 2 commits
200
+ - SQUASH???
201
+ - difftool/mergetool: make the form of yes/no questions consistent
202
285
- Will merge to 'master'.
203
+ UI consistency improvements.
204
205
288
-* st/verify-tag (2016-04-06) 3 commits
289
- - verify-tag: change variable name for readability
290
- - t7030: test verifying multiple tags
291
- - builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
206
+* va/i18n-misc-updates (2016-04-12) 4 commits
207
+ - i18n: builtin/rm.c: remove a comma ',' from string
208
+ - i18n: unpack-trees: mark strings for translation
209
+ - i18n: builtin/branch.c: mark option for translation
210
+ - i18n: index-pack: use plural string instead of normal one
211
293
- Only the first three patches in a six-patch series.
212
+ Mark several messages for translation.
213
214
+--------------------------------------------------
215
+[Stalled]
216
296
-* ew/send-email-drop-data-dumper (2016-04-06) 1 commit
297
- - send-email: do not load Data::Dumper
217
+* tb/safe-crlf-output-fix (2016-04-01) 7 commits
218
+ . convert.c: more safer crlf handling with text attribute
219
+ . correct blame for files commited with CRLF
220
+ . convert: unify the "auto" handling of CRLF
221
+ . t0027: test cases for combined attributes
222
+ . convert: allow core.autocrlf=input and core.eol=crlf
223
+ . convert.c: stream and early out
224
+ . read-cache: factor out get_sha1_from_index() helper
225
299
- Code clean-up.
226
+ The "safe CRLF" facility disables line-end conversion from CRLF to
227
+ LF when checking in if the blob registered to the index already
228
+ contains CR, but some codepaths like "git blame" did not know this,
229
+ and instead assumed that only the configuration and attribute
230
+ settings determined how the data from the working tree is converted.
231
301
- Will merge to 'next'.
232
+ Will be rerolled.
233
+ ($gmane/290637)
234
303
---------------------------------------------------
304
-[Stalled]
235
236
* da/user-useconfigonly (2016-04-01) 2 commits
237
- ident: give "please tell me" message upon useConfigOnly error
@@ -400,8 +330,7 @@ of the repositories listed at
330
331
Update of "git submodule" to move pieces of logic to C continues.
332
403
- Needs review.
404
- ($gmane/288824)
333
+ Needs to be adjusted for the recent "prefix" fixes.
334
335
336
* az/p4-bare-no-rebase (2016-02-19) 1 commit
@@ -444,56 +373,6 @@ of the repositories listed at
373
($gmane/286137)
374
375
447
-* dt/refs-backend-lmdb (2016-02-25) 45 commits
448
- . SQUASH??? Minimum compilation band-aid
449
- . tests: add ref-storage argument
450
- . refs: tests for lmdb backend
451
- . refs: add LMDB refs storage backend
452
- . refs: break out resolve_ref_unsafe_submodule
453
- . config: read ref storage config on startup
454
- . refs: register ref storage backends
455
- . svn: learn ref-storage argument
456
- . clone: allow ref storage backend to be set for clone
457
- . refs: check submodules' ref storage config
458
- . init: allow alternate ref strorage to be set for new repos
459
- . refs: always handle non-normal refs in files backend
460
- . refs: resolve symbolic refs first
461
- . refs: on symref reflog expire, lock symref not referrent
462
- . refs: don't dereference on rename
463
- . refs: allow log-only updates
464
- . refs: move duplicate check to common code
465
- . refs: make lock generic
466
- . refs: handle non-normal ref renames
467
- . refs: add method to rename refs
468
- . refs: add methods to init refs db
469
- . refs: add method for delete_refs
470
- . refs: add method for initial ref transaction commit
471
- . refs: add methods for reflog
472
- . refs: add do_for_each_per_worktree_ref
473
- . refs: reduce the visibility of do_for_each_ref()
474
- . refs: add method for do_for_each_ref
475
- . refs: add methods for misc ref operations
476
- . refs: add a backend method structure with transaction functions
477
- . refs: move resolve_ref_unsafe into common code
478
- . files-backend: break out ref reading
479
- . refs: move for_each_*ref* functions into common code
480
- . refs: move head_ref{,_submodule} to the common code
481
- . Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
482
- . clone: allow an explicit argument for parallel submodule clones
483
- . submodule update: expose parallelism to the user
484
- . git submodule update: have a dedicated helper for cloning
485
- . run_processes_parallel: correctly terminate callbacks with an LF
486
- . run_processes_parallel: rename parameters for the callbacks
487
- . run-command: expose default_{start_failure, task_finished}
488
- . run_processes_parallel: treat output of children as byte array
489
- . submodule update: direct error message to stderr
490
- . fetching submodules: respect `submodule.fetchJobs` config option
491
- . submodule-config: drop check against NULL
492
- . submodule-config: keep update strategy around
493
-
494
- A reroll exists, but it seems that will further be rerolled.
495
-
496
-
376
* ec/annotate-deleted (2015-11-20) 1 commit
377
- annotate: skip checking working tree if a revision is provided
378
@@ -565,6 +444,103 @@ of the repositories listed at
444
--------------------------------------------------
445
[Cooking]
446
447
+* jc/drop-git-spec-in (2016-04-06) 1 commit
448
+ - Makefile: stop pretending to support rpmbuild
449
+
450
+ As nobody maintains our in-tree git.spec.in and distros use their
451
+ own spec file, we stopped pretending that we support "make rpm".
452
+
453
+ Comments?
454
+
455
+
456
+* jc/makefile-redirection-stderr (2016-04-05) 1 commit
457
+ (merged to 'next' on 2016-04-06 at e3f2ded)
458
+ + Makefile: fix misdirected redirections
459
+
460
+ A minor fix in the Makefile.
461
+
462
+ Will merge to 'master'.
463
+
464
+
465
+* js/mingw-tests-2.8 (2016-04-04) 1 commit
466
+ (merged to 'next' on 2016-04-06 at f85a013)
467
+ + Windows: shorten code by re-using convert_slashes()
468
+
469
+ Code clean-up.
470
+
471
+ Will merge to 'master'.
472
+
473
+
474
+* ar/diff-args-osx-precompose (2016-04-05) 1 commit
475
+ - diff: run arguments through precompose_argv
476
+
477
+ Many commands normalize command line arguments from NFD to NFC
478
+ variant of UTF-8 on OSX, but commands in the "diff" family did
479
+ not, causing "git diff $path" to complain that no such path is
480
+ known to Git. They have been taught to do the normalization.
481
+
482
+ Will be rerolled?
483
+ ($gmane/290724)
484
+
485
+
486
+* ep/trace-doc-sample-fix (2016-04-05) 1 commit
487
+ (merged to 'next' on 2016-04-06 at 0df7357)
488
+ + api-trace.txt: fix typo
489
+
490
+ Fix a typo in an example in the trace API documentation.
491
+
492
+ Will merge to 'master'.
493
+
494
+
495
+* ew/send-email-readable-message-id (2016-04-06) 1 commit
496
+ - send-email: more meaningful Message-ID
497
+
498
+ "git send-email" now uses a more readable timestamps when
499
+ formulating a message ID.
500
+
501
+ Will merge to 'next'.
502
+
503
+
504
+* mg/complete-cherry-mark-to-log (2016-04-05) 1 commit
505
+ (merged to 'next' on 2016-04-06 at 3002be6)
506
+ + completion: complete --cherry-mark for git log
507
+
508
+ The completion scripts (in contrib/) did not include the
509
+ "--cherry-mark" option when completing "git log <HT>".
510
+
511
+ Will merge to 'master'.
512
+
513
+
514
+* tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit
515
+ (merged to 'next' on 2016-04-06 at 263bba8)
516
+ + correct blame for files commited with CRLF
517
+
518
+ When running "git blame $path" with unnormalized data in the index
519
+ for the path, the data in the working tree was blamed, even though
520
+ "git add" would not have changed what is already in the index, due
521
+ to "safe crlf" that disables the line-end conversion. It has been
522
+ corrected.
523
+
524
+ Will merge to 'master'.
525
+
526
+
527
+* st/verify-tag (2016-04-06) 3 commits
528
+ - verify-tag: change variable name for readability
529
+ - t7030: test verifying multiple tags
530
+ - builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
531
+
532
+ Only the first three patches in a six-patch series.
533
+ Needs further work.
534
+
535
+
536
+* ew/send-email-drop-data-dumper (2016-04-06) 1 commit
537
+ - send-email: do not load Data::Dumper
538
+
539
+ Code clean-up.
540
+
541
+ Will merge to 'next'.
542
+
543
+
544
* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
545
(merged to 'next' on 2016-04-06 at 25d79bb)
546
+ git-format-patch.txt: don't show -s as shorthand for multiple options
@@ -609,7 +585,7 @@ of the repositories listed at
585
Will merge to 'master'.
586
587
612
-* kn/ref-filter-branch-list (2016-03-30) 16 commits
588
+* kn/ref-filter-branch-list (2016-04-12) 16 commits
589
. branch: implement '--format' option
590
. branch: use ref-filter printing APIs
591
. branch, tag: use porcelain output
@@ -630,16 +606,8 @@ of the repositories listed at
606
The code to list branches in "git branch" has been consolidated
607
with the more generic ref-filter API.
608
633
- Will be rerolled.
634
-
635
-
636
-* oa/doc-diff-check (2016-03-29) 1 commit
637
- (merged to 'next' on 2016-04-06 at e3d6e8d)
638
- + Documentation: git diff --check detects conflict markers
639
-
640
- A minor documentation update.
641
-
642
- Will merge to 'master'.
609
+ Rerolled but seems to lack jk/branch-shortening-funny-symrefs aka
610
+ $gmane/291295 yet.
611
612
613
* rz/worktree-no-checkout (2016-03-29) 1 commit
@@ -677,7 +645,7 @@ of the repositories listed at
645
repository location to use absolute paths by accident. This has
646
been corrected.
647
680
- Any further comments? Otherwise will merge to 'next'.
648
+ Will merge to 'next'.
649
650
651
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
@@ -716,17 +684,7 @@ of the repositories listed at
684
Will merge to 'master'.
685
686
719
-* ss/msvc (2016-03-30) 2 commits
720
- (merged to 'next' on 2016-04-06 at 4b53bce)
721
- + MSVC: use shipped headers instead of fallback definitions
722
- + MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
723
-
724
- Build updates for MSVC.
725
-
726
- Will merge to 'master'.
727
-
728
-
729
-* xy/format-patch-base (2016-03-31) 4 commits
687
+* xy/format-patch-base (2016-04-12) 4 commits
688
- format-patch: introduce format.base configuration
689
- format-patch: introduce --base=auto option
690
- format-patch: add '--base' option to record base tree info
@@ -736,27 +694,8 @@ of the repositories listed at
694
(public, well-known) commit the original series was built on in
695
its output.
696
739
- Will be rerolled.
740
- ($gmane/290365)
741
-
742
-
743
-* tb/safe-crlf-output-fix (2016-04-01) 7 commits
744
- . convert.c: more safer crlf handling with text attribute
745
- . correct blame for files commited with CRLF
746
- . convert: unify the "auto" handling of CRLF
747
- . t0027: test cases for combined attributes
748
- . convert: allow core.autocrlf=input and core.eol=crlf
749
- . convert.c: stream and early out
750
- . read-cache: factor out get_sha1_from_index() helper
751
-
752
- The "safe CRLF" facility disables line-end conversion from CRLF to
753
- LF when checking in if the blob registered to the index already
754
- contains CR, but some codepaths like "git blame" did not know this,
755
- and instead assumed that only the configuration and attribute
756
- settings determined how the data from the working tree is converted.
757
-
758
- Will be rerolled.
759
- ($gmane/290637)
697
+ Review comments sent.
698
+ ($gmane/291198)
699
700
701
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
@@ -778,7 +717,9 @@ of the repositories listed at
717
Will merge to 'master'.
718
719
781
-* ky/branch-m-worktree (2016-04-04) 2 commits
720
+* ky/branch-m-worktree (2016-04-08) 3 commits
721
+ (merged to 'next' on 2016-04-08 at b673b5e)
722
+ + set_worktree_head_symref(): fix error message
723
(merged to 'next' on 2016-04-06 at e7b285c)
724
+ branch -m: update all per-worktree HEADs
725
+ refs: add a new function set_worktree_head_symref
@@ -790,36 +731,6 @@ of the repositories listed at
731
Will merge to 'master'.
732
733
793
-* nd/apply-doc (2016-03-24) 2 commits
794
- (merged to 'next' on 2016-04-06 at f9bd355)
795
- + git-apply.txt: mention the behavior inside a subdir
796
- + git-apply.txt: remove a space
797
-
798
- A minor documentation update.
799
-
800
- Will merge to 'master'.
801
-
802
-
803
-* nd/apply-report-skip (2016-03-24) 1 commit
804
- (merged to 'next' on 2016-04-06 at ae2c824)
805
- + apply: report patch skipping in verbose mode
806
-
807
- "git apply -v" learned to report paths in the patch that were
808
- skipped via --include/--exclude mechanism or being outside the
809
- current working directory.
810
-
811
- Will merge to 'master'.
812
-
813
-
814
-* pb/opt-cmdmode-doc (2016-03-25) 1 commit
815
- (merged to 'next' on 2016-04-06 at a5f3835)
816
- + api-parse-options.txt: document OPT_CMDMODE()
817
-
818
- Minor API documentation update.
819
-
820
- Will merge to 'master'.
821
-
822
-
734
* rt/completion-help (2016-03-24) 2 commits
735
(merged to 'next' on 2016-04-06 at 8c3ee08)
736
+ completion: add 'revisions' and 'everyday' to 'git help'
@@ -852,6 +763,7 @@ of the repositories listed at
763
+ lazily load core.sharedrepository
764
+ wrap shared_repository global in get/set accessors
765
+ setup: document check_repository_format()
766
+ (this branch is used by dt/pre-refs-backend.)
767
768
The repository set-up sequence has been streamlined (the biggest
769
change is that there is no longer git_config_early()), so that we
@@ -880,33 +792,20 @@ of the repositories listed at
792
Will merge to 'master'.
793
794
883
-* pb/commit-verbose-config (2016-03-14) 1 commit
884
- (merged to 'next' on 2016-04-06 at e5c744f)
885
- + commit: add a commit.verbose config variable
795
+* pb/commit-verbose-config (2016-04-12) 6 commits
796
+ . commit: add a commit.verbose config variable
797
+ . t7507-commit-verbose: improve test coverage by testing number of diffs
798
+ . parse-options.c: make OPTION_COUNTUP respect "unspecified" values
799
+ . t0040-parse-options: improve test coverage
800
+ . test-parse-options: print quiet as integer
801
+ . t0040-test-parse-options.sh: fix style issues
802
803
"git commit" learned to pay attention to "commit.verbose"
804
configuration variable and act as if "--verbose" option was
805
given from the command line.
806
891
- Will merge to 'master'.
892
-
893
-
894
-* jc/merge-refuse-new-root (2016-03-23) 1 commit
895
- (merged to 'next' on 2016-04-04 at cd70fd6)
896
- + merge: refuse to create too cool a merge by default
897
-
898
- Originally merged to 'next' on 2016-03-23
899
-
900
- "git merge" used to allow merging two branches that have no common
901
- base by default, which led to a brand new history of an existing
902
- project created and then get pulled by an unsuspecting maintainer,
903
- which allowed an unnecessary parallel history merged into the
904
- existing project. The command has been taught not to allow this by
905
- default, with an escape hatch "--allow-unrelated-histories" option
906
- to be used in a rare event that merges histories of two projects
907
- that started their lives independently.
908
-
909
- Will merge to 'master'.
807
+ Old one reverted, will wait for reroll.
808
+ ($gmane/291303).
809
810
811
* lt/pretty-expand-tabs (2016-04-04) 4 commits
@@ -937,8 +836,7 @@ of the repositories listed at
836
Will merge to 'master'.
837
838
940
-* dt/index-helper (2016-03-23) 18 commits
941
- - SQUASH - minimum compilation fix
839
+* dt/index-helper (2016-04-07) 16 commits
840
- read-cache: config for waiting for index-helper
841
- index-helper: optionally automatically run
842
- index-helper: autorun mode
@@ -947,8 +845,7 @@ of the repositories listed at
845
- unpack-trees: preserve index extensions
846
- update-index: enable/disable watchman support
847
- index-helper: use watchman to avoid refreshing index with lstat()
950
- - Add watchman support to reduce index refresh cost
951
- - read-cache: invalidate untracked cache data when reading WAMA
848
+ - add watchman support to reduce index refresh cost
849
- read-cache: add watchman 'WAMA' extension
850
- index-helper: add --detach
851
- daemonize(): set a flag before exiting the main process