What's cooking (2013/04 #08)
Junio C Hamano committed
Apr 23, 2013 at 12:30 UTC
35e1dc2fe449ea8302be3894f9f896921fc30849
1 file changed
+143
-246
whats-cooking.txt
+143
-246
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #07; Mon, 22)
4
-X-master-at: 118f60ee06612083ff4f1810424e80a3e896f73e
5
-X-next-at: 46dda50f1b80376d17129b9546d08f602af44864
3
+Subject: What's cooking in git.git (Apr 2013, #08; Tue, 23)
4
+X-master-at: 562af5b0b900539bd7ef481316834e500f571899
5
+X-next-at: d6019519f9f40af1f430c4a5e6d87e69d376483d
6
7
-What's cooking in git.git (Apr 2013, #07; Mon, 22)
7
+What's cooking in git.git (Apr 2013, #08; Tue, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,161 +23,173 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
26
-* ap/strbuf-humanize (2013-04-10) 2 commits
27
- (merged to 'next' on 2013-04-14 at 66d7af5)
28
- + count-objects: add -H option to humanize sizes
29
- + strbuf: create strbuf_humanise_bytes() to show byte sizes
30
-
31
- Teach "--human-readable" aka "-H" option to "git count-objects" to
32
- show various large numbers in Ki/Mi/GiB scaled as necessary.
33
-
34
- I've decided to let this topic supersede mc/count-objects-kibibytes.
35
- Human users will get an even easier output with "-H" and by not
36
- changing the output without an explicit option we do not have to
37
- break third-party tools that may have been reading from the output
38
- of this command.
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
41
-* as/clone-reference-with-gitfile (2013-04-09) 2 commits
42
- (merged to 'next' on 2013-04-15 at ab0d128)
43
- + clone: Allow repo using gitfile as a reference
44
- + clone: Fix error message for reference repository
33
46
- "git clone" did not work if a repository pointed at by the
47
- "--reference" option is a gitfile that points at another place.
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
50
-* fc/branch-upstream-color (2013-04-15) 1 commit
51
- (merged to 'next' on 2013-04-15 at 2fc50fd)
52
- + branch: colour upstream branches
43
54
- Add more colors to "git branch -vv" output.
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
57
-* fc/remote-hg (2013-04-11) 21 commits
58
- (merged to 'next' on 2013-04-16 at cbeaf41)
59
- + remote-hg: activate graphlog extension for hg_log()
60
- + remote-hg: fix bad file paths
61
- + remote-hg: document location of stored hg repository
62
- + remote-hg: fix bad state issue
63
- + remote-hg: add 'insecure' option
64
- + remote-hg: add simple mail test
65
- + remote-hg: add basic author tests
66
- + remote-hg: show more proper errors
67
- + remote-hg: force remote push
68
- + remote-hg: push to the appropriate branch
69
- + remote-hg: update tags globally
70
- + remote-hg: update remote bookmarks
71
- + remote-hg: refactor export
72
- + remote-hg: split bookmark handling
73
- + remote-hg: redirect buggy mercurial output
74
- + remote-hg: trivial test cleanups
75
- + remote-hg: make sure fake bookmarks are updated
76
- + remote-hg: fix for files with spaces
77
- + remote-hg: properly report errors on bookmark pushes
78
- + remote-hg: add missing config variable in doc
79
- + remote-hg: trivial cleanups
51
81
- Updates remote-hg helper (in contrib/).
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
84
-* jk/a-thread-only-dies-once (2013-04-16) 2 commits
85
- (merged to 'next' on 2013-04-18 at 3208f44)
86
- + run-command: use thread-aware die_is_recursing routine
87
- + usage: allow pluggable die-recursion checks
74
89
- A regression fix for the logic to detect die() handler triggering
90
- itself recursively.
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
93
-* jk/chopped-ident (2013-04-17) 3 commits
94
- (merged to 'next' on 2013-04-19 at ecec2d4)
95
- + blame: handle broken commit headers gracefully
96
- + pretty: handle broken commit headers gracefully
97
- + cat-file: print tags raw for "cat-file -p"
97
+--------------------------------------------------
98
+[New Topics]
99
99
- A commit object whose author or committer ident are malformed
100
- crashed some code that trusted that a name, an email and an
101
- timestamp can always be found in it.
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".
106
104
-* jk/doc-http-backend (2013-04-13) 3 commits
105
- (merged to 'next' on 2013-04-19 at 7932840)
106
- + doc/http-backend: match query-string in apache half-auth example
107
- + doc/http-backend: give some lighttpd config examples
108
- + doc/http-backend: clarify "half-auth" repo configuration
107
+ Will cook in 'next' until Git 2.0.
108
110
- Improve documentation to illustrate "push authenticated, fetch
111
- anonymous" configuration for smart HTTP servers.
109
110
+* 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
113
+ (this branch is used by jc/add-2.0-ignore-removal.)
114
114
-* jx/i18n-branch-error-messages (2013-04-15) 1 commit
115
- (merged to 'next' on 2013-04-18 at 630c211)
116
- + i18n: branch: mark strings for translation
115
+ Introduce "--ignore-removal" as a synonym to "--no-all" for "git
116
+ add", and improve the 2.0 migration warning with it.
117
118
+ Will merge to 'next'.
119
119
-* lf/read-blob-data-from-index (2013-04-17) 3 commits
120
- (merged to 'next' on 2013-04-17 at 611208f)
121
- + convert.c: remove duplicate code
122
- + read_blob_data_from_index(): optionally return the size of blob data
123
- + attr.c: extract read_index_data() as read_blob_data_from_index()
120
125
- Reduce duplicated code between convert.c and attr.c.
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
138
139
+ Further updates to remote-hg (in contrib/).
140
128
-* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
129
- (merged to 'next' on 2013-04-16 at a2da926)
130
- + cherry-pick: make sure all input objects are commits
141
+ Will merge to 'next' after a few days.
142
132
- "git cherry-pick $blob $tree" is diagnosed as a nonsense.
143
144
+* th/bisect-skipped-log (2013-04-23) 1 commit
145
+ - bisect: Log possibly bad, skipped commits at bisection end
146
135
-* mv/ssl-ftp-curl (2013-04-12) 1 commit
136
- (merged to 'next' on 2013-04-15 at 7fdada6)
137
- + Support FTP-over-SSL/TLS for regular FTP
147
+--------------------------------------------------
148
+[Stalled]
149
139
- Does anybody really use commit walkers over ftp???
150
+* jc/format-patch (2013-04-22) 2 commits
151
+ - format-patch: --inline-single
152
+ - format-patch: rename "no_inline" field
153
154
+ A new option to send a single patch to the standard output to be
155
+ appended at the bottom of a message. I personally have no need for
156
+ this, but it was easy enough to cobble together. Tests, docs and
157
+ stripping out more MIMEy stuff are left as exercises to interested
158
+ parties.
159
142
-* nd/checkout-keep-sparse (2013-04-15) 1 commit
143
- (merged to 'next' on 2013-04-19 at 803dabc)
144
- + checkout: add --ignore-skip-worktree-bits in sparse checkout mode
160
+ Not ready for inclusion.
161
146
- Make the initial "sparse" selection of the paths more sticky across
147
- "git checkout".
162
163
+* jk/gitweb-utf8 (2013-04-08) 4 commits
164
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
165
+ - gitweb: Don't append ';js=(0|1)' to external links
166
+ - gitweb: Make feed title valid utf8
167
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
168
150
-* rt/commentchar-fmt-merge-msg (2013-04-18) 1 commit
151
- (merged to 'next' on 2013-04-18 at 96799bd)
152
- + t6200: avoid path mangling issue on Windows
169
+ Various fixes to gitweb.
170
154
- A test fix for recent update.
171
+ Waiting for a reroll after a review.
172
173
157
-* ta/glossary (2013-04-15) 4 commits
158
- (merged to 'next' on 2013-04-19 at 63ee8a4)
159
- + glossary: improve definitions of refspec and pathspec
160
- + The name of the hash function is "SHA-1", not "SHA1"
161
- + glossary: improve description of SHA-1 related topics
162
- + glossary: remove outdated/misleading/irrelevant entries
174
+* jk/commit-info-slab (2013-04-19) 3 commits
175
+ - commit-slab: introduce a macro to define a slab for new type
176
+ - commit-slab: avoid large realloc
177
+ - commit: allow associating auxiliary info on-demand
178
179
+ Technology demonstration to show a way we could use unbound number
180
+ of flag bits on commit objects.
181
165
-* th/bisect-final-log (2013-04-15) 1 commit
166
- (merged to 'next' on 2013-04-19 at 89d2041)
167
- + bisect: Store first bad commit as comment in log file
182
169
- Leave a commit to note what the final outcome was in the bisect log
170
- file.
183
+* jn/config-ignore-inaccessible (2013-04-15) 1 commit
184
+ - config: allow inaccessible configuration under $HOME
185
172
-* tr/copy-revisions-from-stdin (2013-04-16) 1 commit
173
- (merged to 'next' on 2013-04-16 at d882870)
174
- + read_revisions_from_stdin: make copies for handle_revision_arg
186
+ When $HOME is misconfigured to point at an unreadable directory, we
187
+ used to complain and die. This loosens the check.
188
176
- A fix to a long-standing issue in the command line parser for
177
- revisions, which was triggered by mv/sequence-pick-error-diag topic.
189
+ I do not think we agreed that this is a good idea, though.
190
191
--------------------------------------------------
180
-[New Topics]
192
+[Cooking]
193
194
* jh/checkout-auto-tracking (2013-04-21) 8 commits
195
(merged to 'next' on 2013-04-22 at 2356700)
@@ -199,7 +211,8 @@ of the repositories listed at
211
Will cook in 'next'.
212
213
202
-* mg/more-textconv (2013-04-19) 6 commits
214
+* mg/more-textconv (2013-04-23) 7 commits
215
+ - git grep: honor textconv by default
216
- grep: honor --textconv for the case rev:path
217
- grep: allow to use textconv filters
218
- t7008: demonstrate behavior of grep with textconv
@@ -207,26 +220,8 @@ of the repositories listed at
220
- show: honor --textconv for blobs
221
- t4030: demonstrate behavior of show with textconv
222
210
- Will be rerolled.
211
-
212
-
213
-* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit
214
- (merged to 'next' on 2013-04-22 at 1e27177)
215
- + receive-pack: close sideband fd on early pack errors
216
-
217
- When receive-pack detects error in the pack header it received in
218
- order to decide which of unpack-objects or index-pack to run, it
219
- returned without closing the error stream, which led to a hang
220
- sideband thread.
221
-
222
- Will fast-track to 'master'.
223
-
224
-
225
-* fc/untracked-zsh-prompt (2013-04-21) 1 commit
226
- (merged to 'next' on 2013-04-22 at 472da3e)
227
- + prompt: fix untracked files for zsh
228
-
229
- Will fast-track to 'master'.
223
+ Rerolld. I am not sure if I like "show <blob>" and "grep" that use
224
+ textconv by default, though.
225
226
227
* jn/glossary-revision (2013-04-21) 1 commit
@@ -263,58 +258,13 @@ of the repositories listed at
258
259
Waiting for comments.
260
266
---------------------------------------------------
267
-[Stalled]
268
-
269
-* jc/format-patch (2013-04-22) 2 commits
270
- - format-patch: --inline-single
271
- - format-patch: rename "no_inline" field
272
-
273
- A new option to send a single patch to the standard output to be
274
- appended at the bottom of a message. I personally have no need for
275
- this, but it was easy enough to cobble together. Tests, docs and
276
- stripping out more MIMEy stuff are left as exercises to interested
277
- parties.
278
-
279
- Not ready for inclusion.
280
-
281
-
282
-* jk/gitweb-utf8 (2013-04-08) 4 commits
283
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
284
- - gitweb: Don't append ';js=(0|1)' to external links
285
- - gitweb: Make feed title valid utf8
286
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
287
-
288
- Various fixes to gitweb.
289
-
290
- Waiting for a reroll after a review.
291
-
292
-
293
-* jk/commit-info-slab (2013-04-19) 3 commits
294
- - commit-slab: introduce a macro to define a slab for new type
295
- - commit-slab: avoid large realloc
296
- - commit: allow associating auxiliary info on-demand
297
-
298
- Technology demonstration to show a way we could use unbound number
299
- of flag bits on commit objects.
300
-
301
-
302
-* jn/config-ignore-inaccessible (2013-04-15) 1 commit
303
- - config: allow inaccessible configuration under $HOME
304
-
305
- When $HOME is misconfigured to point at an unreadable directory, we
306
- used to complain and die. This loosens the check.
307
-
308
- I do not think we agreed that this is a good idea, though.
309
-
310
---------------------------------------------------
311
-[Cooking]
261
262
* jc/prune-all (2013-04-18) 3 commits
263
(merged to 'next' on 2013-04-22 at b00ccf6)
264
+ api-parse-options.txt: document "no-" for non-boolean options
265
+ git-gc.txt, git-reflog.txt: document new expiry options
266
+ date.c: add parse_expiry_date()
267
+ (this branch is used by mh/packed-refs-various.)
268
269
We used the approxidate() parser for "--expire=<timestamp>" options
270
of various commands, but it is better to treat --expire=all and
@@ -325,55 +275,6 @@ of the repositories listed at
275
Will cook in 'next'.
276
277
328
-* nd/pretty-formats (2013-04-18) 13 commits
329
- (merged to 'next' on 2013-04-22 at 3d63014)
330
- + pretty: support %>> that steal trailing spaces
331
- + pretty: support truncating in %>, %< and %><
332
- + pretty: support padding placeholders, %< %> and %><
333
- + pretty: add %C(auto) for auto-coloring
334
- + pretty: split color parsing into a separate function
335
- + pretty: two phase conversion for non utf-8 commits
336
- + utf8.c: add reencode_string_len() that can handle NULs in string
337
- + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
338
- + utf8.c: move display_mode_esc_sequence_len() for use by other functions
339
- + pretty: share code between format_decoration and show_decorations
340
- + pretty-formats.txt: wrap long lines
341
- + pretty: get the correct encoding for --pretty:format=%e
342
- + pretty: save commit encoding from logmsg_reencode if the caller needs it
343
-
344
- pretty-printing body of the commit that is stored in non UTF-8
345
- encoding did not work well. The early part of this series fixes
346
- it. And then it adds %C(auto) specifier that turns the coloring on
347
- when we are emitting to the terminal, and adds column-aligning
348
- format directives.
349
-
350
- Will merge to 'master'.
351
-
352
-
353
-* kb/status-ignored-optim-2 (2013-04-15) 14 commits
354
- (merged to 'next' on 2013-04-21 at d2a5c70)
355
- + dir.c: git-status --ignored: don't scan the work tree twice
356
- + dir.c: git-status --ignored: don't scan the work tree three times
357
- + dir.c: git-status: avoid is_excluded checks for tracked files
358
- + dir.c: replace is_path_excluded with now equivalent is_excluded API
359
- + dir.c: unify is_excluded and is_path_excluded APIs
360
- + dir.c: move prep_exclude
361
- + dir.c: factor out parts of last_exclude_matching for later reuse
362
- + dir.c: git-clean -d -X: don't delete tracked directories
363
- + dir.c: make 'git-status --ignored' work within leading directories
364
- + dir.c: git-status --ignored: don't list empty directories as ignored
365
- + dir.c: git-ls-files --directories: don't hide empty directories
366
- + dir.c: git-status --ignored: don't list empty ignored directories
367
- + dir.c: git-status --ignored: don't list files in ignored directories
368
- + dir.c: git-status --ignored: don't drop ignored directories
369
-
370
- Rerolls kb/status-ignored-optim topic (reverted from 'next').
371
- With help from Karsten, conflicts with as/check-ignore topic have
372
- been sorted out and it is now in 'pu'.
373
-
374
- Will merge to 'master'.
375
-
376
-
278
* as/check-ignore (2013-04-11) 5 commits
279
(merged to 'next' on 2013-04-21 at 7515aa8)
280
+ Documentation: add caveats about I/O buffering for check-{attr,ignore}
@@ -389,7 +290,7 @@ of the repositories listed at
290
The test in the second from the tip needs to be updated.
291
292
392
-* mh/packed-refs-various (2013-04-15) 33 commits
293
+* mh/packed-refs-various (2013-04-23) 33 commits
294
- refs: handle the main ref_cache specially
295
- refs: change do_for_each_*() functions to take ref_cache arguments
296
- pack_one_ref(): do some cheap tests before a more expensive one
@@ -423,6 +324,7 @@ of the repositories listed at
324
- refs: document do_for_each_ref() and do_one_ref()
325
- refs: document the fields of struct ref_value
326
- refs: document flags constants REF_*
327
+ (this branch uses jc/prune-all.)
328
329
Updates reading and updating packed-refs file, correcting corner
330
case bugs.
@@ -442,16 +344,6 @@ of the repositories listed at
344
Will merge to 'master'.
345
346
445
-* jn/gitweb-install-doc (2013-04-17) 2 commits
446
- (merged to 'next' on 2013-04-22 at a5d4812)
447
- + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
448
- + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
449
-
450
- Reword gitweb configuration instrutions.
451
-
452
- Will merge to 'master'.
453
-
454
-
347
* fc/transport-helper-error-reporting (2013-04-17) 9 commits
348
(merged to 'next' on 2013-04-22 at 5ba6467)
349
+ transport-helper: update remote helper namespace
@@ -481,7 +373,9 @@ of the repositories listed at
373
Will cook in 'next'.
374
375
484
-* jl/submodule-mv (2013-04-11) 4 commits
376
+* jl/submodule-mv (2013-04-23) 5 commits
377
+ (merged to 'next' on 2013-04-23 at c04f574)
378
+ + submodule.c: duplicate real_path's return value
379
(merged to 'next' on 2013-04-19 at 45ae3c9)
380
+ rm: delete .gitmodules entry of submodules removed from the work tree
381
+ Teach mv to update the path entry in .gitmodules for moved submodules
@@ -550,7 +444,9 @@ of the repositories listed at
444
445
Migrate the rest of codebase to use "struct pathspec" more.
446
553
- Will be rerolled.
447
+ This has nasty conflicts with kb/status-ignored-optim-2,
448
+ as/check-ignore and tr/line-log; I've already asked Duy to hold
449
+ this and later rebase on top of them.
450
451
452
* tr/line-log (2013-04-22) 13 commits
@@ -583,9 +479,10 @@ of the repositories listed at
479
480
Will cook in 'next' until Git 2.0.
481
482
+--------------------------------------------------
483
+[Discarded]
484
485
* jc/add-2.0-delete-default (2013-04-21) 1 commit
486
- git add <pathspec>... defaults to "-A"
487
590
- Will cook in 'next' until Git 2.0.
591
-
488
+ Superseded by jc/add-2.0-ignore-removal