What's cooking (2012/12 #01)
Junio C Hamano committed
Dec 6, 2012 at 13:49 UTC
06815c036640a765e4d3beba9a28b2ee158a34bc
1 file changed
+95
-271
whats-cooking.txt
+95
-271
@@ -1,20 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #10; Thu, 29)
4
-X-master-at: f94c3251e1400c3cf349f7f84fea4db66b540113
5
-X-next-at: 19e1b0a2032ea70977d8d774ed994913f067038b
3
+Subject: What's cooking in git.git (Dec 2012, #01; Thu, 6)
4
+X-master-at: fb4c62235fee8008d99ef55c4adcb1f7ea9508a3
5
+X-next-at: af2e3a9095a73e8f4f0dea403998204b8ff7dee1
6
7
-What's cooking in git.git (Nov 2012, #10; Thu, 29)
7
+What's cooking in git.git (Dec 2012, #01; Thu, 6)
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
-Hopefully 1.8.1-rc0 preview will be tagged this weekend. Many
15
-topics are marked to be cooked in 'next' during the feature freeze,
16
-but some topics in flight should be in 'master' before -rc1 happens.
17
-
14
You can find the changes described here in the integration branches of the
15
repositories listed at
16
@@ -23,204 +19,39 @@ repositories listed at
19
--------------------------------------------------
20
[New Topics]
21
26
-* wk/submodule-update-remote (2012-11-28) 2 commits
27
- - submodule add: If --branch is given, record it in .gitmodules
28
- - submodule update: add --remote for submodule's upstream changes
29
-
30
- Still under active discussion.
31
-
32
---------------------------------------------------
33
-[Graduated to "master"]
34
-
35
-* er/doc-add-new-commands (2012-11-26) 1 commit
36
- (merged to 'next' on 2012-11-28 at 2daf755)
37
- + Documentation: how to add a new command
38
-
39
-
40
-* fc/completion-test-simplification (2012-11-16) 6 commits
41
- (merged to 'next' on 2012-11-28 at b7b2f67)
42
- + completion: simplify __gitcomp() test helper
43
- + completion: refactor __gitcomp related tests
44
- + completion: consolidate test_completion*() tests
45
- + completion: simplify tests using test_completion_long()
46
- + completion: standardize final space marker in tests
47
- + completion: add comment for test_completion()
48
-
49
- Clean up completion tests. Use of conslidated helper may make
50
- instrumenting one particular test during debugging of the test
51
- itself, but I think that issue should be addressed in some other
52
- way (e.g. making sure individual tests in 9902 can be skipped).
53
-
54
-
55
-* fc/remote-hg (2012-11-27) 22 commits
56
- (merged to 'next' on 2012-11-28 at f805784)
57
- + remote-hg: fix for older versions of python
58
- + remote-hg: fix for files with spaces
59
- (merged to 'next' on 2012-11-18 at 4a4f2e4)
60
- + remote-hg: avoid bad refs
61
- + remote-hg: try the 'tip' if no checkout present
62
- + remote-hg: fix compatibility with older versions of hg
63
- + remote-hg: add missing config for basic tests
64
- + remote-hg: the author email can be null
65
- + remote-hg: add option to not track branches
66
- + remote-hg: add extra author test
67
- + remote-hg: add tests to compare with hg-git
68
- + remote-hg: add bidirectional tests
69
- + test-lib: avoid full path to store test results
70
- + remote-hg: add basic tests
71
- + remote-hg: fake bookmark when there's none
72
- + remote-hg: add compat for hg-git author fixes
73
- + remote-hg: add support for hg-git compat mode
74
- + remote-hg: match hg merge behavior
75
- + remote-hg: make sure the encoding is correct
76
- + remote-hg: add support to push URLs
77
- + remote-hg: add support for remote pushing
78
- + remote-hg: add support for pushing
79
- + Add new remote-hg transport helper
80
-
81
- New remote helper for hg.
82
-
83
-
84
-* fc/send-email-no-sender-prompt (2012-11-26) 1 commit
85
- (merged to 'next' on 2012-11-28 at 690d525)
86
- + send-email: avoid questions when user has an ident
87
- (this branch is used by jk/send-email-sender-prompt.)
88
-
89
- In cases the sender ident is sufficiently specified, there is no
90
- need to prompt the user before sending the series out.
91
-
92
-
93
-* fc/zsh-completion (2012-11-19) 2 commits
94
- (merged to 'next' on 2012-11-26 at 48ebdc9)
95
- + completion: start moving to the new zsh completion
96
- + completion: add new zsh completion
97
-
98
- Completion script revamped for zsh users.
99
-
100
-
101
-* jc/doc-push-satellite (2012-11-27) 1 commit
102
- (merged to 'next' on 2012-11-28 at 7114637)
103
- + Documentation/git-push.txt: clarify the "push from satellite" workflow
104
-
105
- Clarify what the example that pushes branches into remote-tracking
106
- branches of another repository is trying to achieve (i.e. emulating
107
- a fetch in reverse).
108
-
109
-
110
-* jk/pickaxe-textconv (2012-10-28) 2 commits
111
- (merged to 'next' on 2012-11-26 at 2c5b5c9)
112
- + pickaxe: use textconv for -S counting
113
- + pickaxe: hoist empty needle check
114
-
115
- Use textconv filters when searching with "log -S".
116
-
117
-
118
-* jk/send-email-sender-prompt (2012-11-28) 7 commits
119
- (merged to 'next' on 2012-11-28 at a808921)
120
- + t9001: check send-email behavior with implicit sender
121
- + Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt
122
- + t: add tests for "git var"
123
- + ident: keep separate "explicit" flags for author and committer
124
- + ident: make user_ident_explicitly_given static
125
- + t7502: factor out autoident prerequisite
126
- + test-lib: allow negation of prerequisites
127
- (this branch uses fc/send-email-no-sender-prompt.)
128
-
129
- General clean-ups in various areas, originally written to support a
130
- patch that later turned out to be unneeded.
131
-
132
-
133
-* jl/submodule-rm (2012-11-23) 1 commit
134
- (merged to 'next' on 2012-11-28 at 0e4115f)
135
- + Teach rm to remove submodules when given with a trailing '/'
136
-
137
- Finishing touches to "git rm $submodule" that removes the working
138
- tree of a submodule.
139
-
140
-
141
-* km/send-email-remove-cruft-in-address (2012-11-26) 5 commits
142
- (merged to 'next' on 2012-11-28 at 2688772)
143
- + git-send-email: allow edit invalid email address
144
- + git-send-email: ask what to do with an invalid email address
145
- + git-send-email: remove invalid addresses earlier
146
- + git-send-email: fix fallback code in extract_valid_address()
147
- + git-send-email: remove garbage after email address
148
-
149
- Garbage after e-mail address on Cc: in the patch breaks the
150
- transmission of it over send-email.
151
-
152
-
153
-* lt/diff-stat-show-0-lines (2012-11-27) 6 commits
154
- (merged to 'next' on 2012-11-28 at de89eed)
155
- + diff --shortstat: do not count "unmerged" entries
156
- + diff --stat: do not count "unmerged" entries
157
- + diff --stat: move the "total count" logic to the last loop
158
- + diff --stat: use "file" temporary variable to refer to data->files[i]
159
- + diff --stat: status of unmodified pair in diff-q is not zero
160
- + test: add failing tests for "diff --stat" to t4049
161
-
162
- "git diff --stat" miscounted the total number of changed lines when
163
- binary files were involved and hidden beyond --stat-count. It also
164
- miscounted the total number of changed files when there were
165
- unmerged paths.
166
-
167
-
168
-* mk/complete-tcsh (2012-11-27) 1 commit
169
- (merged to 'next' on 2012-11-28 at 5528439)
170
- + Support for git aliasing for tcsh completion
171
-
172
- Completion script revamped for tcsh users.
22
+* ef/mingw-tty-getpass (2012-12-04) 6 commits
23
+ - mingw: get rid of getpass implementation
24
+ - mingw: reuse tty-version of git_terminal_prompt
25
+ - compat/terminal: separate input and output handles
26
+ - compat/terminal: factor out echo-disabling
27
+ - mingw: make fgetc raise SIGINT if apropriate
28
+ - mingw: correct exit-code for SIGALRM's SIG_DFL
29
30
+ Update getpass() emulation for MinGW.
31
+ Will merge to 'next'.
32
175
-* mm/status-push-pull-advise (2012-11-16) 1 commit
176
- (merged to 'next' on 2012-11-26 at ed40d5e)
177
- + status: add advice on how to push/pull to tracking branch
33
179
- When "git checkout" checks out a branch, it tells the user how far
180
- behind (or ahead) the new branch is relative to the remote tracking
181
- branch it builds upon. The message now also advises how to sync
182
- them up by pushing or pulling.
34
+* jl/submodule-deinit (2012-12-04) 1 commit
35
+ - submodule: add 'deinit' command
36
37
+ There was no Porcelain way to say "I no longer am interested in
38
+ this submodule", once you express your interest in a submodule with
39
+ "submodule init". "submodule deinit" is the way to do so.
40
185
-* pp/gitweb-config-underscore (2012-11-21) 1 commit
186
- (merged to 'next' on 2012-11-28 at fc9bf5f)
187
- + gitweb: make remote_heads config setting work
41
+ Will merge to 'next'.
42
189
- The key "gitweb.remote_heads" is not legal git config; this maps it to
190
- "gitweb.remoteheads".
43
44
+* sl/git-svn-docs (2012-12-05) 4 commits
45
+ - git-svn: Note about tags.
46
+ - git-svn: Expand documentation for --follow-parent
47
+ - git-svn: Recommend use of structure options.
48
+ - git-svn: Document branches with at-sign(@).
49
193
-* pw/p4-various-fixes (2012-11-26) 6 commits
194
- (merged to 'next' on 2012-11-28 at 1a6f9a9)
195
- + git p4: remove unneeded cmd initialization
196
- + git p4: fix labelDetails typo in exception
197
- + git p4 test: display unresolvable host error
198
- + git p4: catch p4 errors when streaming file contents
199
- + git p4: handle servers without move support
200
- + git p4: catch p4 describe errors
50
+ Will merge to 'next'.
51
52
--------------------------------------------------
53
[Stalled]
54
205
-* pf/editor-ignore-sigint (2012-11-11) 5 commits
206
- - launch_editor: propagate SIGINT from editor to git
207
- - run-command: do not warn about child death by SIGINT
208
- - run-command: drop silent_exec_failure arg from wait_or_whine
209
- - launch_editor: ignore SIGINT while the editor has control
210
- - launch_editor: refactor to use start/finish_command
211
-
212
- Avoid confusing cases where the user hits Ctrl-C while in the editor
213
- session, not realizing git will receive the signal. Since most editors
214
- will take over the terminal and will block SIGINT, this is not likely
215
- to confuse anyone.
216
-
217
- Some people raised issues with emacsclient, which are addressed by this
218
- re-roll. It should probably also handle SIGQUIT, and there were a
219
- handful of other review comments.
220
-
221
- Expecting a re-roll.
222
-
223
-
55
* mo/cvs-server-updates (2012-10-16) 10 commits
56
- cvsserver Documentation: new cvs ... -r support
57
- cvsserver: add t9402 to test branch and tag refs
@@ -400,6 +231,21 @@ repositories listed at
231
--------------------------------------------------
232
[Cooking]
233
234
+* pf/editor-ignore-sigint (2012-12-02) 5 commits
235
+ - launch_editor: propagate signals from editor to git
236
+ - run-command: do not warn about child death from terminal
237
+ - launch_editor: ignore terminal signals while editor has control
238
+ - launch_editor: refactor to use start/finish_command
239
+ - run-command: drop silent_exec_failure arg from wait_or_whine
240
+
241
+ Avoid confusing cases where the user hits Ctrl-C while in the editor
242
+ session, not realizing git will receive the signal. Since most editors
243
+ will take over the terminal and will block SIGINT, this is not likely
244
+ to confuse anyone.
245
+
246
+ Will merge to 'next'.
247
+
248
+
249
* bc/append-signed-off-by (2012-11-26) 11 commits
250
- Unify appending signoff in format-patch, commit and sequencer
251
- format-patch: update append_signoff prototype
@@ -416,27 +262,29 @@ repositories listed at
262
Expecting a re-roll after a review.
263
264
419
-* mh/unify-xml-in-imap-send-and-http-push (2012-11-29) 8 commits
420
- - wrap_in_html(): process message in bulk rather than line-by-line
421
- - wrap_in_html(): use strbuf_addstr_xml_quoted()
422
- - imap-send: change msg_data from storing (ptr, len) to storing strbuf
423
- - imap-send: correctly report errors reading from stdin
424
- - imap-send: store all_msgs as a strbuf
425
- - lf_to_crlf(): NUL-terminate msg_data::data
426
- - xml_entities(): use function strbuf_addstr_xml_quoted()
427
- - Add new function strbuf_add_xml_quoted()
265
+* mh/unify-xml-in-imap-send-and-http-push (2012-12-02) 8 commits
266
+ (merged to 'next' on 2012-12-03 at d677090)
267
+ + wrap_in_html(): process message in bulk rather than line-by-line
268
+ + wrap_in_html(): use strbuf_addstr_xml_quoted()
269
+ + imap-send: change msg_data from storing (ptr, len) to storing strbuf
270
+ + imap-send: correctly report errors reading from stdin
271
+ + imap-send: store all_msgs as a strbuf
272
+ + lf_to_crlf(): NUL-terminate msg_data::data
273
+ + xml_entities(): use function strbuf_addstr_xml_quoted()
274
+ + Add new function strbuf_add_xml_quoted()
275
429
- Will merge to 'next'.
276
+ Update imap-send to reuse xml quoting code from http-push codepath,
277
+ clean up some code, and fix a small bug.
278
279
432
-* rr/t4041-cleanup (2012-11-27) 4 commits
433
- - t4041 (diff-submodule-option): modernize style
434
- - t4041 (diff-submodule-option): rewrite add_file() routine
435
- - t4041 (diff-submodule-option): parse digests sensibly
436
- - t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
280
+* rr/t4041-cleanup (2012-12-02) 4 commits
281
+ (merged to 'next' on 2012-12-04 at ecee35d)
282
+ + t4041 (diff-submodule-option): modernize style
283
+ + t4041 (diff-submodule-option): rewrite add_file() routine
284
+ + t4041 (diff-submodule-option): parse digests sensibly
285
+ + t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
286
438
- As a clean-up, it still misses some.
439
- Expecting a re-roll.
287
+ Test clean-up.
288
289
290
* jc/doc-maintainer (2012-11-27) 1 commit
@@ -507,24 +355,25 @@ repositories listed at
355
Will cook in 'next'.
356
357
510
-* fc/fast-export-fixes (2012-11-29) 15 commits
511
- - fast-export: make sure updated refs get updated
512
- - fast-export: don't handle uninteresting refs
513
- - fast-export: fix comparison in tests
514
- - fast-export: trivial cleanup
515
- - remote-testgit: implement the "done" feature manually
516
- - remote-testgit: report success after an import
517
- - remote-testgit: exercise more features
518
- - remote-testgit: cleanup tests
519
- - remote-testgit: remove irrelevant test
520
- - remote-testgit: remove non-local functionality
521
- - Add new simplified git-remote-testgit
522
- - Rename git-remote-testgit to git-remote-testpy
523
- - remote-helpers: fix failure message
524
- - remote-testgit: fix direction of marks
525
- - fast-export: avoid importing blob marks
358
+* fc/fast-export-fixes (2012-12-03) 15 commits
359
+ (merged to 'next' on 2012-12-03 at f9df523)
360
+ + fast-export: make sure updated refs get updated
361
+ + fast-export: don't handle uninteresting refs
362
+ + fast-export: fix comparison in tests
363
+ + fast-export: trivial cleanup
364
+ + remote-testgit: implement the "done" feature manually
365
+ + remote-testgit: report success after an import
366
+ + remote-testgit: exercise more features
367
+ + remote-testgit: cleanup tests
368
+ + remote-testgit: remove irrelevant test
369
+ + remote-testgit: remove non-local functionality
370
+ + Add new simplified git-remote-testgit
371
+ + Rename git-remote-testgit to git-remote-testpy
372
+ + remote-helpers: fix failure message
373
+ + remote-testgit: fix direction of marks
374
+ + fast-export: avoid importing blob marks
375
527
- Will merge to (and cook in) 'next'.
376
+ Will cook in 'next'.
377
378
379
* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
@@ -539,12 +388,13 @@ repositories listed at
388
389
390
* nd/pathspec-wildcard (2012-11-26) 4 commits
542
- - tree_entry_interesting: do basedir compare on wildcard patterns when possible
543
- - pathspec: apply "*.c" optimization from exclude
544
- - pathspec: do exact comparison on the leading non-wildcard part
545
- - pathspec: save the non-wildcard length part
391
+ (merged to 'next' on 2012-12-03 at eca0fcb)
392
+ + tree_entry_interesting: do basedir compare on wildcard patterns when possible
393
+ + pathspec: apply "*.c" optimization from exclude
394
+ + pathspec: do exact comparison on the leading non-wildcard part
395
+ + pathspec: save the non-wildcard length part
396
547
- Will merge to 'next'.
397
+ Will cook in 'next'.
398
399
400
* nd/wildmatch (2012-11-20) 14 commits
@@ -593,43 +443,17 @@ repositories listed at
443
for 'next'.
444
445
596
-* cr/push-force-tag-update (2012-11-26) 7 commits
597
- - push: clarify rejection of update to non-commit-ish
598
- - push: require force for annotated tags
599
- - push: require force for refs under refs/tags/
600
- - push: flag updates that require force
601
- - push: keep track of "update" state separately
602
- - push: add advice for rejected tag reference
603
- - push: return reject reasons via a mask
446
+* cr/push-force-tag-update (2012-12-03) 10 commits
447
+ (merged to 'next' on 2012-12-04 at af2e3a9)
448
+ + push: allow already-exists advice to be disabled
449
+ + push: rename config variable for more general use
450
+ + push: cleanup push rules comment
451
+ + push: clarify rejection of update to non-commit-ish
452
+ + push: require force for annotated tags
453
+ + push: require force for refs under refs/tags/
454
+ + push: flag updates that require force
455
+ + push: keep track of "update" state separately
456
+ + push: add advice for rejected tag reference
457
+ + push: return reject reasons as a bitset
458
459
Require "-f" for push to update a tag, even if it is a fast-forward.
606
-
607
- With a minor tweak, I think this is getting ready for 'next'.
608
- Expecting a re-roll.
609
-
610
---------------------------------------------------
611
-[Discarded]
612
-
613
-* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit
614
- . Unify appending signoff in format-patch, commit and sequencer
615
-
616
- I am not sure if the logic to refrain from adding a sign-off based
617
- on the existing run of sign-offs is done correctly in this change.
618
-
619
- Brandon's series attempts the same thing and seemed to be more
620
- cleanly done.
621
-
622
-
623
-* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits
624
- . pretty: support %>> that steal trailing spaces
625
- . pretty: support truncating in %>, %< and %><
626
- . pretty: support padding placeholders, %< %> and %><
627
- . pretty: two phase conversion for non utf-8 commits
628
- . utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
629
- . utf8.c: move display_mode_esc_sequence_len() for use by other functions
630
- . pretty: support %C(auto[,N]) to turn on coloring on next placeholder(s)
631
- . pretty: split parsing %C into a separate function
632
- . pretty: share code between format_decoration and show_decorations
633
-
634
- This causes warnings with -Wuninitialized, so I've ejected it from pu
635
- for the time being.