What's cooking (2015/03 #03)
Junio C Hamano committed
Mar 6, 2015 at 15:45 UTC
05b63a7f5fe5002a8d8228f72adc245f81960f7f
1 file changed
+138
-209
whats-cooking.txt
+138
-209
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2015, #02; Thu, 5)
4
-X-master-at: 83036f8541ad8999974863db9d2ac02a814e6395
5
-X-next-at: e3086922e7b3f8f159b5b6631ba0052d0b37bcfc
3
+Subject: What's cooking in git.git (Mar 2015, #03; Fri, 6)
4
+X-master-at: d67f9d5e8fd2c165304153a87fd96054d2b74981
5
+X-next-at: 9704172a1848f24ce72de64c49b043350d93b393
6
7
-What's cooking in git.git (Mar 2015, #02; Thu, 5)
7
+What's cooking in git.git (Mar 2015, #03; Fri, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'.
13
14
A few more batches of topics have been merged to 'master', including
15
-both fixes and enhancements. First maintenance release for v2.3 was
16
-cut with many fixes that have already been merged to 'master', and
17
-the v2.3.2 will also appear shortly.
15
+both fixes and enhancements. The second maintenance release for
16
+v2.3 has been cut with many fixes that have already been merged to
17
+'master'.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -24,212 +24,162 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
27
-* ew/svn-fixes (2015-02-26) 2 commits
28
- (merged to 'next' on 2015-03-03 at 18e4684)
29
- + Merge branch 'svn-maint-fixes' into svn-fixes
30
- + git-svn: lazy load some modules
31
- (this branch uses ew/svn-maint-fixes.)
27
+* ak/t5516-typofix (2015-03-03) 1 commit
28
+ (merged to 'next' on 2015-03-03 at c37a677)
29
+ + t5516: correct misspelled pushInsteadOf
30
31
34
-* ew/svn-maint-fixes (2015-02-26) 2 commits
35
- (merged to 'next' on 2015-03-03 at 776b563)
36
- + Git::SVN::*: avoid premature FileHandle closure
37
- + git-svn: fix localtime=true on non-glibc environments
38
- (this branch is used by ew/svn-fixes.)
32
+* bw/kwset-use-unsigned (2015-03-02) 1 commit
33
+ (merged to 'next' on 2015-03-05 at fd124ba)
34
+ + kwset: use unsigned char to store values with high-bit set
35
40
- Correct a breakage to git-svn around v2.2 era that triggers
41
- premature closing of FileHandle.
36
+ The borrowed code in kwset API did not follow our usual convention
37
+ to use "unsigned char" to store values that range from 0-255.
38
39
44
-* jc/apply-beyond-symlink (2015-02-10) 4 commits
45
- (merged to 'next' on 2015-02-18 at 4109de1)
46
- + apply: do not touch a file beyond a symbolic link
47
- + apply: do not read from beyond a symbolic link
48
- + apply: do not read from the filesystem under --index
49
- + apply: reject input that touches outside the working area
40
+* ja/clean-confirm-i18n (2015-03-02) 1 commit
41
+ (merged to 'next' on 2015-03-03 at 314c322)
42
+ + Add hint interactive cleaning
43
51
- "git apply" was not very careful about reading from, removing,
52
- updating and creating paths outside the working tree (under
53
- --index/--cached) or the current directory (when used as a
54
- replacement for GNU patch).
44
+ The prompt string "remove?" used when "git clean -i" asks the user
45
+ if a path should be removed was localizable, but the code always
46
+ expects a substring of "yes" to tell it to go ahead. Always show
47
+ [y/N] as part of this prompt to hint that the answer is not (yet)
48
+ localized.
49
50
57
-* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
58
- (merged to 'next' on 2015-02-18 at b571668)
59
- + apply: detect and mark whitespace errors in context lines when fixing
51
+* mg/doc-remote-tags-or-not (2015-03-02) 1 commit
52
+ (merged to 'next' on 2015-03-03 at 1630171)
53
+ + git-remote.txt: describe behavior without --tags and --no-tags
54
61
- "git apply --whitespace=fix" fixed whitespace errors in the common
62
- context lines but did so without reporting.
55
+ "git remote add" mentioned "--tags" and "--no-tags" and was not
56
+ clear that fetch from the remote in the future will use the default
57
+ behaviour when neither is given to override it.
58
59
65
-* jc/diff-test-updates (2015-02-23) 7 commits
66
- (merged to 'next' on 2015-02-23 at 9e863a7)
67
- + test_ln_s_add: refresh stat info of fake symbolic links
68
- (merged to 'next' on 2015-02-18 at f152c9f)
69
- + t4008: modernise style
70
- + t/diff-lib: check exact object names in compare_diff_raw
71
- + tests: do not borrow from COPYING and README from the real source
72
- + t4010: correct expected object names
73
- + t9300: correct expected object names
74
- + t4008: correct stale comments
75
- (this branch is used by jc/diff-b-m.)
60
+* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit
61
+ (merged to 'next' on 2015-03-03 at 42c282e)
62
+ + diff --shortstat --dirstat: remove duplicate output
63
77
- Test clean-up.
64
+ "git diff --shortstat --dirstat=changes" showed a dirstat based on
65
+ lines that was never asked by the end user in addition to the
66
+ dirstat that the user asked for.
67
68
80
-* jk/daemon-interpolate (2015-02-17) 3 commits
81
- (merged to 'next' on 2015-02-20 at 21118a7)
82
- + daemon: sanitize incoming virtual hostname
83
- + t5570: test git-daemon's --interpolated-path option
84
- + git_connect: let user override virtual-host we send to daemon
69
+* mr/doc-clean-f-f (2015-02-26) 1 commit
70
+ (merged to 'next' on 2015-03-03 at 67a77a2)
71
+ + Documentation/git-clean.txt: document that -f may need to be given twice
72
86
- The "interpolated-path" option of "git daemon" inserted any string
87
- client declared on the "host=" capability request without checking.
88
- Sanitize and limit %H and %CH to a saner and a valid DNS name.
73
+ Documentation update.
74
75
91
-* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit
92
- (merged to 'next' on 2015-02-18 at 84c1597)
93
- + git-send-email.perl: support no- prefix with older GetOptions
76
+* ms/submodule-update-config-doc (2015-03-02) 1 commit
77
+ (merged to 'next' on 2015-03-03 at b94da4b)
78
+ + submodule: improve documentation of update subcommand
79
95
- Even though we officially haven't dropped Perl 5.8 support, the
96
- Getopt::Long package that came with it does not support "--no-"
97
- prefix to negate a boolean option; manually add support to help
98
- people with older Getopt::Long package.
80
+ The interaction between "git submodule update" and the
81
+ submodule.*.update configuration was not clearly documented.
82
83
101
-* mh/refs-have-new (2015-02-17) 13 commits
102
- (merged to 'next' on 2015-02-23 at b8929db)
103
- + refs.h: remove duplication in function docstrings
104
- + update_ref(): improve documentation
105
- + ref_transaction_verify(): new function to check a reference's value
106
- + ref_transaction_delete(): check that old_sha1 is not null_sha1
107
- + ref_transaction_create(): check that new_sha1 is valid
108
- + commit: avoid race when creating orphan commits
109
- + commit: add tests of commit races
110
- + ref_transaction_delete(): remove "have_old" parameter
111
- + ref_transaction_update(): remove "have_old" parameter
112
- + struct ref_update: move "have_old" into "flags"
113
- + refs.c: change some "flags" to "unsigned int"
114
- + refs: remove the gap in the REF_* constant values
115
- + refs: move REF_DELETING to refs.c
84
+* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit
85
+ (merged to 'next' on 2015-03-03 at 61c9587)
86
+ + grep: correct help string for --exclude-standard
87
117
- Simplify the ref transaction API around how "the ref should be
118
- pointing at this object" is specified.
88
+ Description given by "grep -h" for its --exclude-standard option
89
+ was phrased poorly.
90
91
121
-* mm/am-c-doc (2015-02-20) 2 commits
122
- (merged to 'next' on 2015-02-23 at 1cd9b0f)
123
- + Documentation/git-am.txt: mention mailinfo.scissors config variable
124
- + Documentation/config.txt: document mailinfo.scissors
92
+* ye/http-accept-language (2015-02-26) 1 commit
93
+ (merged to 'next' on 2015-03-03 at 58d195e)
94
+ + gettext.c: move get_preferred_languages() from http.c
95
126
- The configuration variable 'mailinfo.scissors' was hard to
127
- discover in the documentation.
96
+ Compilation fix for a recent topic in 'master'.
97
98
+--------------------------------------------------
99
+[New Topics]
100
130
-* rj/no-xopen-source-for-cygwin (2015-02-22) 1 commit
131
- (merged to 'next' on 2015-02-23 at 323ac75)
132
- + git-compat-util.h: remove redundant code
101
+* ak/git-done-help-cleanup (2015-03-06) 1 commit
102
+ - git: make was_alias and done_help non-static
103
134
- Code cleanups.
104
+ Code simplification.
105
106
+ Will merge to 'next'.
107
137
-* rs/daemon-interpolate (2015-02-17) 2 commits
138
- (merged to 'next' on 2015-02-18 at c0f5750)
139
- + daemon: use callback to build interpolated path
140
- + daemon: look up client-supplied hostname lazily
108
142
- "git daemon" looked up the hostname even when "%CH" and "%IP"
143
- interpolations are not requested, which was unnecessary.
109
+* es/rebase-i-count-todo (2015-03-06) 2 commits
110
+ - rebase-interactive: re-word "item count" comment
111
+ - rebase-interactive: suppress whitespace preceding item count
112
113
+ "git rebase -i" recently started to include the number of
114
+ commits in the insn sheet to be processed, but on a platform
115
+ that prepends leading whitespaces to "wc -l" output, the numbers
116
+ are shown with extra whitespaces that aren't necessary.
117
146
-* rs/simple-cleanups (2015-02-22) 4 commits
147
- (merged to 'next' on 2015-02-23 at a89f034)
148
- + sha1_name: use strlcpy() to copy strings
149
- + pretty: use starts_with() to check for a prefix
150
- + for-each-ref: use skip_prefix() to avoid duplicate string comparison
151
- + connect: use strcmp() for string comparison
118
+ Will merge to 'next'.
119
153
- Code cleanups.
120
121
+* mg/fdopen-with-retry (2015-03-06) 6 commits
122
+ - buffer_fdinit(): use fdopen_with_retry()
123
+ - update_info_file(): use fdopen_with_retry()
124
+ - copy_to_log(): use fdopen_with_retry()
125
+ - fdopen_lock_file(): use fdopen_with_retry()
126
+ - SQUASH??? $gmane/264889
127
+ - xfdopen(): if first attempt fails, free memory and try again
128
156
-* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits
157
- (merged to 'next' on 2015-02-24 at 6658564)
158
- + t5500: show user name and host in diag-url
159
- + t5601: add more test cases for IPV6
160
- + connect.c: allow ssh://user@[2001:db8::1]/repo.git
129
+ Various parts of the code where they call fdopen() can fail when
130
+ they run out of memory; attempt to proceed by retrying the
131
+ operation after freeing some resource.
132
162
- We did not parse username followed by literal IPv6 address in SSH
163
- transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
164
- correctly.
133
+ Waiting for further comments.
134
166
---------------------------------------------------
167
-[New Topics]
135
169
-* ak/t5516-typofix (2015-03-03) 1 commit
170
- (merged to 'next' on 2015-03-03 at c37a677)
171
- + t5516: correct misspelled pushInsteadOf
136
+* mg/log-decorate-HEAD (2015-03-06) 1 commit
137
+ - log: decorate non-detached HEAD differently
138
173
- Will merge to 'master'.
139
+ Output from "git log --decorate" mentions HEAD when it points at a
140
+ tip of an branch differently from a detached HEAD.
141
142
+ We probably want to de-dup the branch name in the output.
143
176
-* bw/kwset-use-unsigned (2015-03-02) 1 commit
177
- (merged to 'next' on 2015-03-05 at fd124ba)
178
- + kwset: use unsigned char to store values with high-bit set
144
+ Waiting for further comments.
145
180
- The borrowed code in kwset API did not follow our usual convention
181
- to use "unsigned char" to store values that range from 0-255.
146
183
- Will merge to 'master'.
147
+* rs/daemon-hostname-in-strbuf (2015-03-06) 1 commit
148
+ - daemon: use strbuf for hostname info
149
150
+ Code in "git daemon" to parse out and hold hostnames used in
151
+ request interpolation has been simplified.
152
186
-* mg/doc-remote-tags-or-not (2015-03-02) 1 commit
187
- (merged to 'next' on 2015-03-03 at 1630171)
188
- + git-remote.txt: describe behavior without --tags and --no-tags
153
+ Needs updating with a few s/_reset/_release/ ($gmane/264962)
154
190
- "git remote add" mentioned "--tags" and "--no-tags" and was not
191
- clear that fetch from the remote in the future will use the default
192
- behaviour when neither is given to override it.
155
194
- Will merge to 'master'.
156
+* rs/deflate-init-cleanup (2015-03-05) 1 commit
157
+ - zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
158
159
+ Code simplification.
160
197
-* mg/status-v-v (2015-03-03) 2 commits
198
- - commit/status: show the index-worktree diff with -v -v
199
- - t7508: test git status -v
161
+ Will merge to 'next'.
162
201
- "git status" now allows the "-v" to be given twice to show the
202
- differences that are left in the working tree not to be committed.
163
204
- $gmane/264750
164
+* rs/zip-text (2015-03-05) 1 commit
165
+ - archive-zip: mark text files in archives
166
206
---------------------------------------------------
207
-[Stalled]
167
+ "git archive" can now be told to set the 'text' attribute in the
168
+ resulting zip archive.
169
209
-* mg/sequencer-commit-messages-always-verbatim (2015-02-23) 1 commit
210
- - sequencer: preserve commit messages
170
+ Will merge to 'next'.
171
212
- Always replay the original commit message verbatim, regardless of
213
- the commit.cleanup configuration settings by the user.
172
215
- $gmane/264504
173
+* sg/completion-remote (2015-03-06) 2 commits
174
+ - completion: simplify __git_remotes()
175
+ - completion: add a test for __git_remotes() helper function
176
177
+ Code simplification.
178
218
-* mg/detached-head-report (2015-02-23) 1 commit
219
- - branch: name detached HEAD analogous to status
220
-
221
- "git branch" on a detached HEAD always said "(detached from xyz)",
222
- even when "git status" would report "detached at xyz". The HEAD is
223
- actually at xyz and haven't been moved since it was detached in
224
- such a case, but the user cannot read what the current value of
225
- HEAD is when "detached from" is used.
226
-
227
- The goal is sound. May want to share code between branch and
228
- status in a reroll? Are there other commands that give the same
229
- information that share the code, too?
230
-
231
- ($gmane/264251)
179
+ Will merge to 'next'.
180
181
+--------------------------------------------------
182
+[Stalled]
183
184
* jk/push-config (2015-02-17) 4 commits
185
- [NEEDSACK] push: allow --follow-tags to be set by config push.followTags
@@ -420,22 +370,38 @@ of the repositories listed at
370
--------------------------------------------------
371
[Cooking]
372
423
-* mr/doc-clean-f-f (2015-02-26) 1 commit
424
- (merged to 'next' on 2015-03-03 at 67a77a2)
425
- + Documentation/git-clean.txt: document that -f may need to be given twice
373
+* mg/sequencer-commit-messages-always-verbatim (2015-03-06) 1 commit
374
+ - sequencer: preserve commit messages
375
427
- Documentation update.
376
+ "git cherry-pick" used to clean-up the log message even when it is
377
+ merely replaying an existing commit. It now replays the message
378
+ verbatim unless you are editing the message of resulting commits.
379
429
- Will merge to 'master'.
380
+ Will merge to 'next'.
381
382
432
-* ye/http-accept-language (2015-02-26) 1 commit
433
- (merged to 'next' on 2015-03-03 at 58d195e)
434
- + gettext.c: move get_preferred_languages() from http.c
383
+* mg/detached-head-report (2015-03-06) 2 commits
384
+ - branch: name detached HEAD analogous to status
385
+ - wt-status: refactor detached HEAD analysis
386
436
- Compilation fix for a recent topic in 'master'.
387
+ "git branch" on a detached HEAD always said "(detached from xyz)",
388
+ even when "git status" would report "detached at xyz". The HEAD is
389
+ actually at xyz and haven't been moved since it was detached in
390
+ such a case, but the user cannot read what the current value of
391
+ HEAD is when "detached from" is used.
392
438
- Will merge to 'master'.
393
+ Will merge to 'next'.
394
+
395
+
396
+* mg/status-v-v (2015-03-06) 3 commits
397
+ - commit/status: show the index-worktree diff with -v -v
398
+ - t7508: test git status -v
399
+ - t7508: .gitignore 'expect' and 'output' files
400
+
401
+ "git status" now allows the "-v" to be given twice to show the
402
+ differences that are left in the working tree not to be committed.
403
+
404
+ Will merge to 'next'.
405
406
407
* jk/diffcore-rename-duplicate (2015-02-27) 2 commits
@@ -448,16 +414,6 @@ of the repositories listed at
414
Will merge to 'master'.
415
416
451
-* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit
452
- (merged to 'next' on 2015-03-03 at 61c9587)
453
- + grep: correct help string for --exclude-standard
454
-
455
- Description given by "grep -h" for its --exclude-standard option
456
- was phrased poorly.
457
-
458
- Will merge to 'master'.
459
-
460
-
417
* nd/versioncmp-prereleases (2015-02-27) 1 commit
418
(merged to 'next' on 2015-03-03 at 6ab29cf)
419
+ versionsort: support reorder prerelease suffixes
@@ -468,30 +424,6 @@ of the repositories listed at
424
Will merge to 'master'.
425
426
471
-* ja/clean-confirm-i18n (2015-03-02) 1 commit
472
- (merged to 'next' on 2015-03-03 at 314c322)
473
- + Add hint interactive cleaning
474
-
475
- The prompt string "remove?" used when "git clean -i" asks the user
476
- if a path should be removed was localizable, but the code always
477
- expects a substring of "yes" to tell it to go ahead. Always show
478
- [y/N] as part of this prompt to hint that the answer is not (yet)
479
- localized.
480
-
481
- Will merge to 'master'.
482
-
483
-
484
-* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit
485
- (merged to 'next' on 2015-03-03 at 42c282e)
486
- + diff --shortstat --dirstat: remove duplicate output
487
-
488
- "git diff --shortstat --dirstat=changes" showed a dirstat based on
489
- lines that was never asked by the end user in addition to the
490
- dirstat that the user asked for.
491
-
492
- Will merge to 'master'.
493
-
494
-
427
* nd/slim-index-pack-memory-usage (2015-02-27) 2 commits
428
- index-pack: kill union delta_base to save memory
429
- index-pack: reduce object_entry size to save memory
@@ -499,6 +431,8 @@ of the repositories listed at
431
Memory usage of "git index-pack" has been trimmed by tens of
432
per-cent.
433
434
+ Waiting for further comments.
435
+
436
437
* nd/list-files (2015-02-09) 21 commits
438
- t3080: tests for git-list-files
@@ -526,6 +460,11 @@ of the repositories listed at
460
A new "git list-files" Porcelain command, "ls-files" with bells and
461
whistles.
462
463
+ Concern was raised that this is piggybacking on ls-files codebase,
464
+ rather than wt-status codebase ($gmane/264258).
465
+
466
+ Waiting for further comments or a reroll.
467
+
468
469
* jc/decorate-leaky-separator-color (2015-03-04) 7 commits
470
- log --decorate: do not leak "commit" color into the next item
@@ -542,16 +481,6 @@ of the repositories listed at
481
Waiting for reviews.
482
483
545
-* ms/submodule-update-config-doc (2015-03-02) 1 commit
546
- (merged to 'next' on 2015-03-03 at b94da4b)
547
- + submodule: improve documentation of update subcommand
548
-
549
- The interaction between "git submodule update" and the
550
- submodule.*.update configuration was not clearly documented.
551
-
552
- Will merge to 'master'.
553
-
554
-
484
* mh/expire-updateref-fixes (2015-03-05) 9 commits
485
(merged to 'next' on 2015-03-05 at 1caf9a6)
486
+ reflog_expire(): never update a reference to null_sha1