What's cooking (2015/10 #03)
Junio C Hamano committed
Oct 14, 2015 at 15:14 UTC
4a31164b2cf0064441ae61a02e70e8368b7042a7
1 file changed
+281
-174
whats-cooking.txt
+281
-174
@@ -1,20 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2015, #02; Wed, 7)
4
-X-master-at: f5b6079871904ba5b0a8548f91545f126caf898b
5
-X-next-at: 19af20e0b28da5dcbe194ac407afe5175cc4fb85
3
+Subject: What's cooking in git.git (Oct 2015, #03; Wed, 14)
4
+X-master-at: b27dacc1a80d1eca1994e6552d913e42d517f998
5
+X-next-at: 4b8c365398e63642c531f6a096df9da66a27f9fe
6
7
-What's cooking in git.git (Oct 2015, #02; Wed, 7)
7
+What's cooking in git.git (Oct 2015, #03; Wed, 14)
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
-The tip of 'next' has been rewound and rebuilt. I plan to start
15
-merging the topics that have been cooking just above 'next' down in
16
-the coming days.
17
-
14
With somewhat reduced review bandwidth, I'd expect that the upcoming
15
cycle would be slower than usual. At tinyurl.com/gitCal, I
16
tentatively drew a 14-week schedule for this cycle (I plan to be
@@ -30,86 +26,179 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
33
-* gb/filter-branch-progress (2015-09-21) 2 commits
34
- (merged to 'next' on 2015-09-21 at 15e698d)
35
- + filter-branch: make report-progress more readable
36
- + filter-branch: add passed/remaining seconds on progress
37
-
38
- Give progress meter to "git filter-branch".
29
+* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit
30
+ (merged to 'next' on 2015-10-07 at 8bbff49)
31
+ + Documentation: fix section header mark-up
32
33
41
-* ls/p4-path-encoding (2015-09-21) 3 commits
42
- (merged to 'next' on 2015-09-21 at 0772d82)
43
- + git-p4: use replacement character for non UTF-8 characters in paths
44
- (merged to 'next' on 2015-09-17 at 7f8b9e0)
45
- + git-p4: improve path encoding verbose output
46
- (merged to 'next' on 2015-09-08 at 56514f9)
47
- + git-p4: add config git-p4.pathEncoding
34
+* jk/notes-dwim-doc (2015-09-22) 1 commit
35
+ (merged to 'next' on 2015-10-07 at c4341d1)
36
+ + notes: correct documentation of DWIMery for notes references
37
+ (this branch is used by mh/notes-allow-reading-treeish.)
38
49
- "git p4" learned to reencode the pathname it uses to communicate
50
- with the p4 depot with a new option.
39
+ The way how --ref/--notes to specify the notes tree reference are
40
+ DWIMmed was not clearly documented.
41
42
53
-* nd/ignore-then-not-ignore (2015-09-21) 2 commits
54
- (merged to 'next' on 2015-09-21 at 2182591)
55
- + dir.c: don't exclude whole dir prematurely if neg pattern may match
56
- + dir.c: make last_exclude_matching_from_list() run til the end
43
+* nd/ls-remote-does-not-have-u-option (2015-09-28) 1 commit
44
+ (merged to 'next' on 2015-10-07 at 0790a76)
45
+ + ls-remote.txt: delete unsupported option
46
58
- Allow a later "!/abc/def" to override an earlier "/abc" that
59
- appears in the same .gitignore file to make it easier to express
60
- "everything in /abc directory is ignored, except for ...".
47
48
+* pt/pull-builtin (2015-10-02) 1 commit
49
+ (merged to 'next' on 2015-10-07 at 19af20e)
50
+ + merge: grammofix in please-commit-before-merge message
51
63
-* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit
64
- (merged to 'next' on 2015-09-08 at c8047ba)
65
- + pager: don't use unsafe functions in signal handlers
52
67
- Allocation related functions and stdio are unsafe things to call
68
- inside a signal handler, and indeed killing the pager can cause
69
- glibc to deadlock waiting on allocation mutex as our signal handler
70
- tries to free() some data structures in wait_for_pager(). Reduce
71
- these unsafe calls.
53
+* tk/typofix-connect-unknown-proto-error (2015-09-25) 1 commit
54
+ (merged to 'next' on 2015-10-07 at cc3430e)
55
+ + connect: fix typo in result string of prot_name()
56
57
--------------------------------------------------
58
[New Topics]
59
76
-* cc/quote-comments (2015-10-07) 2 commits
77
- - quote: move comment before sq_quote_buf()
78
- - quote: fix broken sq_quote_buf() related comment
60
+* jc/mailinfo (2015-10-08) 1 commit
61
+ . mailinfo: ignore in-body header that we do not care about
62
+
63
+ Some people write arbitrary garbage at the beginning of a piece of
64
+ e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
65
+ message and expect them to be discarded, even though "From:" and
66
+ "Subject:" are the only documented in-body headers that you are
67
+ supposed to have there. Allow some garbage (specifically, what may
68
+ look like RFC2822 headers like "MIME-Version: ...") to be there and
69
+ ignore them.
70
+
71
+ I have a feeling that that this is a step in a wrong direction.
72
+ Excluded from 'pu' for now.
73
80
- A no-op code-health maintenance.
74
+
75
+* jk/filter-branch-use-of-sed-on-incomplete-line (2015-10-12) 1 commit
76
+ - filter-branch: remove multi-line headers in msg filter
77
+
78
+ A recent "filter-branch --msg-filter" broke skipping of the commit
79
+ object header, which is fixed.
80
81
Will merge to 'next'.
82
83
85
-* dt/log-follow-config (2015-10-07) 1 commit
86
- - log: Update log.follow doc and add to config.txt
84
+* rd/test-path-utils (2015-10-08) 1 commit
85
+ - test-path-utils.c: remove incorrect assumption
86
88
- Description of the "log.follow" configuration variable in "git log"
89
- documentation is now also copied to "git config" documentation.
87
+ The normalize_ceiling_entry() function does not muck with the end
88
+ of the path it accepts, and the real world callers do rely on that,
89
+ but a test insisted that the function drops a trailing slash.
90
91
Will merge to 'next'.
92
93
94
-* es/worktree-add-cleanup (2015-10-07) 1 commit
95
- - t2026: rename worktree prune test
94
+* jc/doc-gc-prune-now (2015-10-14) 1 commit
95
+ - Documentation/gc: warn against --prune=<now>
96
97
- A no-op code-health maintenance.
97
+ "git gc" is safe to run anytime only because it has the built-in
98
+ grace period to protect young objects. In order to run with no
99
+ grace period, the user must make sure that the repository is
100
+ quiescent.
101
102
Will merge to 'next'.
103
104
102
-* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
103
- - pretty: add format specifiers for short and raw date formats
105
+* jc/am-mailinfo-direct (2015-10-14) 1 commit
106
+ - am: make direct call to mailinfo
107
+ (this branch uses jc/mailinfo-lib.)
108
+
109
+ "git am" used to spawn "git mailinfo" via run_command() API once
110
+ per each patch, but learned to make a direct call to mailinfo()
111
+ instead.
112
+
113
+ Needs benchmark on platforms with slow run_command().
114
+
115
+
116
+* jc/mailinfo-lib (2015-10-14) 30 commits
117
+ - mailinfo: remove calls to exit() and die() deep in the callchain
118
+ - mailinfo: handle charset conversion errors in the caller
119
+ - mailinfo: libify
120
+ - mailinfo: move definition of MAX_HDR_PARSED to closer to its use
121
+ - mailinfo: move cleanup_space() before its users
122
+ - mailinfo: move check_header() after the helpers it uses
123
+ - mailinfo: move read_one_header_line() closer to its callers
124
+ - mailinfo: move content/content_top to struct mailinfo
125
+ - mailinfo: keep the parsed log message in a strbuf
126
+ - mailinfo: move [ps]_hdr_data to struct mailinfo
127
+ - mailinfo: move cmitmsg and patchfile to struct mailinfo
128
+ - mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
129
+ - mailinfo: move charset to struct mailinfo
130
+ - mailinfo: move transfer_encoding to struct mailinfo
131
+ - mailinfo: move metainfo_charset to struct mailinfo
132
+ - mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
133
+ - mailinfo: move add_message_id and message_id to struct mailinfo
134
+ - mailinfo: move patch_lines to struct mailinfo
135
+ - mailinfo: move filter/header stage to struct mailinfo
136
+ - mailinfo: move global "FILE *fin, *fout" to struct mailinfo
137
+ - mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
138
+ - mailinfo: introduce "struct mailinfo" to hold globals
139
+ - mailinfo: move global "line" into mailinfo() function
140
+ - mailinfo: always pass "line" as an argument
141
+ - mailinfo: get rid of function-local static states
142
+ - mailinfo: move handle_boundary() lower
143
+ - mailinfo: fold decode_header_bq() into decode_header()
144
+ - mailinfo: explicitly close file handle to the patch output
145
+ - mailinfo: fix for off-by-one error in boundary stack
146
+ - mailinfo: remove a no-op call convert_to_utf8(it, "")
147
+ (this branch is used by jc/am-mailinfo-direct.)
148
+
149
+ The implementation of "git mailinfo" was refactored so that a
150
+ mailinfo() function can be directly called from inside a process.
151
+
152
+
153
+* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
154
+ - am -3: do not let failed merge from completing the error codepath
155
+ (this branch is used by js/am-3-merge-recursive-direct.)
156
+
157
+ "git am -3" had a small regression where it is aborted in its error
158
+ handling codepath when underlying merge-recursive failed in certain
159
+ ways, as it assumed that the internal call to merge-recursive will
160
+ never die, which is not the case (yet).
161
+
162
+
163
+* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
164
+ - am: make a direct call to merge_recursive
165
+ - merge_recursive_options: introduce the "gently" flag
166
+ (this branch uses jc/am-3-fallback-regression-fix.)
167
+
168
+ The merge_recursive_generic() function has been made a bit safer to
169
+ call from inside a process. "git am -3" was taught to make a direct
170
+ call to the function when falling back to three-way merge.
171
+
172
+
173
+* km/cache-entry-refcnt (2015-10-12) 1 commit
174
+ - merge: fix cache_entry use-after-free
175
+
176
+ Sometimes we discarded a cache-entry that is still referenced from
177
+ name-hash (used only to hold the pathname there), leading to use
178
+ after free errors. Reference-count cache entries to work it
179
+ around.
180
+
181
+
182
+* ls/p4-test-updates (2015-10-12) 2 commits
183
+ - git-p4: skip t9819 test case on case insensitive file systems
184
+ - git-p4: avoid "stat" command in t9815 git-p4-submit-fail
185
+
186
+ A few test scripts around "git p4" have been improved for
187
+ portability.
188
105
- Introduce "%as" and "%aR" placeholders for "log --format" to show
106
- the author date in the short and raw formats.
189
+ Will merge to 'next'.
190
108
- I have a feeling that that this is a step in a wrong direction.
191
192
+* sb/submodule-config-parse (2015-10-12) 1 commit
193
+ - submodule-config: "goto" removal in parse_config()
194
111
-* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
112
- - Documentation/interpret-trailers: Grammar fix
195
+ Will merge to 'next'.
196
+
197
+
198
+* tb/t0027-crlf (2015-10-12) 1 commit
199
+ - t0027: improve test for not-normalized files
200
+
201
+ The test for various line-ending conversions has been enhanced.
202
203
Will merge to 'next'.
204
@@ -151,21 +240,15 @@ of the repositories listed at
240
($gmane/277574)
241
242
154
-* mr/worktree-list (2015-10-05) 8 commits
155
- - fixup! worktree: add a function to get worktree details
156
- - SQUASH???
243
+* mr/worktree-list (2015-10-08) 5 commits
244
- worktree: add 'list' command
245
- worktree: add details to the worktree struct
246
- worktree: add a function to get worktree details
160
- - SQUASH???
247
- worktree: refactor find_linked_symref function
248
- worktree: add top-level worktree.c
249
250
Add the "list" subcommand to "git worktree".
251
166
- Waiting for a reroll.
167
- ($gmane/278529, $gmane/279113).
168
-
252
253
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
254
- t/lib-git-svn: check same httpd module dirs as lib-httpd
@@ -198,8 +281,11 @@ of the repositories listed at
281
($gmane/272180).
282
283
201
-* mh/notes-allow-reading-treeish (2015-07-13) 1 commit
284
+* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
285
- notes: allow treeish expressions as notes ref
286
+ + Merge branch 'jk/notes-dwim-doc' into next
287
+ + Merge branch 'jc/merge-drop-old-syntax' into next
288
+ (this branch uses jc/merge-drop-old-syntax.)
289
290
Some "git notes" operations, e.g. "git log --notes=<note>", should
291
be able to read notes from any tree-ish that is shaped like a notes
@@ -208,9 +294,6 @@ of the repositories listed at
294
when the operation would update the notes (in which case we must
295
have a place to store the updated notes tree, iow, a ref).
296
211
- Needs update to docs.
212
- ($gmane/273928)
213
-
297
298
* jc/diff-b-m (2015-02-23) 5 commits
299
. WIPWIP
@@ -229,22 +312,66 @@ of the repositories listed at
312
--------------------------------------------------
313
[Cooking]
314
232
-* dt/refs-backend-lmdb (2015-10-05) 45 commits
233
- - SQUASH???
315
+* cc/quote-comments (2015-10-07) 2 commits
316
+ (merged to 'next' on 2015-10-09 at fc8a359)
317
+ + quote: move comment before sq_quote_buf()
318
+ + quote: fix broken sq_quote_buf() related comment
319
+
320
+ A no-op code-health maintenance.
321
+
322
+ Will merge to 'master'.
323
+
324
+
325
+* dt/log-follow-config (2015-10-07) 1 commit
326
+ (merged to 'next' on 2015-10-09 at 64a30d2)
327
+ + log: Update log.follow doc and add to config.txt
328
+
329
+ Description of the "log.follow" configuration variable in "git log"
330
+ documentation is now also copied to "git config" documentation.
331
+
332
+ Will merge to 'master'.
333
+
334
+
335
+* es/worktree-add-cleanup (2015-10-07) 1 commit
336
+ (merged to 'next' on 2015-10-09 at 6ffd721)
337
+ + t2026: rename worktree prune test
338
+
339
+ A no-op code-health maintenance.
340
+
341
+ Will merge to 'master'.
342
+
343
+
344
+* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
345
+ - pretty: add format specifiers for short and raw date formats
346
+
347
+ Introduce "%as" and "%aR" placeholders for "log --format" to show
348
+ the author date in the short and raw formats.
349
+
350
+ I have a feeling that that this is a step in a wrong direction.
351
+
352
+
353
+* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
354
+ (merged to 'next' on 2015-10-09 at 37888a2)
355
+ + Documentation/interpret-trailers: Grammar fix
356
+
357
+ Will merge to 'master'.
358
+
359
+
360
+* dt/refs-backend-lmdb (2015-10-12) 45 commits
361
- refs: tests for db backend
362
- refs: add LMDB refs backend
363
+ - introduce "extensions" form of core.repositoryformatversion
364
- refs: add register_refs_backend
365
- refs: allow ref backend to be set for clone
366
+ - refs: always handle non-normal refs in files backend
367
+ - refs: move duplicate check to common code
368
- refs: break out a ref conflict check
239
- - refs: make some files backend functions public
240
- - refs: move some defines from refs-be-files.c to refs.h
241
- - run-command: track total number of commands run
369
+ - refs: make files_log_ref_write functions public
370
+ - refs: make lock generic
371
- refs-be-files.c: add method to rename refs
243
- - refs.c: make struct ref_transaction generic
372
- refs.c: add method for initializing refs db
373
- initdb: move safe_create_dir into common code
374
- refs.c: add method for initial ref transaction commit
247
- - refs-be-files.c: add method to expire reflogs
375
- refs.c: add methods for reflog
376
- refs.c: add ref backend init function
377
- refs.c: move should_autocreate_reflog to common code
@@ -256,7 +383,8 @@ of the repositories listed at
383
- refs-be-files.c: add method for for_each_reftype_...
384
- refs-be-files.c: add methods for the ref iterators
385
- refs-be-files.c: add methods for misc ref operations
259
- - refs-be-files.c: add a backend method structure with transaction functions
386
+ - refs: add a backend method structure with transaction functions
387
+ - refs: move transaction functions into common code
388
- refs.c: move head_ref_namespaced to the common code
389
- refs.c: move ref iterators to the common code
390
- refs.c: move prettify_refname to the common code
@@ -279,19 +407,19 @@ of the repositories listed at
407
408
Pluggable ref backend.
409
282
- Expecting a reroll.
283
- ($gmane/278757).
410
+ Expecting a reroll (as two parts series).
411
412
413
* gr/rebase-i-drop-warn (2015-10-05) 2 commits
287
- - rebase-i: loosen over-eager check_bad_cmd check
288
- - rebase-i: explicitly accept tab as separator in commands
414
+ (merged to 'next' on 2015-10-09 at 0626b96)
415
+ + rebase-i: loosen over-eager check_bad_cmd check
416
+ + rebase-i: explicitly accept tab as separator in commands
417
418
"git rebase -i" had a minor regression recently, which stopped
419
considering a line that begins with an indented '#' in its insn
420
sheet not a comment, which is now fixed.
421
294
- Will merge to 'next'.
422
+ Will merge to 'master'.
423
424
425
* kn/for-each-branch-remainder (2015-10-02) 9 commits
@@ -312,20 +440,6 @@ of the repositories listed at
440
($gmane/278926)
441
442
315
-* pt/pull-builtin (2015-10-02) 1 commit
316
- (merged to 'next' on 2015-10-07 at 19af20e)
317
- + merge: grammofix in please-commit-before-merge message
318
-
319
- Will merge to 'master'.
320
-
321
-
322
-* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit
323
- (merged to 'next' on 2015-10-07 at 8bbff49)
324
- + Documentation: fix section header mark-up
325
-
326
- Will merge to 'master'.
327
-
328
-
443
* jk/war-on-sprintf (2015-10-05) 70 commits
444
- name-rev: use strip_suffix to avoid magic numbers
445
- use strbuf_complete to conditionally append slash
@@ -418,146 +532,138 @@ of the repositories listed at
532
533
534
* sb/http-flaky-test-fix (2015-09-25) 1 commit
421
- - t5561: get rid of racy appending to logfile
535
+ (merged to 'next' on 2015-10-09 at 9dc37f3)
536
+ + t5561: get rid of racy appending to logfile
537
423
- Will merge to 'next'.
538
+ Will merge to 'master'.
539
540
541
* sb/perf-without-installed-git (2015-09-25) 1 commit
427
- - t/perf: make runner work even if Git is not installed
542
+ (merged to 'next' on 2015-10-09 at 7a1ed05)
543
+ + t/perf: make runner work even if Git is not installed
544
545
Performance-measurement tests did not work without an installed Git.
546
431
- Will merge to 'next'.
432
-
433
-
434
-* tk/typofix-connect-unknown-proto-error (2015-09-25) 1 commit
435
- (merged to 'next' on 2015-10-07 at cc3430e)
436
- + connect: fix typo in result string of prot_name()
437
-
547
Will merge to 'master'.
548
549
550
* js/clone-dissociate (2015-10-07) 4 commits
442
- - clone --dissociate: avoid locking pack files
443
- - sha1_file.c: add a function to release all packs
444
- - sha1_file: consolidate code to close a pack's file descriptor
445
- - t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
551
+ (merged to 'next' on 2015-10-09 at ba30393)
552
+ + clone --dissociate: avoid locking pack files
553
+ + sha1_file.c: add a function to release all packs
554
+ + sha1_file: consolidate code to close a pack's file descriptor
555
+ + t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
556
557
"git clone --dissociate" runs a big "git repack" process at the
558
end, and it helps to close file descriptors that are open on the
559
packs and their idx files before doing so on filesystems that
560
cannot remove a file that is still open.
561
452
- Will merge to 'next'.
562
+ Will merge to 'master'.
563
564
455
-* js/gc-with-stale-symref (2015-10-05) 2 commits
456
- - pack-objects: do not get distracted by broken symrefs
457
- - gc: demonstrate failure with stale remote HEAD
565
+* js/gc-with-stale-symref (2015-10-08) 2 commits
566
+ (merged to 'next' on 2015-10-09 at 8b89576)
567
+ + pack-objects: do not get distracted by broken symrefs
568
+ + gc: demonstrate failure with stale remote HEAD
569
570
"git gc" used to barf when a symbolic ref has gone dangling
571
(e.g. the branch that used to be your upstream's default when you
572
cloned from it is now gone, and you did "fetch --prune").
573
463
- Will merge to 'next'.
574
+ Will merge to 'master'.
575
576
577
* js/icase-wt-detection (2015-09-28) 1 commit
467
- - setup: fix "inside work tree" detection on case-insensitive filesystems
578
+ (merged to 'next' on 2015-10-09 at 78ff500)
579
+ + setup: fix "inside work tree" detection on case-insensitive filesystems
580
469
- Will merge to 'next'.
581
+ Will merge to 'master'.
582
583
584
* mm/detach-at-HEAD-reflog (2015-10-02) 2 commits
473
- - status: don't say 'HEAD detached at HEAD'
474
- - t3203: test 'detached at' after checkout --detach
475
-
476
- Will merge to 'next'.
585
+ (merged to 'next' on 2015-10-09 at 624bc87)
586
+ + status: don't say 'HEAD detached at HEAD'
587
+ + t3203: test 'detached at' after checkout --detach
588
478
-
479
-* nd/ls-remote-does-not-have-u-option (2015-09-28) 1 commit
480
- (merged to 'next' on 2015-10-07 at 0790a76)
481
- + ls-remote.txt: delete unsupported option
589
+ After "git checkout --detach", "git status" reported a fairly
590
+ useless "HEAD detached at HEAD", instead of saying at which exact
591
+ commit.
592
593
Will merge to 'master'.
594
595
596
* pt/am-builtin (2015-09-30) 1 commit
487
- - am: configure gpg at startup
597
+ (merged to 'next' on 2015-10-09 at 396def8)
598
+ + am: configure gpg at startup
599
600
When "git am" was rewritten as a built-in, it stopped paying
601
attention to user.signingkey.
602
492
- Will merge to 'next'.
603
+ Will merge to 'master'.
604
605
606
* sa/send-email-smtp-batch-data-limit (2015-09-30) 1 commit
496
- - git-send-email.perl: Fixed sending of many/huge changes/patches
607
+ (merged to 'next' on 2015-10-09 at c021fdf)
608
+ + git-send-email.perl: Fixed sending of many/huge changes/patches
609
610
When "git send-email" wanted to talk over Net::SMTP::SSL,
611
Net::Cmd::datasend() did not like to be fed too many bytes at the
612
same time and failed to send messages. Send the payload one line
613
at a time to work around the problem.
614
503
- Will merge to 'next'.
615
+ Will merge to 'master'.
616
617
618
* ls/p4-translation-failure (2015-09-22) 2 commits
507
- - git-p4: handle "Translation of file content failed"
508
- - git-p4: add test case for "Translation of file content failed" error
619
+ (merged to 'next' on 2015-10-09 at b462387)
620
+ + git-p4: handle "Translation of file content failed"
621
+ + git-p4: add test case for "Translation of file content failed" error
622
623
Work around "git p4" failing when the P4 depot records the contents
624
in UTF-16 without UTF-16 BOM.
625
513
- Will merge to 'next'.
514
-
515
-
516
-* jk/notes-dwim-doc (2015-09-22) 1 commit
517
- (merged to 'next' on 2015-10-07 at c4341d1)
518
- + notes: correct documentation of DWIMery for notes references
519
-
520
- The way how --ref/--notes to specify the notes tree reference are
521
- DWIMmed was not clearly documented.
522
-
626
Will merge to 'master'.
627
628
629
* kn/for-each-branch (2015-09-25) 8 commits
527
- - branch: add '--points-at' option
528
- - branch.c: use 'ref-filter' APIs
529
- - branch.c: use 'ref-filter' data structures
530
- - branch: drop non-commit error reporting
531
- - branch: move 'current' check down to the presentation layer
532
- - branch: roll show_detached HEAD into regular ref_list
533
- - branch: bump get_head_description() to the top
534
- - branch: refactor width computation
630
+ (merged to 'next' on 2015-10-09 at 45723ce)
631
+ + branch: add '--points-at' option
632
+ + branch.c: use 'ref-filter' APIs
633
+ + branch.c: use 'ref-filter' data structures
634
+ + branch: drop non-commit error reporting
635
+ + branch: move 'current' check down to the presentation layer
636
+ + branch: roll show_detached HEAD into regular ref_list
637
+ + branch: bump get_head_description() to the top
638
+ + branch: refactor width computation
639
(this branch is used by kn/for-each-branch-remainder.)
640
641
Update "git branch" that list existing branches, using the
642
ref-filter API that is shared with "git tag" and "git
643
for-each-ref".
644
541
- Will merge to 'next'.
645
+ Will merge to 'master'.
646
647
648
* jc/fsck-dropped-errors (2015-09-23) 1 commit
545
- - fsck: exit with non-zero when problems are found
649
+ (merged to 'next' on 2015-10-09 at 887fcac)
650
+ + fsck: exit with non-zero when problems are found
651
652
There were some classes of errors that "git fsck" diagnosed to its
653
standard error that did not cause it to exit with non-zero status.
654
550
- Will merge to 'next'.
655
+ Will merge to 'master'.
656
657
658
* nd/gc-auto-background-fix (2015-09-21) 1 commit
554
- - gc: save log from daemonized gc --auto and print it next time
659
+ (merged to 'next' on 2015-10-09 at 1f0fc60)
660
+ + gc: save log from daemonized gc --auto and print it next time
661
662
When "git gc --auto" is backgrounded, its diagnosis message is
663
lost. Save it to a file in $GIT_DIR and show it next time the "gc
664
--auto" is run.
665
560
- Will merge to 'next'.
666
+ Will merge to 'master'.
667
668
669
* jk/graph-format-padding (2015-09-14) 1 commit
@@ -579,7 +685,7 @@ of the repositories listed at
685
($gmane/278326)
686
687
582
-* sb/submodule-parallel-fetch (2015-10-02) 8 commits
688
+* sb/submodule-parallel-fetch (2015-10-12) 8 commits
689
- submodules: allow parallel fetching, add tests and documentation
690
- fetch_populated_submodules: use new parallel job processing
691
- run-command: add an asynchronous parallel child processor
@@ -592,49 +698,49 @@ of the repositories listed at
698
Add a framework to spawn a group of processes in parallel, and use
699
it to run "git fetch --recurse-submodules" in parallel.
700
595
- The overall structure seems more-or-less sensible.
596
- ($gmane/278873)
597
-
701
Will merge to 'next'.
702
703
704
* mk/submodule-gitdir-path (2015-09-14) 2 commits
602
- - path: implement common_dir handling in git_pathdup_submodule()
603
- - submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
705
+ (merged to 'next' on 2015-10-09 at cf8768e)
706
+ + path: implement common_dir handling in git_pathdup_submodule()
707
+ + submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
708
709
The submodule code has been taught to work better with separate
710
work trees created via "git worktree add".
711
608
- Will merge to 'next'.
712
+ Will merge to 'master'.
713
714
715
* ls/p4-lfs (2015-10-03) 7 commits
612
- - git-p4: add Git LFS backend for large file system
613
- - git-p4: add support for large file systems
614
- - git-p4: check free space during streaming
615
- - git-p4: add file streaming progress in verbose mode
616
- - git-p4: return an empty list if a list config has no values
617
- - git-p4: add gitConfigInt reader
618
- - git-p4: add optional type specifier to gitConfig reader
716
+ (merged to 'next' on 2015-10-14 at 4b8c365)
717
+ + git-p4: add Git LFS backend for large file system
718
+ + git-p4: add support for large file systems
719
+ + git-p4: check free space during streaming
720
+ + git-p4: add file streaming progress in verbose mode
721
+ + git-p4: return an empty list if a list config has no values
722
+ + git-p4: add gitConfigInt reader
723
+ + git-p4: add optional type specifier to gitConfig reader
724
725
Teach "git p4" to send large blobs outside the repository by
726
talking to Git LFS.
727
623
- Will merge to 'next'.
728
+ Will merge to 'master'.
729
730
731
* nd/clone-linked-checkout (2015-09-28) 6 commits
627
- - clone: better error when --reference is a linked checkout
628
- - clone: allow --local from a linked checkout
629
- - enter_repo: allow .git files in strict mode
630
- - enter_repo: avoid duplicating logic, use is_git_directory() instead
631
- - t0002: add test for enter_repo(), non-strict mode
632
- - path.c: delete an extra space
732
+ (merged to 'next' on 2015-10-09 at a93973f)
733
+ + clone: better error when --reference is a linked checkout
734
+ + clone: allow --local from a linked checkout
735
+ + enter_repo: allow .git files in strict mode
736
+ + enter_repo: avoid duplicating logic, use is_git_directory() instead
737
+ + t0002: add test for enter_repo(), non-strict mode
738
+ + path.c: delete an extra space
739
740
It was not possible to use a repository-lookalike created by "git
741
worktree add" as a local source of "git clone".
742
637
- Will merge to 'next'.
743
+ Will merge to 'master'.
744
745
746
* ad/cygwin-wants-rename (2015-08-07) 1 commit
@@ -661,6 +767,7 @@ of the repositories listed at
767
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
768
(merged to 'next' on 2015-10-07 at 50fed71)
769
+ merge: drop 'git merge <message> HEAD <commit>' syntax
770
+ (this branch is used by mh/notes-allow-reading-treeish.)
771
772
Originally merged to 'next' on 2015-05-28
773