What's cooking (2015/01 #05)
Junio C Hamano committed
Jan 27, 2015 at 15:27 UTC
4b692647843199378930be7f6687dc3ffa6b34ff
1 file changed
+197
-101
whats-cooking.txt
+197
-101
@@ -1,19 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2015, #04; Wed, 21)
4
-X-master-at: 627736ca799edacf13881da7e671964a0afb94b8
5
-X-next-at: f40c73c9887141847a96136c6fdba64a4db3df37
3
+Subject: What's cooking in git.git (Jan 2015, #05; Tue, 27)
4
+X-master-at: 15598cf41beed0d86cd2ac443e0f69c5a3b40321
5
+X-next-at: 4b64765b7657288d677cec107fb5295afb4e3a29
6
7
-What's cooking in git.git (Jan 2015, #04; Wed, 21)
7
+What's cooking in git.git (Jan 2015, #05; Tue, 27)
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
-First release candidate 2.3-rc1 has been tagged. Please spend some
15
-time to find and fix regressions, instead of spending all time
16
-having fun with new and shiny toys ;-)
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.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -23,114 +24,101 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
26
-* jk/http-push-symref-fix (2015-01-14) 1 commit
27
- + http-push: trim trailing newline from remote symref
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
30
29
- Using newer libCURL (or old one with security fixes) exposes this
30
- old breakage.
31
+
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
35
36
--------------------------------------------------
37
[New Topics]
38
35
-* ak/typofixes (2015-01-21) 2 commits
36
- - t/lib-terminal.sh: fix typo
37
- - pack-bitmap: fix typo
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.
45
46
Will merge to 'next'.
47
48
42
-* jc/apply-ws-fix-expands (2015-01-16) 4 commits
43
- - apply: detect and mark whitespace errors in context lines when fixing
44
- - apply: count the size of postimage correctly
45
- - typofix
46
- - apply: make update_pre_post_images() sanity check the given postlen
49
+* ks/rebase-i-abbrev (2015-01-22) 1 commit
50
+ - rebase -i: use full object name internally throughout the script
51
48
- Needs rerolling and adding tests from Kyle J. McKay.
52
+ The insn sheet "git rebase -i" creates did not fully honor
53
+ core.abbrev settings.
54
55
+ Will merge to 'next'.
56
51
-* jc/coding-guidelines (2015-01-15) 1 commit
52
- - CodingGuidelines: clarify C #include rules
57
+
58
+* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit
59
+ - transport-helper: do not request symbolic refs to remote helpers
60
+
61
+ "git fetch" over a remote-helper that cannot respond to "list"
62
+ command could not fetch from a symbolic reference e.g. HEAD.
63
64
Will merge to 'next'.
65
66
57
-* jc/pretty-format-doc (2015-01-15) 1 commit
58
- - "log --pretty" documentation: do not forget "tformat:"
67
+* ak/add-i-empty-candidates (2015-01-22) 1 commit
68
+ - add -i: return from list_and_choose if there is no candidate
69
+
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.
74
75
Will merge to 'next'.
76
77
63
-* jc/unused-symbols (2015-01-15) 8 commits
64
- - shallow.c: make check_shallow_file_for_update() static
65
- - remote.c: make clear_cas_option() static
66
- - urlmatch.c: make match_urls() static
67
- - revision.c: make save_parents() and free_saved_parents() static
68
- - line-log.c: make line_log_data_init() static
69
- - pack-bitmap.c: make pack_bitmap_filename() static
70
- - prompt.c: remove git_getpass() nobody uses
71
- - http.c: make finish_active_slot() and handle_curl_result() static
78
+* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit
79
+ - wincred: fix get credential if username has "@"
80
81
Will merge to 'next'.
82
83
76
-* jk/sanity (2015-01-16) 3 commits
77
- - tests: SANITY requires POSIXPERM
78
- - tests: correct misuses of POSIXPERM
79
- - t/lib-httpd: switch SANITY check for NOT_ROOT
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
88
81
- Saw Torsten's report on Cygwin, but I couldn't tell if it was about
82
- existing breakages or new one introduced by this series.
89
+ Need to send this out for review before doing anything to it.
90
91
85
-* js/fsck-opt (2015-01-21) 19 commits
86
- - fsck: support ignoring objects in `git fsck` via fsck.skiplist
87
- - fsck: git receive-pack: support excluding objects from fsck'ing
88
- - fsck: introduce `git fsck --quick`
89
- - fsck: support demoting errors to warnings
90
- - fsck: document the new receive.fsck.* options
91
- - fsck: allow upgrading fsck warnings to errors
92
- - fsck: optionally ignore specific fsck issues completely
93
- - fsck: disallow demoting grave fsck errors to warnings
94
- - fsck: add a simple test for receive.fsck.*
95
- - fsck: make fsck_tag() warn-friendly
96
- - fsck: handle multiple authors in commits specially
97
- - fsck: make fsck_commit() warn-friendly
98
- - fsck: make fsck_ident() warn-friendly
99
- - fsck: report the ID of the error/warning
100
- - fsck: allow demoting errors to warnings via receive.fsck.warn = <key>
101
- - fsck: offer a function to demote fsck errors to warnings
102
- - fsck: provide a function to parse fsck message IDs
103
- - fsck: introduce identifiers for fsck messages
104
- - fsck: introduce fsck options
92
+* jc/doc-log-rev-list-options (2015-01-23) 1 commit
93
+ - Documentation: what does "git log --indexed-objects" even mean?
94
106
- Need extra set of eyes to review this.
95
+ Will merge to 'next'.
96
97
109
-* ld/p4-exclude-in-sync (2015-01-20) 1 commit
110
- - git-p4: support excluding paths on sync
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
101
Will merge to 'next'.
102
103
115
-* tb/connect-ipv6-parse-fix (2015-01-20) 3 commits
116
- - t5500: Show user name and host in diag-url
117
- - t5601: Add more test cases for IPV6
118
- - connect.c: Improve parsing of literal IPV6 addresses
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
107
120
- Need extra set of eyes to review this.
108
+ Will merge to 'master' after 2.3 final.
109
110
123
-* sb/atomic-push-fix (2015-01-21) 5 commits
124
- - refs.c: enable large transactions
125
- - refs.c: have a write_sha1_to_lock_file wrapper
126
- - refs.c: remove lock_fd from struct ref_lock
127
- - t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
128
- - update-ref: test handling large transactions properly
129
- (this branch uses mh/reflog-expire and sb/atomic-push.)
111
+* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit
112
+ - commit: reword --author error message
113
131
- I had to wiggle this in and am not confident I did it correctly.
114
+ Will merge to 'next'.
115
+
116
+
117
+* mg/push-repo-option-doc (2015-01-27) 1 commit
118
+ - git-push.txt: document the behavior of --repo
119
+
120
+ Will merge to 'next'.
121
133
- Need extra set of eyes to review this.
122
123
--------------------------------------------------
124
[Stalled]
@@ -141,12 +129,6 @@ of the repositories listed at
129
For discussion.
130
131
144
-* ye/http-accept-language (2015-01-21) 1 commit
145
- . http: add Accept-Language header if possible
146
-
147
- Not quite there yet.
148
-
149
-
132
* pw/remote-set-url-fetch (2014-11-26) 1 commit
133
- remote: add --fetch and --both options to set-url
134
@@ -274,6 +256,129 @@ of the repositories listed at
256
--------------------------------------------------
257
[Cooking]
258
259
+* ye/http-accept-language (2015-01-27) 2 commits
260
+ - SQUASH???
261
+ - http: Add Accept-Language header if possible
262
+
263
+ Using environment variable LANGUAGE and friends on the client side,
264
+ send Accept-Language when making HTTP requests.
265
+
266
+ Almost there, I would think.
267
+
268
+
269
+* ak/typofixes (2015-01-21) 2 commits
270
+ (merged to 'next' on 2015-01-22 at e36f25a)
271
+ + t/lib-terminal.sh: fix typo
272
+ + pack-bitmap: fix typo
273
+
274
+ Will merge to 'master'.
275
+
276
+
277
+* jc/apply-ws-fix-expands (2015-01-22) 3 commits
278
+ - apply: count the size of postimage correctly
279
+ - apply: make update_pre_post_images() sanity check the given postlen
280
+ - apply.c: typofix
281
+ (this branch is used by jc/apply-ws-fix-expands-report.)
282
+
283
+ "git apply --whitespace=fix" used to under-allocate the memory
284
+ when the fix resulted in a longer text than the original patch.
285
+
286
+ Will merge to 'next'.
287
+
288
+
289
+* jc/coding-guidelines (2015-01-15) 1 commit
290
+ (merged to 'next' on 2015-01-22 at 3c96639)
291
+ + CodingGuidelines: clarify C #include rules
292
+
293
+ Will merge to 'master'.
294
+
295
+
296
+* jc/pretty-format-doc (2015-01-15) 1 commit
297
+ (merged to 'next' on 2015-01-22 at 2a81ecc)
298
+ + "log --pretty" documentation: do not forget "tformat:"
299
+
300
+ Will cook in 'next'.
301
+
302
+
303
+* jc/unused-symbols (2015-01-15) 8 commits
304
+ (merged to 'next' on 2015-01-22 at 77fd5f0)
305
+ + shallow.c: make check_shallow_file_for_update() static
306
+ + remote.c: make clear_cas_option() static
307
+ + urlmatch.c: make match_urls() static
308
+ + revision.c: make save_parents() and free_saved_parents() static
309
+ + line-log.c: make line_log_data_init() static
310
+ + pack-bitmap.c: make pack_bitmap_filename() static
311
+ + prompt.c: remove git_getpass() nobody uses
312
+ + http.c: make finish_active_slot() and handle_curl_result() static
313
+
314
+ Mark file-local symbols as "static", and drop functions that nobody
315
+ uses.
316
+
317
+ Will cook in 'next'.
318
+
319
+
320
+* jk/sanity (2015-01-27) 3 commits
321
+ - test-lib.sh: set prerequisite SANITY by testing what we really need
322
+ - tests: correct misuses of POSIXPERM
323
+ - t/lib-httpd: switch SANITY check for NOT_ROOT
324
+
325
+ Waiting for ack or counter-proposal from Torsten.
326
+ Otherwise looking good.
327
+
328
+
329
+* js/fsck-opt (2015-01-21) 19 commits
330
+ - fsck: support ignoring objects in `git fsck` via fsck.skiplist
331
+ - fsck: git receive-pack: support excluding objects from fsck'ing
332
+ - fsck: introduce `git fsck --quick`
333
+ - fsck: support demoting errors to warnings
334
+ - fsck: document the new receive.fsck.* options
335
+ - fsck: allow upgrading fsck warnings to errors
336
+ - fsck: optionally ignore specific fsck issues completely
337
+ - fsck: disallow demoting grave fsck errors to warnings
338
+ - fsck: add a simple test for receive.fsck.*
339
+ - fsck: make fsck_tag() warn-friendly
340
+ - fsck: handle multiple authors in commits specially
341
+ - fsck: make fsck_commit() warn-friendly
342
+ - fsck: make fsck_ident() warn-friendly
343
+ - fsck: report the ID of the error/warning
344
+ - fsck: allow demoting errors to warnings via receive.fsck.warn = <key>
345
+ - fsck: offer a function to demote fsck errors to warnings
346
+ - fsck: provide a function to parse fsck message IDs
347
+ - fsck: introduce identifiers for fsck messages
348
+ - fsck: introduce fsck options
349
+
350
+ Need extra set of eyes to review this.
351
+
352
+
353
+* ld/p4-exclude-in-sync (2015-01-20) 1 commit
354
+ (merged to 'next' on 2015-01-22 at f6f1fc7)
355
+ + git-p4: support excluding paths on sync
356
+
357
+ Will merge to 'master' after 2.3 final.
358
+
359
+
360
+* tb/connect-ipv6-parse-fix (2015-01-22) 3 commits
361
+ - t5500: show user name and host in diag-url
362
+ - t5601: add more test cases for IPV6
363
+ - connect.c: improve parsing of literal IPV6 addresses
364
+
365
+ Need extra set of eyes to review this.
366
+
367
+
368
+* sb/atomic-push-fix (2015-01-23) 6 commits
369
+ - refs.c: enable large transactions
370
+ - refs.c: remove unlock_ref and commit_ref from write_ref_sha1
371
+ - refs.c: move static functions to close and commit refs
372
+ - refs.c: remove lock_fd from struct ref_lock
373
+ - t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
374
+ - update-ref: test handling large transactions properly
375
+ (this branch uses mh/reflog-expire and sb/atomic-push.)
376
+
377
+ I had to wiggle this in and am not confident I did it correctly.
378
+
379
+ Need extra set of eyes to review this.
380
+
381
+
382
* jk/strbuf-doc-to-header (2015-01-16) 7 commits
383
- strbuf.h: group documentation for trim functions
384
- strbuf.h: drop boilerplate descriptions of strbuf_split_*
@@ -287,16 +392,10 @@ of the repositories listed at
392
393
394
* ah/usage-strings (2015-01-14) 1 commit
290
- - standardize usage info string format
291
-
292
- Will merge to and cook in 'next'.
293
-
294
-
295
-* ak/cat-file-clean-up (2015-01-13) 1 commit
296
- (merged to 'next' on 2015-01-15 at bb1a4b3)
297
- + cat-file: use "type" and "size" from outer scope
395
+ (merged to 'next' on 2015-01-22 at bfa5bab)
396
+ + standardize usage info string format
397
299
- Will merge to 'master'.
398
+ Will cook in 'next'.
399
400
401
* ak/stash-store-create-help (2015-01-13) 1 commit
@@ -316,13 +415,6 @@ of the repositories listed at
415
Will cook in 'next'.
416
417
319
-* js/t1050 (2015-01-14) 1 commit
320
- (merged to 'next' on 2015-01-15 at f010b00)
321
- + t1050-large: generate large files without dd
322
-
323
- Will merge to 'master'.
324
-
325
-
418
* bc/http-fallback-to-password-after-krb-fails (2015-01-07) 1 commit
419
(merged to 'next' on 2015-01-12 at 4c67038)
420
+ remote-curl: fall back to Basic auth if Negotiate fails
@@ -452,10 +544,12 @@ of the repositories listed at
544
Will cook in 'next'.
545
546
455
-* nd/list-files (2014-12-01) 19 commits
547
+* 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
@@ -463,6 +557,7 @@ of the repositories listed at
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
@@ -476,10 +571,11 @@ of the repositories listed at
571
A new "git list-files" Porcelain command, "ls-files" with bells and
572
whistles.
573
479
- Comments?
574
+ Some comments seen on the list; may be gaining some interests?
575
576
482
-* nd/multiple-work-trees (2015-01-07) 37 commits
577
+* nd/multiple-work-trees (2015-01-27) 38 commits
578
+ - t2026 needs procondition SANITY
579
- git-checkout.txt: a note about multiple checkout support for submodules
580
- checkout: add --ignore-other-wortrees
581
- checkout: pass whole struct to parse_branchname_arg instead of individual flags