What's cooking (2015/02 #01)
Junio C Hamano committed
Feb 3, 2015 at 18:51 UTC
5aa33cc72a86a286fc4c20006ca8f5276a2cbfe4
1 file changed
+189
-87
whats-cooking.txt
+189
-87
@@ -1,20 +1,17 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2015, #05; Tue, 27)
4
-X-master-at: 15598cf41beed0d86cd2ac443e0f69c5a3b40321
5
-X-next-at: 4b64765b7657288d677cec107fb5295afb4e3a29
3
+Subject: What's cooking in git.git (Feb 2015, #01; Tue, 3)
4
+X-master-at: 0d1c285af265459006c012aa4415175c2db961ad
5
+X-next-at: 303d43c5ff509a8324ff30a824663dd552b0d231
6
7
-What's cooking in git.git (Jan 2015, #05; Tue, 27)
7
+What's cooking in git.git (Feb 2015, #01; Tue, 3)
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
-Hopefully final release candidate 2.3-rc2 has been tagged. Please
15
-spend some time to find and fix regressions, instead of spending all
16
-time having fun with new and shiny toys. The final hopefully will
17
-happen sometime next week.
14
+We will see 2.3 final later this week, hopefully.
15
16
You can find the changes described here in the integration branches
17
of the repositories listed at
@@ -22,104 +19,127 @@ of the repositories listed at
19
http://git-blame.blogspot.com/p/git-public-repositories.html
20
21
--------------------------------------------------
25
-[Graduated to "master"]
22
+[New Topics]
23
27
-* ak/cat-file-clean-up (2015-01-13) 1 commit
28
- (merged to 'next' on 2015-01-15 at bb1a4b3)
29
- + cat-file: use "type" and "size" from outer scope
24
+* jc/diff-format-doc (2015-01-28) 1 commit
25
+ - diff-format doc: a score can follow M for rewrite
26
27
+ The documentation incorrectly said that C(opy) and R(ename) are the
28
+ only ones that can be followed by the score number in the output in
29
+ the --raw format.
30
32
-* js/t1050 (2015-01-14) 1 commit
33
- (merged to 'next' on 2015-01-15 at f010b00)
34
- + t1050-large: generate large files without dd
31
+ Will merge to 'next'.
32
36
---------------------------------------------------
37
-[New Topics]
33
39
-* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
40
- - apply: detect and mark whitespace errors in context lines when fixing
41
- (this branch uses jc/apply-ws-fix-expands.)
42
-
43
- "git apply --whitespace=fix" fixed whitespace errors in the common
44
- context lines but did so without reporting.
34
+* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit
35
+ - do not check truth value of flex arrays
36
37
Will merge to 'next'.
38
39
49
-* ks/rebase-i-abbrev (2015-01-22) 1 commit
50
- - rebase -i: use full object name internally throughout the script
40
+* jk/status-read-branch-name-fix (2015-01-28) 1 commit
41
+ - read_and_strip_branch: fix typo'd address-of operator
42
52
- The insn sheet "git rebase -i" creates did not fully honor
53
- core.abbrev settings.
43
+ Code to read branch name from various files in .git/ directory
44
+ would have misbehaved if the code to write them left an empty file.
45
46
Will merge to 'next'.
47
48
58
-* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit
59
- - transport-helper: do not request symbolic refs to remote helpers
49
+* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits
50
+ - t/lib-gpg: sanity-check that we can actually sign
51
+ - t/lib-gpg: include separate public keys in keyring.gpg
52
61
- "git fetch" over a remote-helper that cannot respond to "list"
62
- command could not fetch from a symbolic reference e.g. HEAD.
53
+ Older GnuPG implementation may not correctly import the keyring
54
+ material we prepare for the tests to use.
55
56
Will merge to 'next'.
57
58
67
-* ak/add-i-empty-candidates (2015-01-22) 1 commit
68
- - add -i: return from list_and_choose if there is no candidate
59
+* jc/apply-beyond-symlink (2015-02-03) 4 commits
60
+ - apply: do not touch a file beyond a symbolic link
61
+ - apply: do not read from beyond a symbolic link
62
+ - apply: do not read from the filesystem under --index
63
+ - apply: reject input that touches outside the working area
64
70
- The interactive "show a list and let the user choose from it"
71
- interface "add -i" used showed and prompted to the user even when
72
- the candidate list was empty, against which the only "choice" the
73
- user could have made was to choose nothing.
65
+ "git apply" was not very careful about reading from, removing,
66
+ updating and creating paths outside the working tree (under
67
+ --index/--cached) or the current directory (when used as a
68
+ replacement for GNU patch).
69
75
- Will merge to 'next'.
70
+ May need to re-review the tests.
71
72
78
-* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit
79
- - wincred: fix get credential if username has "@"
73
+* jc/diff-b-m (2015-02-01) 1 commit
74
+ - diff: do not use creation-half of -B as a rename target candidate
75
81
- Will merge to 'next'.
76
+ "git diff -B -M" produced incorrect patch when the postimage of a
77
+ completely rewritten file is similar to the preimage of a removed
78
+ file; such a resulting file must not be expressed as a rename from
79
+ other place.
80
81
+ The fix in this patch is broken, unfortunately.
82
84
-* jc/conf-var-doc (2015-01-27) 3 commits
85
- - CodingGuidelines: describe naming rules for configuration variables
86
- - config.txt: mark deprecated variables more prominently
87
- - config.txt: clarify that add.ignore-errors as deprecated
83
89
- Need to send this out for review before doing anything to it.
84
+* jc/remote-set-url-doc (2015-01-29) 1 commit
85
+ - Documentation/git-remote.txt: stress that set-url is not for triangular
86
87
+ Clarify in the documentation that "remote.<nick>.pushURL" and
88
+ "remote.<nick>.URL" are there to name the same repository accessed
89
+ via different transports, not two separate repositories.
90
+
91
+ Will merge to 'next'.
92
92
-* jc/doc-log-rev-list-options (2015-01-23) 1 commit
93
- - Documentation: what does "git log --indexed-objects" even mean?
93
+
94
+* jc/t4122-use-test-write-lines (2015-01-28) 1 commit
95
+ - t4122: use test_write_lines from test-lib-functions
96
97
Will merge to 'next'.
98
99
98
-* jk/dumb-http-idx-fetch-fix (2015-01-27) 1 commit
99
- - dumb-http: do not pass NULL path to parse_pack_index
100
+* jk/pack-bitmap (2015-02-03) 1 commit
101
+ - [NEEDS SOB] ewah: fix building with gcc < 3.4.0
102
+
103
+ Need to get the S-o-by and Acked-by straightend out.
104
+
105
+
106
+* jk/prune-mtime (2015-02-02) 1 commit
107
+ - sha1_file: fix iterating loose alternate objects
108
+
109
+ In v2.2.0, we broke "git prune" that runs in a repository that
110
+ borrows from an alternate object store.
111
112
Will merge to 'next'.
113
114
104
-* ld/p4-submit-hint (2015-01-23) 1 commit
105
- (merged to 'next' on 2015-01-23 at ed972d3)
106
- + git-p4: correct --prepare-p4-only instructions
115
+* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
116
+ - git-submodule.sh: fix '/././' path normalization
117
108
- Will merge to 'master' after 2.3 final.
118
+ Will merge to 'next'.
119
120
111
-* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit
112
- - commit: reword --author error message
121
+* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
122
+ - Makefile: handle broken curl version number in version check
123
+
124
+ Cope with irregular output of "curl-config --vernum" given by
125
+ certain older vintages of cURL.
126
127
Will merge to 'next'.
128
129
117
-* mg/push-repo-option-doc (2015-01-27) 1 commit
118
- - git-push.txt: document the behavior of --repo
130
+* tc/missing-http-proxyauth (2015-02-03) 1 commit
131
+ - http: support curl < 7.10.7
132
133
Will merge to 'next'.
134
135
136
+* tc/t9001-noxmailer (2015-01-30) 1 commit
137
+ - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
138
+
139
+ Kyle's update to explicitly support --no-option with older
140
+ Getopt::Long ($gmane/263203) might be a better alternative
141
+ if we have to support them in the longer term.
142
+
143
--------------------------------------------------
144
[Stalled]
145
@@ -256,14 +276,95 @@ of the repositories listed at
276
--------------------------------------------------
277
[Cooking]
278
259
-* ye/http-accept-language (2015-01-27) 2 commits
260
- - SQUASH???
261
- - http: Add Accept-Language header if possible
279
+* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
280
+ - apply: detect and mark whitespace errors in context lines when fixing
281
+ (this branch uses jc/apply-ws-fix-expands.)
282
+
283
+ "git apply --whitespace=fix" fixed whitespace errors in the common
284
+ context lines but did so without reporting.
285
+
286
+ Will merge to 'next'.
287
+
288
+
289
+* ks/rebase-i-abbrev (2015-01-22) 1 commit
290
+ - rebase -i: use full object name internally throughout the script
291
+
292
+ The insn sheet "git rebase -i" creates did not fully honor
293
+ core.abbrev settings.
294
+
295
+ Will merge to 'next'.
296
+
297
+
298
+* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit
299
+ - transport-helper: do not request symbolic refs to remote helpers
300
+
301
+ "git fetch" over a remote-helper that cannot respond to "list"
302
+ command could not fetch from a symbolic reference e.g. HEAD.
303
+
304
+ Will merge to 'next'.
305
+
306
+
307
+* ak/add-i-empty-candidates (2015-01-22) 1 commit
308
+ - add -i: return from list_and_choose if there is no candidate
309
+
310
+ The interactive "show a list and let the user choose from it"
311
+ interface "add -i" used showed and prompted to the user even when
312
+ the candidate list was empty, against which the only "choice" the
313
+ user could have made was to choose nothing.
314
+
315
+ Will merge to 'next'.
316
+
317
+
318
+* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit
319
+ - wincred: fix get credential if username has "@"
320
+
321
+ Will merge to 'next'.
322
+
323
+
324
+* jc/conf-var-doc (2015-02-02) 3 commits
325
+ - CodingGuidelines: describe naming rules for configuration variables
326
+ - config.txt: mark deprecated variables more prominently
327
+ - config.txt: clarify that add.ignore-errors is deprecated
328
+
329
+
330
+* jc/doc-log-rev-list-options (2015-01-23) 1 commit
331
+ - Documentation: what does "git log --indexed-objects" even mean?
332
+
333
+ Will merge to 'next'.
334
+
335
+
336
+* jk/dumb-http-idx-fetch-fix (2015-01-27) 1 commit
337
+ - dumb-http: do not pass NULL path to parse_pack_index
338
+
339
+ Will merge to 'next'.
340
+
341
+
342
+* ld/p4-submit-hint (2015-01-23) 1 commit
343
+ (merged to 'next' on 2015-01-23 at ed972d3)
344
+ + git-p4: correct --prepare-p4-only instructions
345
+
346
+ Will merge to 'master' after 2.3 final.
347
+
348
+
349
+* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit
350
+ - commit: reword --author error message
351
+
352
+ Will merge to 'next'.
353
+
354
+
355
+* mg/push-repo-option-doc (2015-01-28) 1 commit
356
+ - git-push.txt: document the behavior of --repo
357
+
358
+ Will merge to 'next'.
359
+
360
+
361
+* ye/http-accept-language (2015-01-28) 1 commit
362
+ - http: add Accept-Language header if possible
363
364
Using environment variable LANGUAGE and friends on the client side,
365
send Accept-Language when making HTTP requests.
366
266
- Almost there, I would think.
367
+ Will merge to 'next'.
368
369
370
* ak/typofixes (2015-01-21) 2 commits
@@ -350,11 +451,12 @@ of the repositories listed at
451
Need extra set of eyes to review this.
452
453
353
-* ld/p4-exclude-in-sync (2015-01-20) 1 commit
454
+* ld/p4-exclude-in-sync (2015-01-28) 2 commits
455
+ - git-p4: correct "exclude" change
456
(merged to 'next' on 2015-01-22 at f6f1fc7)
457
+ git-p4: support excluding paths on sync
458
357
- Will merge to 'master' after 2.3 final.
459
+ Will squash into one after 2.3 final.
460
461
462
* tb/connect-ipv6-parse-fix (2015-01-22) 3 commits
@@ -545,33 +647,33 @@ of the repositories listed at
647
648
649
* nd/list-files (2015-01-27) 22 commits
548
- - t3080: tests for git-list-files
549
- - list-files: -M aka diff-cached
550
- - list-files -F: show submodules with the new indicator '&'
551
- - list-files: add -F/--classify
552
- - SQUASH???
553
- - list-files: show directories as well as files
554
- - list-files: do not show duplicate cached entries
555
- - list-files: sort output and remove duplicates
556
- - list-files: add -t back
557
- - list-files: add -1 short for --no-column
558
- - list-files: add -R/--recursive short for --max-depth=-1
559
- - list-files: -u does not imply showing stages
560
- - list-files: make alias 'ls' default to 'list-files'
561
- - list-files: a user friendly version of ls-files and more
562
- - ls-files: support --max-depth
563
- - ls-files: add --column
564
- - ls-files: add --color to highlight file names
565
- - ls-files: buffer full item in strbuf before printing
566
- - ls_colors.c: highlight submodules like directories
567
- - ls_colors.c: add a function to color a file name
568
- - ls_colors.c: parse color.ls.* from config file
569
- - ls_colors.c: add $LS_COLORS parsing code
650
+ . t3080: tests for git-list-files
651
+ . list-files: -M aka diff-cached
652
+ . list-files -F: show submodules with the new indicator '&'
653
+ . list-files: add -F/--classify
654
+ . SQUASH???
655
+ . list-files: show directories as well as files
656
+ . list-files: do not show duplicate cached entries
657
+ . list-files: sort output and remove duplicates
658
+ . list-files: add -t back
659
+ . list-files: add -1 short for --no-column
660
+ . list-files: add -R/--recursive short for --max-depth=-1
661
+ . list-files: -u does not imply showing stages
662
+ . list-files: make alias 'ls' default to 'list-files'
663
+ . list-files: a user friendly version of ls-files and more
664
+ . ls-files: support --max-depth
665
+ . ls-files: add --column
666
+ . ls-files: add --color to highlight file names
667
+ . ls-files: buffer full item in strbuf before printing
668
+ . ls_colors.c: highlight submodules like directories
669
+ . ls_colors.c: add a function to color a file name
670
+ . ls_colors.c: parse color.ls.* from config file
671
+ . ls_colors.c: add $LS_COLORS parsing code
672
673
A new "git list-files" Porcelain command, "ls-files" with bells and
674
whistles.
675
574
- Some comments seen on the list; may be gaining some interests?
676
+ Seems unable to pass its self test (yet).
677
678
679
* nd/multiple-work-trees (2015-01-27) 38 commits