What's cooking (2013/04 #09)
Junio C Hamano committed
Apr 26, 2013 at 17:32 UTC
5d3df51339c59f46e8e9c4c903122a48d3748f9b
1 file changed
+136
-168
whats-cooking.txt
+136
-168
@@ -1,19 +1,29 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #08; Tue, 23)
4
-X-master-at: 562af5b0b900539bd7ef481316834e500f571899
5
-X-next-at: d6019519f9f40af1f430c4a5e6d87e69d376483d
3
+Subject: What's cooking in git.git (Apr 2013, #09; Fri, 26)
4
+X-master-at: b75cdfaa882a00f2274e74b21c1a9927d184ed29
5
+X-next-at: b1478c83563fcc2b22771ab08fa759a3972c365d
6
7
-What's cooking in git.git (Apr 2013, #08; Tue, 23)
7
+What's cooking in git.git (Apr 2013, #09; Fri, 26)
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
-Both of the two topics on preparing "git add" users for the
15
-behaviour change in Git 2.0 are in 'master'. We may want to tweak
16
-the wording of warning messages and such before the feature freeze.
14
+The release candidate preview 1.8.3-rc0 has been tagged. I'd like to
15
+see people focus on catching and fixing last minute regressions and
16
+incompleteness in the topics that have already in 'master' for the
17
+upcoming release. New topics that are not relevant for the goal to
18
+release a regression-free and complete 1.8.3 may not be queued even
19
+on 'pu' until final to reduce hassles on integration testing (I do
20
+not mean that it is forbidden to work on and discussing new topics
21
+on the list. It is just the patches won't be considered as formal
22
+submission and they won't hit 'pu').
23
+
24
+As to the topics still cooking on 'next', I unfortunately do not see
25
+anything that I feel comfortable merging for 1.8.3; but I am open to
26
+suggestions.
27
28
You can find the changes described here in the integration branches
29
of the repositories listed at
@@ -23,126 +33,110 @@ of the repositories listed at
33
--------------------------------------------------
34
[Graduated to "master"]
35
26
-* fc/untracked-zsh-prompt (2013-04-21) 1 commit
27
- (merged to 'next' on 2013-04-22 at 472da3e)
28
- + prompt: fix untracked files for zsh
29
-
30
- Zsh completion forgot that '%' character used to signal untracked
31
- files needs to be escaped with another '%'.
32
-
33
-
34
-* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit
35
- (merged to 'next' on 2013-04-22 at 1e27177)
36
- + receive-pack: close sideband fd on early pack errors
37
-
38
- When receive-pack detects error in the pack header it received in
39
- order to decide which of unpack-objects or index-pack to run, it
40
- returned without closing the error stream, which led to a hang
41
- sideband thread.
42
-
43
-
44
-* jn/gitweb-install-doc (2013-04-17) 2 commits
45
- (merged to 'next' on 2013-04-22 at a5d4812)
46
- + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
47
- + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
48
-
49
- Reword gitweb configuration instrutions.
50
-
51
-
52
-* kb/status-ignored-optim-2 (2013-04-15) 14 commits
53
- (merged to 'next' on 2013-04-21 at d2a5c70)
54
- + dir.c: git-status --ignored: don't scan the work tree twice
55
- + dir.c: git-status --ignored: don't scan the work tree three times
56
- + dir.c: git-status: avoid is_excluded checks for tracked files
57
- + dir.c: replace is_path_excluded with now equivalent is_excluded API
58
- + dir.c: unify is_excluded and is_path_excluded APIs
59
- + dir.c: move prep_exclude
60
- + dir.c: factor out parts of last_exclude_matching for later reuse
61
- + dir.c: git-clean -d -X: don't delete tracked directories
62
- + dir.c: make 'git-status --ignored' work within leading directories
63
- + dir.c: git-status --ignored: don't list empty directories as ignored
64
- + dir.c: git-ls-files --directories: don't hide empty directories
65
- + dir.c: git-status --ignored: don't list empty ignored directories
66
- + dir.c: git-status --ignored: don't list files in ignored directories
67
- + dir.c: git-status --ignored: don't drop ignored directories
68
-
69
- A handful of issues in the code to traverse working tree to find
70
- untracked and/or ignored files have been fixed, and the general
71
- codepath involved in "status -u" and "clean" have been cleaned up
72
- and optimized.
73
-
74
-
75
-* nd/pretty-formats (2013-04-18) 13 commits
76
- (merged to 'next' on 2013-04-22 at 3d63014)
77
- + pretty: support %>> that steal trailing spaces
78
- + pretty: support truncating in %>, %< and %><
79
- + pretty: support padding placeholders, %< %> and %><
80
- + pretty: add %C(auto) for auto-coloring
81
- + pretty: split color parsing into a separate function
82
- + pretty: two phase conversion for non utf-8 commits
83
- + utf8.c: add reencode_string_len() that can handle NULs in string
84
- + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
85
- + utf8.c: move display_mode_esc_sequence_len() for use by other functions
86
- + pretty: share code between format_decoration and show_decorations
87
- + pretty-formats.txt: wrap long lines
88
- + pretty: get the correct encoding for --pretty:format=%e
89
- + pretty: save commit encoding from logmsg_reencode if the caller needs it
90
-
91
- pretty-printing body of the commit that is stored in non UTF-8
92
- encoding did not work well. The early part of this series fixes
93
- it. And then it adds %C(auto) specifier that turns the coloring on
94
- when we are emitting to the terminal, and adds column-aligning
95
- format directives.
96
-
97
---------------------------------------------------
98
-[New Topics]
99
-
100
-* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
101
- - git add <pathspec>... defaults to "-A"
102
- (this branch uses jc/add-ignore-removal.)
103
-
104
- Updated endgame for "git add <pathspec>" that defaults to "--all"
105
- aka "--no-ignore-removal".
36
+* fc/remote-hg (2013-04-22) 16 commits
37
+ (merged to 'next' on 2013-04-25 at 152cb06)
38
+ + remote-hg: strip extra newline
39
+ + remote-hg: use marks instead of inlined files
40
+ + remote-hg: small performance improvement
41
+ + remote-hg: allow refs with spaces
42
+ + remote-hg: don't update bookmarks unnecessarily
43
+ + remote-hg: add support for schemes extension
44
+ + remote-hg: improve email sanitation
45
+ + remote-hg: add custom local tag write code
46
+ + remote-hg: write tags in the appropriate branch
47
+ + remote-hg: custom method to write tags
48
+ + remote-hg: add support for tag objects
49
+ + remote-hg: add branch_tip() helper
50
+ + remote-hg: properly mark branches up-to-date
51
+ + remote-hg: use python urlparse
52
+ + remote-hg: safer bookmark pushing
53
+ + remote-helpers: avoid has_key
54
107
- Will cook in 'next' until Git 2.0.
55
+ Further updates to remote-hg (in contrib/).
56
57
58
* jc/add-ignore-removal (2013-04-22) 2 commits
111
- - git add: rephrase -A/--no-all warning
112
- - git add: --ignore-removal is a better named --no-all
59
+ (merged to 'next' on 2013-04-24 at c85c5a7)
60
+ + git add: rephrase -A/--no-all warning
61
+ + git add: --ignore-removal is a better named --no-all
62
(this branch is used by jc/add-2.0-ignore-removal.)
63
64
Introduce "--ignore-removal" as a synonym to "--no-all" for "git
65
add", and improve the 2.0 migration warning with it.
66
118
- Will merge to 'next'.
67
68
+* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits
69
+ (merged to 'next' on 2013-04-21 at 0231d45)
70
+ + transport-helper: add 'signed-tags' capability
71
+ + transport-helper: pass --signed-tags=warn-strip to fast-export
72
+ + fast-export: add --signed-tags=warn-strip mode
73
121
-* fc/remote-hg (2013-04-22) 16 commits
122
- - remote-hg: strip extra newline
123
- - remote-hg: use marks instead of inlined files
124
- - remote-hg: small performance improvement
125
- - remote-hg: allow refs with spaces
126
- - remote-hg: don't update bookmarks unnecessarily
127
- - remote-hg: add support for schemes extension
128
- - remote-hg: improve email sanitation
129
- - remote-hg: add custom local tag write code
130
- - remote-hg: write tags in the appropriate branch
131
- - remote-hg: custom method to write tags
132
- - remote-hg: add support for tag objects
133
- - remote-hg: add branch_tip() helper
134
- - remote-hg: properly mark branches up-to-date
135
- - remote-hg: use python urlparse
136
- - remote-hg: safer bookmark pushing
137
- - remote-helpers: avoid has_key
74
+ Allows remote-helpers to declare they can handle signed tags, and
75
+ issue a warning when using those that don't.
76
139
- Further updates to remote-hg (in contrib/).
77
141
- Will merge to 'next' after a few days.
78
+* jn/glossary-revision (2013-04-21) 1 commit
79
+ (merged to 'next' on 2013-04-24 at 70efbe7)
80
+ + glossary: a revision is just a commit
81
+
82
+ The wording for "revision" in the glossary wanted to say it refers
83
+ to "commit (noun) as a concept" but it was badly phrased.
84
+
85
+ This may need further updates to hint that in contexts where it is
86
+ clear, the word may refer to an object name, not necessarily a
87
+ commit. But the patch as-is is already an improvement.
88
+
89
+
90
+* ph/rebase-original (2013-04-23) 1 commit
91
+ (merged to 'next' on 2013-04-24 at c643dcd)
92
+ + rebase: find orig_head unambiguously
93
+
94
+
95
+* rr/shortlog-doc (2013-04-22) 8 commits
96
+ (merged to 'next' on 2013-04-25 at a95a3fc)
97
+ + builtin/shortlog.c: make usage string consistent with log
98
+ + builtin/log.c: make usage string consistent with doc
99
+ + git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
100
+ + git-log.txt: rewrite note on why "--" may be required
101
+ + git-log.txt: generalize <since>..<until>
102
+ + git-log.txt: order OPTIONS properly; move <since>..<until>
103
+ + revisions.txt: clarify the .. and ... syntax
104
+ + git-shortlog.txt: remove (-h|--help) from OPTIONS
105
+
106
+ Update documentation for "log" and "shortlog".
107
108
109
* th/bisect-skipped-log (2013-04-23) 1 commit
145
- - bisect: Log possibly bad, skipped commits at bisection end
110
+ (merged to 'next' on 2013-04-25 at 1de189b)
111
+ + bisect: Log possibly bad, skipped commits at bisection end
112
+
113
+--------------------------------------------------
114
+[New Topics]
115
+
116
+* kb/full-history-compute-treesame-carefully (2013-04-24) 2 commits
117
+ - t6012: update test for tweaked full-history traversal
118
+ - Make --full-history consider more merges
119
+
120
+
121
+* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits
122
+ - remote: 'show' and 'prune' can take more than one remote
123
+ - remote: check for superfluous arguments in 'git remote add'
124
+ - remote: add a test for extra arguments, according to docs
125
+
126
+ Will merge to 'next'.
127
+
128
+
129
+* zk/prompt-rebase-step (2013-04-25) 1 commit
130
+ (merged to 'next' on 2013-04-25 at a8264bf)
131
+ + bash-prompt.sh: show where rebase is at when stopped
132
+
133
+
134
+* rr/pp-user-info-without-extra-allocation (2013-04-25) 3 commits
135
+ - pretty: remove intermediate strbufs from pp_user_info()
136
+ - pretty: simplify output line length calculation in pp_user_info()
137
+ - pretty: simplify input line length calculation in pp_user_info()
138
+
139
+ Will merge to 'next'.
140
141
--------------------------------------------------
142
[Stalled]
@@ -175,6 +169,7 @@ of the repositories listed at
169
- commit-slab: introduce a macro to define a slab for new type
170
- commit-slab: avoid large realloc
171
- commit: allow associating auxiliary info on-demand
172
+ (this branch is used by jc/show-branch.)
173
174
Technology demonstration to show a way we could use unbound number
175
of flag bits on commit objects.
@@ -220,51 +215,24 @@ of the repositories listed at
215
- show: honor --textconv for blobs
216
- t4030: demonstrate behavior of show with textconv
217
223
- Rerolld. I am not sure if I like "show <blob>" and "grep" that use
218
+ Rerolled. I am not sure if I like "show <blob>" and "grep" that use
219
textconv by default, though.
220
221
227
-* jn/glossary-revision (2013-04-21) 1 commit
228
- - glossary: a revision is just a commit
229
-
230
- The wording for "revision" in the glossary wanted to say it refers
231
- to "commit (noun) as a concept" but it was badly phrased.
232
-
233
- Will cook in 'next'.
234
-
235
- This may need further updates to hint that in contexts where it is
236
- clear, the word may refer to an object name, not necessarily a
237
- commit.
238
-
239
-
240
-* rr/shortlog-doc (2013-04-22) 8 commits
241
- - builtin/shortlog.c: make usage string consistent with log
242
- - builtin/log.c: make usage string consistent with doc
243
- - git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
244
- - git-log.txt: rewrite note on why "--" may be required
245
- - git-log.txt: generalize <since>..<until>
246
- - git-log.txt: order OPTIONS properly; move <since>..<until>
247
- - revisions.txt: clarify the .. and ... syntax
248
- - git-shortlog.txt: remove (-h|--help) from OPTIONS
249
-
250
- Update documentation for "log" and "shortlog".
251
-
252
- Looked reasonable.
253
- Will merge to 'next'.
254
-
255
-
222
* mh/multimail (2013-04-21) 1 commit
223
- git-multimail: a replacement for post-receive-email
224
225
Waiting for comments.
226
227
262
-* jc/prune-all (2013-04-18) 3 commits
228
+* jc/prune-all (2013-04-25) 4 commits
229
+ (merged to 'next' on 2013-04-26 at 97a7387)
230
+ + prune: introduce OPT_EXPIRY_DATE() and use it
231
(merged to 'next' on 2013-04-22 at b00ccf6)
232
+ api-parse-options.txt: document "no-" for non-boolean options
233
+ git-gc.txt, git-reflog.txt: document new expiry options
234
+ date.c: add parse_expiry_date()
267
- (this branch is used by mh/packed-refs-various.)
235
+ (this branch is tangled with mh/packed-refs-various.)
236
237
We used the approxidate() parser for "--expire=<timestamp>" options
238
of various commands, but it is better to treat --expire=all and
@@ -286,11 +254,13 @@ of the repositories listed at
254
Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
255
over bidi-pipes.
256
289
- Will cook in 'next'.
257
+ Will wait for a follow-up.
258
+ $gmane/222235
259
+
260
The test in the second from the tip needs to be updated.
261
262
293
-* mh/packed-refs-various (2013-04-23) 33 commits
263
+* mh/packed-refs-various (2013-04-24) 36 commits
264
- refs: handle the main ref_cache specially
265
- refs: change do_for_each_*() functions to take ref_cache arguments
266
- pack_one_ref(): do some cheap tests before a more expensive one
@@ -324,27 +294,19 @@ of the repositories listed at
294
- refs: document do_for_each_ref() and do_one_ref()
295
- refs: document the fields of struct ref_value
296
- refs: document flags constants REF_*
327
- (this branch uses jc/prune-all.)
297
+ (merged to 'next' on 2013-04-22 at b00ccf6)
298
+ + api-parse-options.txt: document "no-" for non-boolean options
299
+ + git-gc.txt, git-reflog.txt: document new expiry options
300
+ + date.c: add parse_expiry_date()
301
+ (this branch is tangled with jc/prune-all.)
302
303
Updates reading and updating packed-refs file, correcting corner
304
case bugs.
305
332
- Waiting for comments.
333
-
334
-
335
-* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits
336
- (merged to 'next' on 2013-04-21 at 0231d45)
337
- + transport-helper: add 'signed-tags' capability
338
- + transport-helper: pass --signed-tags=warn-strip to fast-export
339
- + fast-export: add --signed-tags=warn-strip mode
306
341
- Allows remote-helpers to declare they can handle signed tags, and
342
- issue a warning when using those that don't.
343
-
344
- Will merge to 'master'.
345
-
346
-
347
-* fc/transport-helper-error-reporting (2013-04-17) 9 commits
307
+* fc/transport-helper-error-reporting (2013-04-25) 10 commits
308
+ (merged to 'next' on 2013-04-25 at 3358f1a)
309
+ + t5801: "VAR=VAL shell_func args" is forbidden
310
(merged to 'next' on 2013-04-22 at 5ba6467)
311
+ transport-helper: update remote helper namespace
312
+ transport-helper: trivial code shuffle
@@ -359,10 +321,15 @@ of the repositories listed at
321
Update transport helper to report errors and maintain ref hierarchy
322
used to keep track of remote helper state better.
323
362
- Will merge to 'master'.
324
+ J6t reports that the update to t5801 breaks on Windows by the
325
+ remote-testgit that is written in bash, and Windows port of bash
326
+ does not have process substitution so remote-testgit is unusable
327
+ there.
328
329
365
-* jk/submodule-subdirectory-ok (2013-04-18) 2 commits
330
+* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
331
+ (merged to 'next' on 2013-04-24 at 6306b29)
332
+ + submodule: fix quoting in relative_path()
333
(merged to 'next' on 2013-04-22 at f211e25)
334
+ submodule: drop the top-level requirement
335
+ rev-parse: add --prefix option
@@ -389,7 +356,7 @@ of the repositories listed at
356
Will cook in 'next'.
357
358
392
-* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 1 commit
359
+* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
360
- git add: -u/-A now affects the entire working tree
361
362
Will cook in 'next' until Git 2.0.
@@ -479,10 +446,11 @@ of the repositories listed at
446
447
Will cook in 'next' until Git 2.0.
448
482
---------------------------------------------------
483
-[Discarded]
449
485
-* jc/add-2.0-delete-default (2013-04-21) 1 commit
450
+* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
451
- git add <pathspec>... defaults to "-A"
452
488
- Superseded by jc/add-2.0-ignore-removal
453
+ Updated endgame for "git add <pathspec>" that defaults to "--all"
454
+ aka "--no-ignore-removal".
455
+
456
+ Will cook in 'next' until Git 2.0.