What's cooking (2013/03 #04)
Junio C Hamano committed
Mar 13, 2013 at 13:21 UTC
1fad96680508e7710cc5e50a9a53d649ef588def
1 file changed
+137
-114
whats-cooking.txt
+137
-114
@@ -1,35 +1,107 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2013, #03; Mon, 11)
4
-X-master-at: ce432cac30f98b291be609a0fc974042a2156f55
5
-X-next-at: a3a3ddd090a4feb8ff0eca6d353f517c26c37842
3
+Subject: What's cooking in git.git (Mar 2013, #04; Wed, 13)
4
+X-master-at: 239222f587ed06f96d90dd71c66d80a2b1e3dc9f
5
+X-next-at: 36b63d62840a512828134a9665bea5dcf8279464
6
7
-What's cooking in git.git (Mar 2013, #03; Mon, 11)
7
+What's cooking in git.git (Mar 2013, #04; Wed, 13)
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
-The final will be tagged in a few days; we have enough material for
15
-post 1.8.2 cycle already, and it will be a busy few weeks towards
16
-the end of the month once the dust settles.
14
+The tip of the master is at v1.8.2. We have already many topics
15
+lined up for the next cycle, so after a few days to calm down, we
16
+will see exciting changes on 'master' starting from next week.
17
18
-You can find the changes described here in the integration branches of the
19
-repositories listed at
18
+You can find the changes described here in the integration branches
19
+of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
24
-[Graduated to "master"]
24
+[New Topics]
25
+
26
+* ph/tag-force-no-warn-on-creation (2013-03-13) 1 commit
27
+ - tag: --force does not have to warn when creating tags
28
26
-* gp/add-u-A-documentation (2013-03-07) 1 commit
27
- (merged to 'next' on 2013-03-08 at d86f8b3)
28
- + add: Clarify documentation of -A and -u
29
- (this branch is used by jc/add-2.0-delete-default and jc/add-2.0-u-A-sans-pathspec.)
29
+ Will cook in 'next'.
30
31
--------------------------------------------------
32
-[New Topics]
32
+[Stalled]
33
+
34
+* po/help-guides (2013-03-03) 5 commits
35
+ - help doc: include --guide option description
36
+ - help.c: add list_common_guides_help() function
37
+ - help.c: add --guide option
38
+ - help.c: use OPT_COUNTUP
39
+ - show 'git help <guide>' usage, with examples
40
+
41
+ Give more visibility to "concept guides" to help "git help" users.
42
+
43
+ Expecting a reroll.
44
+ $gmane/217384
45
+
46
+
47
+* hv/config-from-strbuf (2013-03-10) 4 commits
48
+ - teach config parsing to read from strbuf
49
+ - config: make parsing stack struct independent from actual data source
50
+ - config: drop file pointer validity check in get_next_char()
51
+ - config: factor out config file stack management
52
+
53
+ Expecting a reroll.
54
+ $gmane/217811
55
+
56
+
57
+* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
58
+ - Highlight the link target line in Gitweb using CSS
59
+
60
+ Expecting a reroll.
61
+ $gmane/211935
62
+
63
+
64
+* mb/remote-default-nn-origin (2012-07-11) 6 commits
65
+ - Teach get_default_remote to respect remote.default.
66
+ - Test that plain "git fetch" uses remote.default when on a detached HEAD.
67
+ - Teach clone to set remote.default.
68
+ - Teach "git remote" about remote.default.
69
+ - Teach remote.c about the remote.default configuration setting.
70
+ - Rename remote.c's default_remote_name static variables.
71
+
72
+ When the user does not specify what remote to interact with, we
73
+ often attempt to use 'origin'. This can now be customized via a
74
+ configuration variable.
75
+
76
+ Expecting a reroll.
77
+ $gmane/210151
78
+
79
+ "The first remote becomes the default" bit is better done as a
80
+ separate step.
81
+
82
+--------------------------------------------------
83
+[Cooking]
84
+
85
+* nd/branch-show-rebase-bisect-state (2013-03-13) 6 commits
86
+ - branch: show more information when HEAD is detached
87
+ - status: show more info than "currently not on any branch"
88
+ - wt-status: move wt_status_get_state() out to wt_status_print()
89
+ - wt-status: split wt_status_state parsing function out
90
+ - wt-status: move strbuf into read_and_strip_branch()
91
+ - Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state
92
+ (this branch uses jc/reflog-reverse-walk.)
93
+
94
+ The changes look sound, but some patches need better description.
95
+
96
+
97
+* kb/p4merge (2013-03-13) 2 commits
98
+ - mergetools/p4merge: create a base if none available
99
+ - mergetools/p4merge: swap LOCAL and REMOTE
100
+
101
+ Looked reasonable.
102
+
103
+ Will merge to 'next'.
104
+
105
106
* jc/maint-push-refspec-default-doc (2013-03-08) 1 commit
107
- Documentation/git-push: clarify the description of defaults
@@ -37,17 +109,20 @@ repositories listed at
109
Clarify in the documentation "what" gets pushed to "where" when the
110
command line to "git push" does not say these explicitly.
111
40
- Needs proofreading.
112
+ Will merge to 'next'.
113
114
115
* jc/reflog-reverse-walk (2013-03-08) 3 commits
116
- reflog: add for_each_reflog_ent_reverse() API
117
- for_each_recent_reflog_ent(): simplify opening of a reflog file
118
- for_each_reflog_ent(): extract a helper to process a single entry
119
+ (this branch is used by nd/branch-show-rebase-bisect-state.)
120
48
- An internal function used to implementate "git checkout @{-1}" was
121
+ An internal function used to implement "git checkout @{-1}" was
122
hard to use correctly.
123
124
+ Will merge to 'next'.
125
+
126
127
* jk/alias-in-bare (2013-03-08) 3 commits
128
(merged to 'next' on 2013-03-09 at 2f9d72a)
@@ -62,11 +137,12 @@ repositories listed at
137
138
139
* pw/p4-symlinked-root (2013-03-11) 3 commits
65
- - git p4: avoid expanding client paths in chdir
66
- - git p4 test: should honor symlink in p4 client root
67
- - git p4 test: make sure P4CONFIG relative path works
140
+ (merged to 'next' on 2013-03-12 at 559b926)
141
+ + git p4: avoid expanding client paths in chdir
142
+ + git p4 test: should honor symlink in p4 client root
143
+ + git p4 test: make sure P4CONFIG relative path works
144
69
- Will merge to 'next'.
145
+ Will cook in 'next'.
146
147
148
* jc/add-2.0-delete-default (2013-03-08) 3 commits
@@ -82,6 +158,8 @@ repositories listed at
158
rebased on top of recent documentation updates to propose a
159
possible transition plan.
160
161
+ Will merge to and cook in 'next' until Git 2.0.
162
+
163
164
* jc/add-2.0-u-A-sans-pathspec (2013-03-11) 1 commit
165
- git add: -u/-A now affects the entire working tree
@@ -93,67 +171,19 @@ repositories listed at
171
entire working tree). With this, we finally change the behaviour
172
and make it affect the entire working tree in Git 2.0.
173
174
+ Will merge to and cook in 'next' until Git 2.0.
175
+
176
177
* jk/empty-archive (2013-03-10) 2 commits
98
- - archive: handle commits with an empty tree
99
- - test-lib: factor out $GIT_UNZIP setup
178
+ (merged to 'next' on 2013-03-12 at 942e592)
179
+ + archive: handle commits with an empty tree
180
+ + test-lib: factor out $GIT_UNZIP setup
181
182
"git archive" reports a failure when asked to create an archive out
183
of an empty tree. It would be more intuitive to give an empty
184
archive back in such a case.
185
105
- Will merge to 'next'.
106
-
107
-
108
-* kb/p4merge (2013-03-09) 3 commits
109
- - git-merge-one-file: revise merge error reporting
110
- - mergetools/p4merge: create a base if none available
111
- - mergetools/p4merge: swap LOCAL and REMOTE
112
-
113
- Expecting a reroll.
114
-
115
---------------------------------------------------
116
-[Stalled]
117
-
118
-* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
119
- - Highlight the link target line in Gitweb using CSS
120
-
121
- Expecting a reroll.
122
- $gmane/211935
123
-
124
-
125
-* mb/remote-default-nn-origin (2012-07-11) 6 commits
126
- - Teach get_default_remote to respect remote.default.
127
- - Test that plain "git fetch" uses remote.default when on a detached HEAD.
128
- - Teach clone to set remote.default.
129
- - Teach "git remote" about remote.default.
130
- - Teach remote.c about the remote.default configuration setting.
131
- - Rename remote.c's default_remote_name static variables.
132
-
133
- When the user does not specify what remote to interact with, we
134
- often attempt to use 'origin'. This can now be customized via a
135
- configuration variable.
136
-
137
- Expecting a reroll.
138
- $gmane/210151
139
-
140
- "The first remote becomes the default" bit is better done as a
141
- separate step.
142
-
143
---------------------------------------------------
144
-[Cooking]
145
-
146
-* po/help-guides (2013-03-03) 5 commits
147
- - help doc: include --guide option description
148
- - help.c: add list_common_guides_help() function
149
- - help.c: add --guide option
150
- - help.c: use OPT_COUNTUP
151
- - show 'git help <guide>' usage, with examples
152
-
153
- Give more visibility to "concept guides" to help "git help" users.
154
-
155
- Expecting a reroll.
156
- $gmane/217384
186
+ Will cook in 'next'.
187
188
189
* jk/graph-c-expose-symbols-for-cgit (2013-03-03) 1 commit
@@ -205,10 +235,14 @@ repositories listed at
235
236
237
* aw/setup-prefix-pathspec (2013-03-09) 2 commits
208
- - setup.c: check that the pathspec magic ends with ")"
209
- - setup.c: stop prefix_pathspec() from looping past the end of string
238
+ (merged to 'next' on 2013-03-12 at 31a4a5e)
239
+ + setup.c: check that the pathspec magic ends with ")"
240
+ + setup.c: stop prefix_pathspec() from looping past the end of string
241
211
- Will merge to 'next'.
242
+ "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and
243
+ instead the parser kept reading beyond the end of the string.
244
+
245
+ Will cook in 'next'.
246
247
248
* lf/bundle-verify-list-prereqs (2013-03-08) 2 commits
@@ -251,15 +285,6 @@ repositories listed at
285
Will cook in 'next'.
286
287
254
-* hv/config-from-strbuf (2013-03-10) 4 commits
255
- - teach config parsing to read from strbuf
256
- - config: make parsing stack struct independent from actual data source
257
- - config: drop file pointer validity check in get_next_char()
258
- - config: factor out config file stack management
259
-
260
- Rerolled.
261
-
262
-
288
* jc/describe (2013-02-28) 1 commit
289
(merged to 'next' on 2013-03-05 at 6b353f3)
290
+ describe: --match=<pattern> must limit the refs even when used with --all
@@ -285,7 +310,8 @@ repositories listed at
310
* pc/subtree-add-before-fetch (2013-02-28) 1 commit
311
- contrib/subtree: allow addition of remote branch with name not locally present
312
288
- Comments?
313
+ Will discard.
314
+ Not getting enough reviews.
315
316
317
* tr/line-log (2013-02-28) 5 commits
@@ -295,6 +321,9 @@ repositories listed at
321
- blame: introduce $ as "end of file" in -L syntax
322
- Refactor parse_loc
323
324
+ Expecting a reroll.
325
+ $gmane/217278
326
+
327
328
* jc/perl-cat-blob (2013-02-22) 1 commit
329
(merged to 'next' on 2013-02-25 at 7c0079a)
@@ -422,19 +451,6 @@ repositories listed at
451
Will cook in 'next'.
452
453
425
-* gp/forbid-describe-all-match (2013-02-24) 1 commit
426
- - describe: make --all and --match=PATTERN mutually incompatible
427
- (this branch uses gp/describe-match-uses-glob-pattern.)
428
-
429
- "describe --match=<pattern> --all <commit>" ought to mean "use refs
430
- that match <pattern> to describe <commit>; you do not have to limit
431
- yourself to annotated tags." But it doesn't. Disable the
432
- combination.
433
-
434
- We may want to discard this if jc/describe topic turns out to be a
435
- better idea.
436
-
437
-
454
* jk/common-make-variables-export-safety (2013-02-25) 1 commit
455
(merged to 'next' on 2013-03-05 at 084ae43)
456
+ Makefile: make mandir, htmldir and infodir absolute
@@ -449,6 +465,8 @@ repositories listed at
465
* jk/suppress-clang-warning (2013-02-25) 1 commit
466
- fix clang -Wtautological-compare with unsigned enum
467
468
+ Will merge to 'next'.
469
+
470
471
* mg/qnx6 (2013-02-25) 1 commit
472
- QNX: newer QNX 6.x.x is not so crippled
@@ -463,6 +481,8 @@ repositories listed at
481
482
A few workarounds for systems with unsigned time_t.
483
484
+ Will merge to 'next'.
485
+
486
487
* rj/msvc-build (2013-02-25) 5 commits
488
(merged to 'next' on 2013-02-26 at 7493068)
@@ -602,7 +622,7 @@ repositories listed at
622
- shell: new no-interactive-login command to print a custom message
623
- shell doc: emphasize purpose and security model
624
605
- Rerolled.
625
+ Will merge to 'next'.
626
627
628
* jc/fetch-raw-sha1 (2013-02-07) 4 commits
@@ -633,18 +653,6 @@ repositories listed at
653
Will cook in 'next'.
654
655
636
-* nd/branch-show-rebase-bisect-state (2013-03-06) 4 commits
637
- . branch: show more information when HEAD is detached
638
- . status: show more info than "currently not on any branch"
639
- . wt-status: move wt_status_get_state() out to wt_status_print()
640
- . wt-status: split wt_status_state parsing function out
641
-
642
- Kicked out of 'pu'; if the function to read reflog backwards,
643
- introduced by jc/reflog-reverse-walk, turns out to be a good idea
644
- to avoid mistaken use of the existing function, this topic can be
645
- rerolled using the new function.
646
-
647
-
656
* nd/count-garbage (2013-02-15) 4 commits
657
(merged to 'next' on 2013-02-17 at b2af923)
658
+ count-objects: report how much disk space taken by garbage files
@@ -750,3 +758,18 @@ repositories listed at
758
+ sequencer.c: rework search for start of footer to improve clarity
759
760
Will cook in 'next'.
761
+
762
+
763
+* gp/forbid-describe-all-match (2013-02-24) 1 commit
764
+ - describe: make --all and --match=PATTERN mutually incompatible
765
+ (this branch uses gp/describe-match-uses-glob-pattern.)
766
+
767
+ "describe --match=<pattern> --all <commit>" ought to mean "use refs
768
+ that match <pattern> to describe <commit>; you do not have to limit
769
+ yourself to annotated tags." But it doesn't. Disable the
770
+ combination.
771
+
772
+ Will discard.
773
+
774
+ jc/describe topic fixes the semantics of --match used with --all
775
+ option.