What's cooking (2015/03 #07)
Junio C Hamano committed
Mar 20, 2015 at 14:46 UTC
1bb72ec1d73991da5c0c0ce18a793d0d2e7cc09c
1 file changed
+310
-230
whats-cooking.txt
+310
-230
@@ -1,16 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2015, #06; Tue, 17)
4
-X-master-at: 9ab698f4000a736864c41f57fbae1e021ac27799
5
-X-next-at: 9c5cf4debae1a49f88979567369a5809977ff34b
3
+Subject: What's cooking in git.git (Mar 2015, #07; Fri, 20)
4
+X-master-at: e80e85a52adfda053cafc3b23058a86aff35404f
5
+X-next-at: d87118a61e74087359ac4d43ef91e5be61958443
6
7
-What's cooking in git.git (Mar 2015, #06; Tue, 17)
7
+What's cooking in git.git (Mar 2015, #07; Fri, 20)
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
+Now we are almost at the end of week #6, and hopefully we can do a
15
+-rc0 late next week to start wrapping this cycle up.
16
+
17
You can find the changes described here in the integration branches
18
of the repositories listed at
19
@@ -19,106 +22,295 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
22
-* ak/git-done-help-cleanup (2015-03-06) 1 commit
23
- (merged to 'next' on 2015-03-10 at 971382b)
24
- + git: make was_alias and done_help non-static
25
+* jc/decorate-leaky-separator-color (2015-03-04) 7 commits
26
+ (merged to 'next' on 2015-03-13 at 38e7cd1)
27
+ + log --decorate: do not leak "commit" color into the next item
28
+ + Documentation/config.txt: simplify boolean description in the syntax section
29
+ + Documentation/config.txt: describe 'color' value type in the "Values" section
30
+ + Documentation/config.txt: have a separate "Values" section
31
+ + Documentation/config.txt: describe the structure first and then meaning
32
+ + Documentation/config.txt: explain multi-valued variables once
33
+ + Documentation/config.txt: avoid unnecessary negation
34
+ (this branch is used by mg/log-decorate-HEAD.)
35
+
36
+ "git log --decorate" did not reset colors correctly around the
37
+ branch names.
38
+
39
26
- Code simplification.
40
+* km/bsd-shells (2015-03-10) 5 commits
41
+ (merged to 'next' on 2015-03-13 at f839e4c)
42
+ + t5528: do not fail with FreeBSD shell
43
+ + help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
44
+ + git-compat-util.h: move SHELL_PATH default into header
45
+ + git-instaweb: use @SHELL_PATH@ instead of /bin/sh
46
+ + git-instaweb: allow running in a working tree subdirectory
47
+
48
+ Portability fixes and workarounds for shell scripts have been added
49
+ to help BSD-derived systems.
50
+
51
+
52
+* km/bsd-sysctl (2015-03-10) 2 commits
53
+ (merged to 'next' on 2015-03-13 at c4557c9)
54
+ + thread-utils.c: detect CPU count on older BSD-like systems
55
+ + configure: support HAVE_BSD_SYSCTL option
56
+
57
+ We now detect number of CPUs on older BSD-derived systems.
58
+
59
+
60
+* km/imap-send-libcurl-options (2015-03-10) 1 commit
61
+ (merged to 'next' on 2015-03-13 at 569d0c4)
62
+ + imap-send: use cURL automatically when NO_OPENSSL defined
63
+
64
+ "git imap-send" learned to optionally talk with an IMAP server via
65
+ libcURL; because there is no other option when Git is built with
66
+ NO_OPENSSL option, use that codepath by default under such
67
+ configuration.
68
69
29
-* es/rebase-i-count-todo (2015-03-06) 2 commits
30
- (merged to 'next' on 2015-03-10 at fff95d5)
31
- + rebase-interactive: re-word "item count" comment
32
- + rebase-interactive: suppress whitespace preceding item count
70
+* kn/git-cd-to-empty (2015-03-06) 1 commit
71
+ (merged to 'next' on 2015-03-12 at 54dea03)
72
+ + git: treat "git -C '<path>'" as a no-op when <path> is empty
73
34
- "git rebase -i" recently started to include the number of
35
- commits in the insn sheet to be processed, but on a platform
36
- that prepends leading whitespaces to "wc -l" output, the numbers
37
- are shown with extra whitespaces that aren't necessary.
74
+ "git -C '' subcmd" refused to work in the current directory, unlike
75
+ "cd ''" which silently behaves as a no-op.
76
77
40
-* mg/doc-status-color-slot (2015-03-10) 1 commit
41
- (merged to 'next' on 2015-03-12 at e53910a)
42
- + config,completion: add color.status.unmerged
78
+* mg/detached-head-report (2015-03-06) 2 commits
79
+ (merged to 'next' on 2015-03-12 at 89443b5)
80
+ + branch: name detached HEAD analogous to status
81
+ + wt-status: refactor detached HEAD analysis
82
44
- Documentation fixes.
83
+ "git branch" on a detached HEAD always said "(detached from xyz)",
84
+ even when "git status" would report "detached at xyz". The HEAD is
85
+ actually at xyz and haven't been moved since it was detached in
86
+ such a case, but the user cannot read what the current value of
87
+ HEAD is when "detached from" is used.
88
89
47
-* mg/sequencer-commit-messages-always-verbatim (2015-03-06) 1 commit
48
- (merged to 'next' on 2015-03-10 at 6a09295)
49
- + sequencer: preserve commit messages
90
+* mg/log-decorate-HEAD (2015-03-10) 2 commits
91
+ (merged to 'next' on 2015-03-13 at 96ce660)
92
+ + log: decorate HEAD with branch name
93
+ + Merge branch 'jc/decorate-leaky-separator-color' into HEAD
94
+ (this branch uses jc/decorate-leaky-separator-color.)
95
51
- "git cherry-pick" used to clean-up the log message even when it is
52
- merely replaying an existing commit. It now replays the message
53
- verbatim unless you are editing the message of resulting commits.
96
+ Output from "git log --decorate" mentions HEAD when it points at a
97
+ tip of an branch differently from a detached HEAD.
98
99
+ This is a potentially backward-incompatible change.
100
56
-* mg/status-v-v (2015-03-06) 3 commits
57
- (merged to 'next' on 2015-03-10 at 4fa5af0)
58
- + commit/status: show the index-worktree diff with -v -v
59
- + t7508: test git status -v
60
- + t7508: .gitignore 'expect' and 'output' files
101
62
- "git status" now allows the "-v" to be given twice to show the
63
- differences that are left in the working tree not to be committed.
102
+* mg/verify-commit (2015-03-10) 1 commit
103
+ (merged to 'next' on 2015-03-13 at 292197f)
104
+ + t7510: do not fail when gpg warns about insecure memory
105
106
+ Workarounds for certain build of GPG that triggered false breakage
107
+ in a test.
108
66
-* rs/deflate-init-cleanup (2015-03-05) 1 commit
67
- (merged to 'next' on 2015-03-10 at 053157f)
68
- + zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
109
70
- Code simplification.
110
+* nd/versioncmp-prereleases (2015-03-10) 2 commits
111
+ (merged to 'next' on 2015-03-10 at 1df647c)
112
+ + config.txt: update versioncmp.prereleaseSuffix
113
+ (merged to 'next' on 2015-03-03 at 6ab29cf)
114
+ + versionsort: support reorder prerelease suffixes
115
116
+ The versionsort.prerelease configuration variable can be used to
117
+ specify that v1.0-pre1 comes before v1.0.
118
73
-* rs/zip-text (2015-03-05) 1 commit
74
- (merged to 'next' on 2015-03-10 at 2f3fa92)
75
- + archive-zip: mark text files in archives
119
77
- "git archive" can now be told to set the 'text' attribute in the
78
- resulting zip archive.
120
+* rs/daemon-hostname-in-strbuf (2015-03-09) 2 commits
121
+ (merged to 'next' on 2015-03-12 at 7f61f07)
122
+ + daemon: deglobalize hostname information
123
+ + daemon: use strbuf for hostname info
124
125
+ Code in "git daemon" to parse out and hold hostnames used in
126
+ request interpolation has been simplified.
127
81
-* sg/completion-remote (2015-03-06) 2 commits
82
- (merged to 'next' on 2015-03-10 at e1cd42b)
83
- + completion: simplify __git_remotes()
84
- + completion: add a test for __git_remotes() helper function
128
86
- Code simplification.
129
+* rs/use-isxdigit (2015-03-10) 1 commit
130
+ (merged to 'next' on 2015-03-13 at 39e99dd)
131
+ + use isxdigit() for checking if a character is a hexadecimal digit
132
+
133
+ Code cleanup.
134
+
135
+
136
+* sb/leaks (2015-03-10) 3 commits
137
+ (merged to 'next' on 2015-03-13 at 50317d6)
138
+ + builtin/help.c: fix memory leak
139
+ + bundle.c: fix memory leak
140
+ + connect.c: do not leak "conn" after showing diagnosis
141
+
142
+ Code cleanup.
143
144
--------------------------------------------------
145
[New Topics]
146
91
-* js/completion-ctags-pattern-substitution-fix (2015-03-14) 1 commit
92
- (merged to 'next' on 2015-03-17 at 4a68861)
93
- + contrib/completion: escape the forward slash in __git_match_ctag
147
+* jk/cleanup-failed-clone (2015-03-19) 2 commits
148
+ - clone: drop period from end of die_errno message
149
+ - clone: initialize atexit cleanup handler earlier
150
95
- The code that reads from the ctags file in the completion script
96
- (in contrib/) did not spell ${param/pattern/string} substitution
97
- correctly, which happened to work with bash but not with zsh.
151
+ An failure early in the "git clone" that started creating the
152
+ working tree and repository could have resulted in some directories
153
+ and files left without getting cleaned up.
154
+
155
+ Will merge to 'next'.
156
+
157
+
158
+* jk/fetch-pack (2015-03-19) 4 commits
159
+ - fetch-pack: remove dead assignment to ref->new_sha1
160
+ - fetch_refs_via_pack: free extra copy of refs
161
+ - filter_ref: make a copy of extra "sought" entries
162
+ - filter_ref: avoid overwriting ref->old_sha1 with garbage
163
+
164
+ "git fetch" that fetches a commit using the allow-tip-sha1-in-want
165
+ extension could have failed to fetch all the requested refs.
166
+
167
+ Will merge to 'next'.
168
+
169
+
170
+* jk/prune-with-corrupt-refs (2015-03-20) 5 commits
171
+ - refs.c: drop curate_packed_refs
172
+ - repack: turn on "ref paranoia" when doing a destructive repack
173
+ - prune: turn on ref_paranoia flag
174
+ - refs: introduce a "ref paranoia" flag
175
+ - t5312: test object deletion code paths in a corrupted repository
176
+
177
+ "git prune" used to largely ignore broken refs when deciding which
178
+ objects are still being used, which could spread an existing small
179
+ damage and make it a larger one.
180
+
181
+ Will merge to 'next'.
182
+
183
+
184
+* jk/simplify-csum-file-sha1fd-check (2015-03-19) 1 commit
185
+ (merged to 'next' on 2015-03-20 at 6f6d1c2)
186
+ + sha1fd_check: die when we cannot open the file
187
+
188
+ Code simplification.
189
190
Will merge to 'master'.
191
192
102
-* jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
103
- - "-" and "@{-1}" on various programs
193
+* mh/numparse (2015-03-19) 14 commits
194
+ - diff_opt_parse(): use convert_i() when handling --abbrev=<num>
195
+ - diff_opt_parse(): use convert_i() when handling "-l<num>"
196
+ - opt_arg(): simplify pointer handling
197
+ - opt_arg(): report errors parsing option values
198
+ - opt_arg(): use convert_i() in implementation
199
+ - opt_arg(): val is always non-NULL
200
+ - builtin_diff(): detect errors when parsing --unified argument
201
+ - handle_revision_opt(): use convert_ui() when handling "--abbrev="
202
+ - strtoul_ui(), strtol_i(): remove functions
203
+ - handle_revision_opt(): use convert_i() when handling "-<digit>"
204
+ - handle_revision_opt(): use skip_prefix() in many places
205
+ - write_subdirectory(): use convert_ui() for parsing mode
206
+ - cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
207
+ - numparse: new module for parsing integral numbers
208
105
- Lose special case code to make a lone dash "-" mean the previous
106
- branch aka "@{-1}" from a handful subcommands, and instead support
107
- the notation throughout the system by reimplementing it at the
108
- revisions layer.
209
+ Many codepaths use unchecked use of strtol() and friends (or even
210
+ worse, atoi()). Introduce a set of wrappers that try to be more
211
+ careful.
212
110
- Needs tests, documentation updates, etc.
213
214
+* tf/gitweb-project-listing (2015-03-19) 5 commits
215
+ - gitweb: make category headings into links when they are directories
216
+ - gitweb: optionally set project category from its pathname
217
+ - gitweb: add a link under the search box to clear a project filter
218
+ - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
219
+ - gitweb: fix typo in man page
220
113
-* jc/submitting-patches-mention-send-email (2015-03-15) 1 commit
114
- - SubmittingPatches: encourage users to use format-patch and send-email
221
+ Update gitweb to make it more pleasant to deal with a hierarchical
222
+ forest of repositories.
223
+
224
+ Any comments from those who use or have their own code in Gitweb?
225
116
- Recommend format-patch and send-email for those who want to submit
117
- patches to this project.
226
+
227
+* ws/grep-quiet-no-pager (2015-03-19) 1 commit
228
+ (merged to 'next' on 2015-03-20 at b3f5fe6)
229
+ + grep: fix "--quiet" overwriting current output
230
+
231
+ Even though "git grep --quiet" is run merely to ask for the exit
232
+ status, we spawned the pager regardless. Stop doing that.
233
+
234
+ Will merge to 'master'.
235
+
236
+
237
+* kd/rev-list-bisect-first-parent (2015-03-19) 1 commit
238
+ (merged to 'next' on 2015-03-20 at 5477bf5)
239
+ + rev-list: refuse --first-parent combined with --bisect
240
+
241
+ "git rev-list --bisect --first-parent" does not work (yet) and can
242
+ even cause SEGV; forbid it. "git log --bisect --first-parent"
243
+ would not be useful until "git bisect --first-parent" materializes,
244
+ so it is also forbidden for now.
245
+
246
+ Will merge to 'master'.
247
+
248
+
249
+* jk/test-chain-lint (2015-03-20) 27 commits
250
+ - t9158, t9161: fix broken &&-chain in git-svn tests
251
+ - t9104: fix test for following larger parents
252
+ - t4104: drop hand-rolled error reporting
253
+ - t0005: fix broken &&-chains
254
+ - t7004: fix embedded single-quotes
255
+ - t0050: appease --chain-lint
256
+ - t9001: use test_when_finished
257
+ - t4117: use modern test_* helpers
258
+ - t6034: use modern test_* helpers
259
+ - t1301: use modern test_* helpers
260
+ - t0020: use modern test_* helpers
261
+ - t6030: use modern test_* helpers
262
+ - t9502: fix &&-chain breakage
263
+ - t7201: fix &&-chain breakage
264
+ - t3600: fix &&-chain breakage for setup commands
265
+ - t: avoid using ":" for comments
266
+ - t: wrap complicated expect_code users in a block
267
+ - t: use test_expect_code instead of hand-rolled comparison
268
+ - t: use test_might_fail for diff and grep
269
+ - t: fix &&-chaining issues around setup which might fail
270
+ - t: use test_must_fail instead of hand-rolled blocks
271
+ - t: use verbose instead of hand-rolled errors
272
+ - t: assume test_cmp produces verbose output
273
+ - t: fix trivial &&-chain breakage
274
+ - t: fix moderate &&-chain breakage
275
+ - t: fix severe &&-chain breakage
276
+ - t/test-lib: introduce --chain-lint option
277
+
278
+ People often forget to chain the commands in their test together
279
+ with &&, leaving a failure from an earlier command in the test go
280
+ unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to
281
+ catch such a mistake more easily.
282
+
283
+ What I queued here has fix to the issue J6t found in 15/25 squashed
284
+ in, and also has 26/25 and 27/25 follow-up fixes from Michael. If
285
+ everybody involved is happy with it, then we can just proceed with
286
+ this copy, otherwise I'll let Peff reroll. I am happy either way.
287
+
288
+
289
+* tg/test-index-v4 (2015-03-20) 1 commit
290
+ - t1700: make test pass with index-v4
291
+
292
+ A test fix.
293
+
294
+ Will merge to 'next'.
295
296
--------------------------------------------------
297
[Stalled]
298
299
+* mh/fdopen-with-retry (2015-03-06) 6 commits
300
+ - buffer_fdinit(): use fdopen_with_retry()
301
+ - update_info_file(): use fdopen_with_retry()
302
+ - copy_to_log(): use fdopen_with_retry()
303
+ - fdopen_lock_file(): use fdopen_with_retry()
304
+ - SQUASH??? $gmane/264889
305
+ - xfdopen(): if first attempt fails, free memory and try again
306
+
307
+ Various parts of the code where they call fdopen() can fail when
308
+ they run out of memory; attempt to proceed by retrying the
309
+ operation after freeing some resource.
310
+
311
+ Waiting for further comments.
312
+
313
+
314
* nd/untracked-cache (2015-03-12) 24 commits
315
- git-status.txt: advertisement for untracked cache
316
- untracked cache: guard and disable on system changes
@@ -298,6 +490,39 @@ of the repositories listed at
490
--------------------------------------------------
491
[Cooking]
492
493
+* js/completion-ctags-pattern-substitution-fix (2015-03-14) 1 commit
494
+ (merged to 'next' on 2015-03-17 at 4a68861)
495
+ + contrib/completion: escape the forward slash in __git_match_ctag
496
+
497
+ The code that reads from the ctags file in the completion script
498
+ (in contrib/) did not spell ${param/pattern/string} substitution
499
+ correctly, which happened to work with bash but not with zsh.
500
+
501
+ Will merge to 'master'.
502
+
503
+
504
+* jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
505
+ - "-" and "@{-1}" on various programs
506
+
507
+ Lose special case code to make a lone dash "-" mean the previous
508
+ branch aka "@{-1}" from a handful subcommands, and instead support
509
+ the notation throughout the system by reimplementing it at the
510
+ revisions layer.
511
+
512
+ Needs tests, documentation updates, etc. Also does only a half-way
513
+ job dealing with range notation, which needs to be fixed before the
514
+ series goes anywhere.
515
+
516
+
517
+* jc/submitting-patches-mention-send-email (2015-03-15) 1 commit
518
+ - SubmittingPatches: encourage users to use format-patch and send-email
519
+
520
+ Recommend format-patch and send-email for those who want to submit
521
+ patches to this project.
522
+
523
+ Will merge to 'next'.
524
+
525
+
526
* jk/push-config (2015-03-14) 4 commits
527
(merged to 'next' on 2015-03-16 at 6452570)
528
+ push: allow --follow-tags to be set by config push.followTags
@@ -325,6 +550,12 @@ of the repositories listed at
550
* as/userdiff-sh (2015-03-13) 1 commit
551
- userdiff: funcname and word patterns for sh
552
553
+ Add a built-in "userdiff" patterns to word-split and identify
554
+ notable lines in shell scripts to help presentation of diff and
555
+ grep output.
556
+
557
+ Comments???
558
+
559
560
* bc/object-id (2015-03-13) 10 commits
561
- apply: convert threeway_stage to object_id
@@ -347,12 +578,13 @@ of the repositories listed at
578
579
580
* ct/prompt-untracked-fix (2015-03-15) 1 commit
350
- - git prompt: use toplevel to find untracked files
581
+ (merged to 'next' on 2015-03-20 at 0d57eaf)
582
+ + git prompt: use toplevel to find untracked files
583
584
The prompt script (in contrib/) did not show the untracked sign
585
when working in a subdirectory without any untracked files.
586
355
- Will merge to 'next'
587
+ Will merge to 'master'.
588
589
590
* jk/smart-http-hide-refs (2015-03-12) 2 commits
@@ -374,6 +606,8 @@ of the repositories listed at
606
+ t: redirect stderr GIT_TRACE to descriptor 4
607
+ t: translate SIGINT to an exit
608
609
+ Test fixes.
610
+
611
Will merge to 'master'.
612
613
@@ -381,158 +615,20 @@ of the repositories listed at
615
(merged to 'next' on 2015-03-16 at 0e3fedb)
616
+ *config.txt: stick to camelCase naming convention
617
384
- Will merge to 'master'.
385
-
386
-
387
-* kn/git-cd-to-empty (2015-03-06) 1 commit
388
- (merged to 'next' on 2015-03-12 at 54dea03)
389
- + git: treat "git -C '<path>'" as a no-op when <path> is empty
390
-
391
- "git -C '' subcmd" refused to work in the current directory, unlike
392
- "cd ''" which silently behaves as a no-op.
618
+ Documentation updates.
619
620
Will merge to 'master'.
621
622
397
-* dj/log-graph-with-no-walk (2015-03-17) 2 commits
398
- - SQUASH: no test $a -a $b please
399
- - revision: forbid combining --graph and --no-walk
623
+* dj/log-graph-with-no-walk (2015-03-19) 1 commit
624
+ (merged to 'next' on 2015-03-20 at cb636c0)
625
+ + revision: forbid combining --graph and --no-walk
626
627
"git log --graph --no-walk A B..." is a otcnflicting request that
628
asks nonsense; no-walk tells us show discrete points in the
629
history, while graph asks to draw connections between these
630
discrete points. Forbid the combination.
631
406
-
407
-* km/bsd-shells (2015-03-10) 5 commits
408
- (merged to 'next' on 2015-03-13 at f839e4c)
409
- + t5528: do not fail with FreeBSD shell
410
- + help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
411
- + git-compat-util.h: move SHELL_PATH default into header
412
- + git-instaweb: use @SHELL_PATH@ instead of /bin/sh
413
- + git-instaweb: allow running in a working tree subdirectory
414
-
415
- Portability fixes and workarounds for shell scripts have been added
416
- to help BSD-derived systems.
417
-
418
- Will merge to 'master'.
419
-
420
-
421
-* km/bsd-sysctl (2015-03-10) 2 commits
422
- (merged to 'next' on 2015-03-13 at c4557c9)
423
- + thread-utils.c: detect CPU count on older BSD-like systems
424
- + configure: support HAVE_BSD_SYSCTL option
425
-
426
- We now detect number of CPUs on older BSD-derived systems.
427
-
428
- Will merge to 'master'.
429
-
430
-
431
-* km/imap-send-libcurl-options (2015-03-10) 1 commit
432
- (merged to 'next' on 2015-03-13 at 569d0c4)
433
- + imap-send: use cURL automatically when NO_OPENSSL defined
434
-
435
- "git imap-send" learned to optionally talk with an IMAP server via
436
- libcURL; because there is no other option when Git is built with
437
- NO_OPENSSL option, use that codepath by default under such
438
- configuration.
439
-
440
- Will merge to 'master'.
441
-
442
-
443
-* mg/verify-commit (2015-03-10) 1 commit
444
- (merged to 'next' on 2015-03-13 at 292197f)
445
- + t7510: do not fail when gpg warns about insecure memory
446
-
447
- Workarounds for certain build of GPG that triggered false breakage
448
- in a test..
449
-
450
- Will merge to 'master'.
451
-
452
-
453
-* rs/use-isxdigit (2015-03-10) 1 commit
454
- (merged to 'next' on 2015-03-13 at 39e99dd)
455
- + use isxdigit() for checking if a character is a hexadecimal digit
456
-
457
- Code cleanup.
458
-
459
- Will merge to 'master'.
460
-
461
-
462
-* sb/leaks (2015-03-10) 3 commits
463
- (merged to 'next' on 2015-03-13 at 50317d6)
464
- + builtin/help.c: fix memory leak
465
- + bundle.c: fix memory leak
466
- + connect.c: do not leak "conn" after showing diagnosis
467
-
468
- Code cleanup.
469
-
470
- Will merge to 'master'.
471
-
472
-
473
-* mh/fdopen-with-retry (2015-03-06) 6 commits
474
- - buffer_fdinit(): use fdopen_with_retry()
475
- - update_info_file(): use fdopen_with_retry()
476
- - copy_to_log(): use fdopen_with_retry()
477
- - fdopen_lock_file(): use fdopen_with_retry()
478
- - SQUASH??? $gmane/264889
479
- - xfdopen(): if first attempt fails, free memory and try again
480
-
481
- Various parts of the code where they call fdopen() can fail when
482
- they run out of memory; attempt to proceed by retrying the
483
- operation after freeing some resource.
484
-
485
- Waiting for further comments.
486
-
487
-
488
-* mg/log-decorate-HEAD (2015-03-10) 2 commits
489
- (merged to 'next' on 2015-03-13 at 96ce660)
490
- + log: decorate HEAD with branch name
491
- + Merge branch 'jc/decorate-leaky-separator-color' into HEAD
492
- (this branch uses jc/decorate-leaky-separator-color.)
493
-
494
- Output from "git log --decorate" mentions HEAD when it points at a
495
- tip of an branch differently from a detached HEAD.
496
-
497
- This is a potentially backward-incompatible change.
498
-
499
- Will merge to 'master'.
500
-
501
-
502
-* rs/daemon-hostname-in-strbuf (2015-03-09) 2 commits
503
- (merged to 'next' on 2015-03-12 at 7f61f07)
504
- + daemon: deglobalize hostname information
505
- + daemon: use strbuf for hostname info
506
-
507
- Code in "git daemon" to parse out and hold hostnames used in
508
- request interpolation has been simplified.
509
-
510
- Will merge to 'master'.
511
-
512
-
513
-* mg/detached-head-report (2015-03-06) 2 commits
514
- (merged to 'next' on 2015-03-12 at 89443b5)
515
- + branch: name detached HEAD analogous to status
516
- + wt-status: refactor detached HEAD analysis
517
-
518
- "git branch" on a detached HEAD always said "(detached from xyz)",
519
- even when "git status" would report "detached at xyz". The HEAD is
520
- actually at xyz and haven't been moved since it was detached in
521
- such a case, but the user cannot read what the current value of
522
- HEAD is when "detached from" is used.
523
-
524
- Will merge to 'master'.
525
-
526
-
527
-* nd/versioncmp-prereleases (2015-03-10) 2 commits
528
- (merged to 'next' on 2015-03-10 at 1df647c)
529
- + config.txt: update versioncmp.prereleaseSuffix
530
- (merged to 'next' on 2015-03-03 at 6ab29cf)
531
- + versionsort: support reorder prerelease suffixes
532
-
533
- The versionsort.prerelease configuration variable can be used to
534
- specify that v1.0-pre1 comes before v1.0.
535
-
632
Will merge to 'master'.
633
634
@@ -572,27 +668,9 @@ of the repositories listed at
668
A new "git list-files" Porcelain command, "ls-files" with bells and
669
whistles.
670
575
- Concern was raised that this is piggybacking on ls-files codebase,
576
- rather than wt-status codebase ($gmane/264258).
577
-
578
- Waiting for further comments or a reroll.
579
-
580
-
581
-* jc/decorate-leaky-separator-color (2015-03-04) 7 commits
582
- (merged to 'next' on 2015-03-13 at 38e7cd1)
583
- + log --decorate: do not leak "commit" color into the next item
584
- + Documentation/config.txt: simplify boolean description in the syntax section
585
- + Documentation/config.txt: describe 'color' value type in the "Values" section
586
- + Documentation/config.txt: have a separate "Values" section
587
- + Documentation/config.txt: describe the structure first and then meaning
588
- + Documentation/config.txt: explain multi-valued variables once
589
- + Documentation/config.txt: avoid unnecessary negation
590
- (this branch is used by mg/log-decorate-HEAD.)
591
-
592
- "git log --decorate" did not reset colors correctly around the
593
- branch names.
594
-
595
- Will merge to 'master'
671
+ Reroll to base on wt-status work ($gmane/265142) has seen some
672
+ positive discussions. Waiting for a further polished reroll
673
+ ($gmane/265534).
674
675
676
* js/fsck-opt (2015-01-21) 19 commits
@@ -622,7 +700,9 @@ of the repositories listed at
700
Expecting a reroll.
701
702
625
-* nd/multiple-work-trees (2015-01-27) 38 commits
703
+* nd/multiple-work-trees (2015-03-20) 39 commits
704
+ (merged to 'next' on 2015-03-20 at cc98ed0)
705
+ + t2026: fix broken &&-chain
706
(merged to 'next' on 2015-02-18 at b51f696)
707
+ t2026 needs procondition SANITY
708
+ git-checkout.txt: a note about multiple checkout support for submodules