What's cooking (2013/02 #01)
Junio C Hamano committed
Feb 1, 2013 at 14:04 UTC
8a7f1ba7f9166440249251552a93b06de6761f22
1 file changed
+183
-183
whats-cooking.txt
+183
-183
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2013, #11; Wed, 30)
4
-X-master-at: 070c57df42ea4eadcc43d0456d114560124326c3
5
-X-next-at: 7d3a2ef96c8474fb18c8a5ca045cdbeb6180ac4f
3
+Subject: What's cooking in git.git (Feb 2013, #01; Fri, 1)
4
+X-master-at: bcd45b4085f9269a536c8fb1963ac8380bfac0e8
5
+X-next-at: d83cc6ec328c2d32e7699b6436e01deade4cc994
6
7
-What's cooking in git.git (Jan 2013, #11; Wed, 30)
7
+What's cooking in git.git (Feb 2013, #01; Fri, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,7 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'.
13
14
As usual, this cycle is expected to last for 8 to 10 weeks, with a
15
-preview -rc0 sometime in the middle of next month.
15
+preview -rc0 sometime in the middle of this month.
16
17
You can find the changes described here in the integration branches of the
18
repositories listed at
@@ -20,29 +20,76 @@ repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
23
-[New Topics]
23
+[Graduated to "master"]
24
25
-* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
26
- - gitweb: refer to picon/gravatar images over the same scheme
25
+* as/test-cleanup (2013-01-24) 1 commit
26
+ (merged to 'next' on 2013-01-28 at cc1147d)
27
+ + t7102 (reset): don't hardcode SHA-1 in expected outputs
28
28
- Avoid mixed contents on a page coming via http and https when
29
- gitweb is hosted on a https server.
29
31
- Will merge to 'next'.
30
+* bc/git-p4-for-python-2.4 (2013-01-30) 3 commits
31
+ (merged to 'next' on 2013-01-31 at 1096db1)
32
+ + INSTALL: git-p4 does not support Python 3
33
+ (merged to 'next' on 2013-01-30 at 5d81ed2)
34
+ + git-p4.py: support Python 2.4
35
+ + git-p4.py: support Python 2.5
36
37
+ With small updates to remove dependency on newer features of
38
+ Python, keep git-p4 usable with older Python.
39
34
-* jk/python-styles (2013-01-29) 1 commit
35
- - CodingGuidelines: add Python coding guidelines
40
37
- Expecting a reroll.
38
- $gmane/215007.
41
+* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit
42
+ (merged to 'next' on 2013-01-28 at df27f53)
43
+ + t9902: protect test from stray build artifacts
44
45
+ Scripts to test bash completion was inherently flaky as it was
46
+ affected by whatever random things the user may have on $PATH.
47
41
-* mn/send-email-authinfo (2013-01-29) 1 commit
42
- - git-send-email: add ~/.authinfo parsing
48
44
- Expecting a reroll.
45
- $gmane/215004, $gmane/215024.
49
+* jc/no-git-config-in-clone (2013-01-11) 1 commit
50
+ (merged to 'next' on 2013-01-15 at feeffe1)
51
+ + clone: do not export and unexport GIT_CONFIG
52
+
53
+ We stopped paying attention to $GIT_CONFIG environment that points
54
+ at a single configuration file from any command other than "git config"
55
+ quite a while ago, but "git clone" internally set, exported, and
56
+ then unexported the variable during its operation unnecessarily.
57
+
58
+
59
+* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit
60
+ (merged to 'next' on 2013-01-28 at fef4eb2)
61
+ + git-cvsimport.txt: cvsps-2 is deprecated
62
+
63
+ Warn people that other tools are more recommendable over
64
+ cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport
65
+ will not work with cvsps3.
66
+
67
+
68
+* jk/gc-auto-after-fetch (2013-01-26) 1 commit
69
+ (merged to 'next' on 2013-01-30 at 472d07b)
70
+ + Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch
71
+ (this branch uses jk/maint-gc-auto-after-fetch.)
72
+
73
+ This is to resolve merge conflicts early for the same topic to
74
+ recent codebase.
75
+
76
+
77
+* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits
78
+ + fetch-pack: avoid repeatedly re-scanning pack directory
79
+ + fetch: run gc --auto after fetching
80
+ (this branch is used by jk/gc-auto-after-fetch.)
81
+
82
+ Help "fetch only" repositories that do not trigger "gc --auto"
83
+ often enough.
84
+
85
+
86
+* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit
87
+ (merged to 'next' on 2013-01-28 at e0a8222)
88
+ + ident: do not drop username when reading from /etc/mailname
89
+
90
+ We used to stuff "user@" and then append what we read from
91
+ /etc/mailname to come up with a default e-mail ident, but a bug
92
+ lost the "user@" part. This is to fix it.
93
94
95
* nd/edit-branch-desc-while-detached (2013-01-30) 1 commit
@@ -53,69 +100,96 @@ repositories listed at
100
Attempt to "branch --edit-description" an existing branch, while
101
being on a detached HEAD, errored out.
102
56
- Will merge to 'master'.
103
+
104
+* nd/fetch-depth-is-broken (2013-01-11) 3 commits
105
+ (merged to 'next' on 2013-01-15 at 70a5ca7)
106
+ + fetch: elaborate --depth action
107
+ + upload-pack: fix off-by-one depth calculation in shallow clone
108
+ + fetch: add --unshallow for turning shallow repo into complete one
109
+
110
+ "git fetch --depth" was broken in at least three ways. The
111
+ resulting history was deeper than specified by one commit, it was
112
+ unclear how to wipe the shallowness of the repository with the
113
+ command, and documentation was misleading.
114
115
--------------------------------------------------
59
-[Graduated to "master"]
116
+[New Topics]
117
61
-* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit
62
- (merged to 'next' on 2013-01-25 at d113c1a)
63
- + git-completion.bash: replace zsh notation that breaks bash 3.X
118
+* ft/transport-report-segv (2013-01-31) 1 commit
119
+ - push: fix segfault when HEAD points nowhere
120
65
- Fix use of an array notation that older versions of bash do not
66
- understand.
121
+ A failure to push due to non-ff while on an unborn branch
122
+ dereferenced a NULL pointer while showing an error message.
123
124
+ Will merge to 'next'.
125
+
126
+
127
+* sb/gpg-i18n (2013-01-31) 1 commit
128
+ - gpg: allow translation of more error messages
129
+
130
+ Will merge to 'next'.
131
+
132
+
133
+* sb/gpg-plug-fd-leak (2013-01-31) 1 commit
134
+ - gpg: close stderr once finished with it in verify_signed_buffer()
135
+
136
+ Will merge to 'next'.
137
+
138
+
139
+* sb/run-command-fd-error-reporting (2013-01-31) 1 commit
140
+ - run-command: be more informative about what failed
141
+
142
+ Will merge to 'next' after spelling stdout, etc. out.
143
+
144
+
145
+* jk/remote-helpers-doc (2013-01-31) 2 commits
146
+ - [SQUASH] simplify maintenance of redirection pages
147
+ - Rename {git- => git}remote-helpers.txt
148
69
-* dl/am-hg-locale (2013-01-18) 1 commit
70
- (merged to 'next' on 2013-01-25 at 3419019)
71
- + am: invoke perl's strftime in C locale
149
+ "git help remote-helpers" did not work; 'remote-helpers' is not
150
+ a subcommand name but a concept, so its documentation should have
151
+ been in gitremote-helpers, not git-remote-helpers.
152
73
- Datestamp recorded in "Hg" format patch was reformatted incorrectly
74
- to an e-mail looking date using locale dependant strftime, causing
75
- patch application to fail.
153
+ Will merge to 'next' after squashing the fix in.
154
155
78
-* jc/help (2013-01-18) 1 commit
79
- (merged to 'next' on 2013-01-25 at b2b087e)
80
- + help: include <common-cmds.h> only in one file
156
+* sp/smart-http-content-type-check (2013-01-31) 1 commit
157
+ - Verify Content-Type from smart HTTP servers
158
82
- A header file that has the definition of a static array was
83
- included in two places, wasting the space.
159
+ The smart HTTP clients forgot to verify the content-type that comes
160
+ back from the server side to make sure that the request is being
161
+ handled properly.
162
+
163
+ Will merge to 'next'.
164
165
86
-* nd/magic-pathspec-from-root (2013-01-21) 2 commits
87
- (merged to 'next' on 2013-01-25 at b056b57)
88
- + grep: avoid accepting ambiguous revision
89
- + Update :/abc ambiguity check
166
+* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit
167
+ - doc: mention tracking for pull.default
168
91
- When giving arguments without "--" disambiguation, object names
92
- that come earlier on the command line must not be interpretable as
93
- pathspecs and pathspecs that come later on the command line must
94
- not be interpretable as object names. Tweak the disambiguation
95
- rule so that ":/" (no other string before or after) is always
96
- interpreted as a pathspec, to avoid having to say "git cmd -- :/".
169
+ We stopped mentioning `tracking` is a deprecated but supported
170
+ synonym for `upstream` in pull.default even though we have no
171
+ intention of removing the support for it.
172
173
+ This is my "don't list it to catch readers' eyes, but make sure it
174
+ can be found if the reader looks for it" version; I'm not married
175
+ to the layout and am willing to take a replacement patch.
176
99
-* rr/minimal-stat (2013-01-22) 1 commit
100
- (merged to 'next' on 2013-01-25 at 11c4453)
101
- + Enable minimal stat checking
177
103
- Some reimplementations of Git does not write all the stat info back
104
- to the index due to their implementation limitations (e.g. jgit
105
- running on Java). A configuration option can tell Git to ignore
106
- changes to most of the stat fields and only pay attention to mtime
107
- and size, which these implementations can reliably update. This
108
- avoids excessive revalidation of contents.
178
+* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits
179
+ - apply: diagnose incomplete submodule object name better
180
+ - apply: simplify build_fake_ancestor()
181
+ - git-am: record full index line in the patch used while rebasing
182
183
+ Rebasing the history of superproject with change in the submodule
184
+ has been broken since v1.7.12.
185
+
186
+ Will merge to 'next'.
187
111
-* tb/t0050-maint (2013-01-21) 3 commits
112
- (merged to 'next' on 2013-01-25 at 682b1e2)
113
- + t0050: Use TAB for indentation
114
- + t0050: honor CASE_INSENSITIVE_FS in add (with different case)
115
- + t0050: known breakage vanished in merge (case change)
188
117
- Update tests that were expecting to fail due to a bug that was
118
- fixed earlier.
189
+* jk/doc-makefile-cleanup (2013-02-01) 1 commit
190
+ - Documentation/Makefile: clean up MAN*_TXT lists
191
+
192
+ Will merge to 'next'.
193
194
--------------------------------------------------
195
[Stalled]
@@ -282,6 +356,28 @@ repositories listed at
356
--------------------------------------------------
357
[Cooking]
358
359
+* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
360
+ - gitweb: refer to picon/gravatar images over the same scheme
361
+
362
+ Avoid mixed contents on a page coming via http and https when
363
+ gitweb is hosted on a https server.
364
+
365
+ Will merge to 'next'.
366
+
367
+
368
+* jk/python-styles (2013-01-30) 1 commit
369
+ - CodingGuidelines: add Python coding guidelines
370
+
371
+ Will merge to 'next'.
372
+
373
+
374
+* mn/send-email-authinfo (2013-01-29) 1 commit
375
+ - git-send-email: add ~/.authinfo parsing
376
+
377
+ Expecting a reroll.
378
+ $gmane/215004, $gmane/215024.
379
+
380
+
381
* mp/complete-paths (2013-01-11) 1 commit
382
(merged to 'next' on 2013-01-30 at 70e4f1a)
383
+ git-completion.bash: add support for path completion
@@ -298,39 +394,6 @@ repositories listed at
394
Will cook in 'next' to see if anybody screams.
395
396
301
-* bc/git-p4-for-python-2.4 (2013-01-26) 2 commits
302
- (merged to 'next' on 2013-01-30 at 5d81ed2)
303
- + git-p4.py: support Python 2.4
304
- + git-p4.py: support Python 2.5
305
-
306
- With small updates to remove dependency on newer features of
307
- Python, keep git-p4 usable with older Python.
308
-
309
- Will merge to 'master'.
310
-
311
-
312
-* jk/gc-auto-after-fetch (2013-01-26) 1 commit
313
- (merged to 'next' on 2013-01-30 at 472d07b)
314
- + Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch
315
- (this branch uses jk/maint-gc-auto-after-fetch.)
316
-
317
- This is to resolve merge conflicts early for the same topic to
318
- recent codebase.
319
-
320
- Will merge to 'master'.
321
-
322
-
323
-* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits
324
- + fetch-pack: avoid repeatedly re-scanning pack directory
325
- + fetch: run gc --auto after fetching
326
- (this branch is used by jk/gc-auto-after-fetch.)
327
-
328
- Help "fetch only" repositories that do not trigger "gc --auto"
329
- often enough.
330
-
331
- Will merge to 'master' via jk/gc-auto-after-fetch and later merge to 'maint'.
332
-
333
-
397
* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits
398
(merged to 'next' on 2013-01-30 at c6d7e16)
399
+ logmsg_reencode: lazily load missing commit buffers
@@ -372,8 +435,8 @@ repositories listed at
435
Will merge to 'master'.
436
437
375
-* ss/mergetools-tortoise (2013-01-26) 2 commits
376
- - mergetools: allow passing pathnames with SP in them to TortoiseGitMerge
438
+* ss/mergetools-tortoise (2013-02-01) 2 commits
439
+ - mergetools: teach tortoisemerge to handle filenames with SP correctly
440
- mergetools: support TortoiseGitMerge
441
442
Update mergetools to work better with newer merge helper tortoise ships.
@@ -381,8 +444,11 @@ repositories listed at
444
Will merge to 'next'.
445
446
384
-* da/mergetool-docs (2013-01-30) 4 commits
447
+* da/mergetool-docs (2013-01-30) 7 commits
448
- doc: generate a list of valid merge tools
449
+ - mergetool--lib: list user configured tools in '--tool-help'
450
+ - fixup! doc: generate a list of valid merge tools
451
+ - fixup! mergetool--lib: add functions for finding available tools
452
- mergetool--lib: add functions for finding available tools
453
- mergetool--lib: improve the help text in guess_merge_tool()
454
- mergetool--lib: simplify command expressions
@@ -392,15 +458,17 @@ repositories listed at
458
generate the list of mergetool and difftool backends the build
459
supports to be included in the documentation.
460
395
- This is looking ready for 'next'.
461
+ Will merge to 'next', after squashing the fixup! commits from John
462
+ Keeping.
463
464
398
-* nd/branch-error-cases (2013-01-30) 4 commits
465
+* nd/branch-error-cases (2013-01-31) 6 commits
466
+ - branch: let branch filters imply --list
467
+ - docs: clarify git-branch --list behavior
468
- branch: mark more strings for translation
469
- Merge branch 'nd/edit-branch-desc-while-detached' into HEAD
470
- branch: give a more helpful message on redundant arguments
471
- branch: reject -D/-d without branch name
403
- (this branch uses nd/edit-branch-desc-while-detached.)
472
473
Fix various error messages and conditions in "git branch", e.g. we
474
advertised "branch -d/-D" to remove one or more branches but actually
@@ -425,34 +493,6 @@ repositories listed at
493
Will merge to 'master'.
494
495
428
-* as/test-cleanup (2013-01-24) 1 commit
429
- (merged to 'next' on 2013-01-28 at cc1147d)
430
- + t7102 (reset): don't hardcode SHA-1 in expected outputs
431
-
432
- Will merge to 'master'.
433
-
434
-
435
-* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit
436
- (merged to 'next' on 2013-01-28 at df27f53)
437
- + t9902: protect test from stray build artifacts
438
-
439
- Scripts to test bash completion was inherently flaky as it was
440
- affected by whatever random things the user may have on $PATH.
441
-
442
- Will merge to 'master'.
443
-
444
-
445
-* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit
446
- (merged to 'next' on 2013-01-28 at fef4eb2)
447
- + git-cvsimport.txt: cvsps-2 is deprecated
448
-
449
- Warn people that other tools are more recommendable over
450
- cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport
451
- will not work with cvsps3.
452
-
453
- Will merge to 'master'.
454
-
455
-
496
* jk/mergetool (2013-01-28) 8 commits
497
- mergetools: simplify how we handle "vim" and "defaults"
498
- mergetool--lib: don't call "exit" in setup_tool
@@ -469,17 +509,6 @@ repositories listed at
509
This is looking ready for 'next'.
510
511
472
-* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit
473
- (merged to 'next' on 2013-01-28 at e0a8222)
474
- + ident: do not drop username when reading from /etc/mailname
475
-
476
- We used to stuff "user@" and then append what we read from
477
- /etc/mailname to come up with a default e-mail ident, but a bug
478
- lost the "user@" part. This is to fix it.
479
-
480
- Will merge to 'master'.
481
-
482
-
512
* mm/add-u-A-sans-pathspec (2013-01-28) 1 commit
513
(merged to 'next' on 2013-01-28 at fe762a6)
514
+ add: warn when -u or -A is used without pathspec
@@ -506,17 +535,13 @@ repositories listed at
535
tips of hidden refs by updated clients.
536
537
509
-* ta/doc-no-small-caps (2013-01-22) 10 commits
510
- - fixup! Change 'git' to 'Git' whenever the whole system is referred to #4
511
- - Change 'git' to 'Git' whenever the whole system is referred to #4
512
- - fixup! Change 'git' to 'Git' whenever the whole system is referred to #3
513
- - Change 'git' to 'Git' whenever the whole system is referred to #3
514
- - fixup! Change 'git' to 'Git' whenever the whole system is referred to #2
515
- - Change 'git' to 'Git' whenever the whole system is referred to #2
516
- - fixup! fixup! Change 'git' to 'Git' whenever the whole system is referred to #1
517
- - fixup! Change 'git' to 'Git' whenever the whole system is referred to #1
518
- - Change 'git' to 'Git' whenever the whole system is referred to #1
519
- - Documentation: avoid poor-man's small caps
538
+* ta/doc-no-small-caps (2013-02-01) 6 commits
539
+ - Documentation: StGit is the right spelling, not StGIT
540
+ - Documentation: describe the "repository" in repository-layout
541
+ - Documentation: add a description for 'gitfile' to glossary
542
+ - Documentation: do not use undefined terms git-dir and git-file
543
+ - Documentation: the name of the system is 'Git', not 'git'
544
+ - Documentation: avoid poor-man's small caps GIT
545
546
Update documentation to change "GIT" which was a poor-man's small
547
caps to "Git" which was the intended spelling. Also change "git"
@@ -524,9 +549,7 @@ repositories listed at
549
the whole or the concept it embodies, as opposed to the command the
550
end users would type.
551
527
- Will wait for a week or so (say, til end of January) for Thomas to
528
- collect fix-ups, squash the result into two patches and then merge
529
- to 'next'.
552
+ Will merge to 'next'.
553
554
555
* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
@@ -544,7 +567,9 @@ repositories listed at
567
Will merge to 'next'.
568
569
547
-* jk/remote-helpers-in-python-3 (2013-01-28) 9 commits
570
+* jk/remote-helpers-in-python-3 (2013-01-30) 10 commits
571
+ (merged to 'next' on 2013-01-31 at 5a948aa)
572
+ + git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"
573
(merged to 'next' on 2013-01-28 at d898471)
574
+ git-remote-testpy: fix path hashing on Python 3
575
(merged to 'next' on 2013-01-25 at acf9419)
@@ -597,32 +622,6 @@ repositories listed at
622
Will merge to 'master'.
623
624
600
-* nd/fetch-depth-is-broken (2013-01-11) 3 commits
601
- (merged to 'next' on 2013-01-15 at 70a5ca7)
602
- + fetch: elaborate --depth action
603
- + upload-pack: fix off-by-one depth calculation in shallow clone
604
- + fetch: add --unshallow for turning shallow repo into complete one
605
-
606
- "git fetch --depth" was broken in at least three ways. The
607
- resulting history was deeper than specified by one commit, it was
608
- unclear how to wipe the shallowness of the repository with the
609
- command, and documentation was misleading.
610
-
611
- Will merge to 'master'.
612
-
613
-
614
-* jc/no-git-config-in-clone (2013-01-11) 1 commit
615
- (merged to 'next' on 2013-01-15 at feeffe1)
616
- + clone: do not export and unexport GIT_CONFIG
617
-
618
- We stopped paying attention to $GIT_CONFIG environment that points
619
- at a single configuration file from any command other than "git config"
620
- quite a while ago, but "git clone" internally set, exported, and
621
- then unexported the variable during its operation unnecessarily.
622
-
623
- Will merge to 'master'.
624
-
625
-
625
* jc/push-2.0-default-to-simple (2013-01-16) 14 commits
626
(merged to 'next' on 2013-01-16 at 23f5df2)
627
+ t5570: do not assume the "matching" push is the default
@@ -657,7 +656,8 @@ repositories listed at
656
- commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
657
- sequencer.c: rework search for start of footer to improve clarity
658
660
- Rerolled. With help from Jonathan, I think this is getting closer.
659
+ Waiting for the final round of reroll before merging to 'next'.
660
+ After that we will go incremental.
661
662
--------------------------------------------------
663
[Discarded]