What's cooking (2012/12 #02)
Junio C Hamano committed
Dec 10, 2012 at 15:09 UTC
d65980c8006cc517a86a6e568b62e4f4c7903b70
1 file changed
+130
-65
whats-cooking.txt
+130
-65
@@ -1,16 +1,22 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2012, #01; Thu, 6)
4
-X-master-at: fb4c62235fee8008d99ef55c4adcb1f7ea9508a3
5
-X-next-at: af2e3a9095a73e8f4f0dea403998204b8ff7dee1
3
+Subject: What's cooking in git.git (Dec 2012, #02; Mon, 10)
4
+X-master-at: 7e0651a6302b50db4bac1e65da61c4036cc64d2a
5
+X-next-at: ec797b35843d725053c28368548623cc5e602814
6
7
-What's cooking in git.git (Dec 2012, #01; Thu, 6)
7
+What's cooking in git.git (Dec 2012, #02; Mon, 10)
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
+A new maintenance release 1.8.0.2 was tagged with accumulated fixes
15
+we have already been using on the 'master' front for a while. The
16
+tip of the 'master' is a bit beyond 1.8.1-rc1 and many topics are
17
+getting into good shape in 'next', hopefully ready to be merged soon
18
+after the 1.8.1 final.
19
+
20
You can find the changes described here in the integration branches of the
21
repositories listed at
22
@@ -19,40 +25,85 @@ repositories listed at
25
--------------------------------------------------
26
[New Topics]
27
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
28
+* ef/mingw-rmdir (2012-12-10) 1 commit
29
+ - mingw_rmdir: do not prompt for retry when non-empty
30
30
- Update getpass() emulation for MinGW.
31
- Will merge to 'next'.
31
+ MinGW has a workaround when rmdir unnecessarily fails to retry with
32
+ a prompt, but the logic was kicking in when the rmdir failed with
33
+ ENOTEMPTY, i.e. was expected to fail and there is no point retrying.
34
35
+ Will fast-track to 'master'.
36
34
-* jl/submodule-deinit (2012-12-04) 1 commit
35
- - submodule: add 'deinit' command
37
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.
38
+* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
39
+ - sh-setup: work around "unset IFS" bug in some shells
40
41
Will merge to 'next'.
42
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(@).
44
+* jc/merge-blobs (2012-12-09) 4 commits
45
+ - merge-tree: add comments to clarify what these functions are doing
46
+ - merge-tree: lose unused "resolve_directories"
47
+ - merge-tree: lose unused "flags" from merge_list
48
+ - Which merge_file() function do you mean?
49
50
- Will merge to 'next'.
50
+ A beginning of a new merge strategy based on the disused merge-tree
51
+ proof-of-concept code.
52
+
53
+
54
+* jc/same-encoding (2012-12-10) 1 commit
55
+ - format_commit_message(): simplify calls to logmsg_reencode()
56
+
57
+ Finishing touches to the series to unify "Do we need to reencode
58
+ between these two encodings?" logic.
59
+
60
+
61
+* nd/invalidate-i-t-a-cache-tree (2012-12-09) 1 commit
62
+ - cache-tree: invalidate i-t-a paths after generating trees
63
+
64
+ Writing out a tree object when you still have intent-to-add entries
65
+ in the index left an incorrect cache-tree data there.
66
+
67
+--------------------------------------------------
68
+[Graduated to "master"]
69
+
70
+* rr/t4041-cleanup (2012-12-02) 4 commits
71
+ (merged to 'next' on 2012-12-04 at ecee35d)
72
+ + t4041 (diff-submodule-option): modernize style
73
+ + t4041 (diff-submodule-option): rewrite add_file() routine
74
+ + t4041 (diff-submodule-option): parse digests sensibly
75
+ + t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
76
+
77
+ Test clean-up.
78
79
--------------------------------------------------
80
[Stalled]
81
55
-* mo/cvs-server-updates (2012-10-16) 10 commits
82
+* fc/remote-bzr (2012-11-28) 10 commits
83
+ - (fixup) test-bzr.sh: fix multi-line string assignment
84
+ - remote-bzr: detect local repositories
85
+ - remote-bzr: add support for older versions of bzr
86
+ - remote-bzr: add support to push special modes
87
+ - remote-bzr: add support for fecthing special modes
88
+ - remote-bzr: add simple tests
89
+ - remote-bzr: update working tree
90
+ - remote-bzr: add support for remote repositories
91
+ - remote-bzr: add support for pushing
92
+ - Add new remote-bzr transport helper
93
+
94
+ New remote helper for bzr (v3). With minor fixes, this may be ready
95
+ for 'next'.
96
+
97
+
98
+* mo/cvs-server-updates (2012-12-09) 18 commits
99
+ - t9402: Use TABs for indentation
100
+ - t9402: Rename check.cvsCount and check.list
101
+ - t9402: Simplify git ls-tree
102
+ - t9402: Add missing &&; Code style
103
+ - t9402: No space after IO-redirection
104
+ - t9402: Dont use test_must_fail cvs
105
+ - t9402: improve check_end_tree() and check_end_full_tree()
106
+ - t9402: sed -i is not portable
107
- cvsserver Documentation: new cvs ... -r support
108
- cvsserver: add t9402 to test branch and tag refs
109
- cvsserver: support -r and sticky tags for most operations
@@ -231,19 +282,55 @@ repositories listed at
282
--------------------------------------------------
283
[Cooking]
284
285
+* ef/mingw-tty-getpass (2012-12-04) 6 commits
286
+ (merged to 'next' on 2012-12-07 at 1737ff1)
287
+ + mingw: get rid of getpass implementation
288
+ + mingw: reuse tty-version of git_terminal_prompt
289
+ + compat/terminal: separate input and output handles
290
+ + compat/terminal: factor out echo-disabling
291
+ + mingw: make fgetc raise SIGINT if apropriate
292
+ + mingw: correct exit-code for SIGALRM's SIG_DFL
293
+
294
+ Update getpass() emulation for MinGW.
295
+
296
+ Will fast-track to 'master'.
297
+
298
+
299
+* jl/submodule-deinit (2012-12-04) 1 commit
300
+ (merged to 'next' on 2012-12-07 at ea772f0)
301
+ + submodule: add 'deinit' command
302
+
303
+ There was no Porcelain way to say "I no longer am interested in
304
+ this submodule", once you express your interest in a submodule with
305
+ "submodule init". "submodule deinit" is the way to do so.
306
+
307
+ Will cook in 'next'.
308
+
309
+
310
+* sl/git-svn-docs (2012-12-05) 4 commits
311
+ (merged to 'next' on 2012-12-07 at 5bfbb73)
312
+ + git-svn: Note about tags.
313
+ + git-svn: Expand documentation for --follow-parent
314
+ + git-svn: Recommend use of structure options.
315
+ + git-svn: Document branches with at-sign(@).
316
+
317
+ Will cook in 'next'.
318
+
319
+
320
* 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
321
+ (merged to 'next' on 2012-12-07 at 6b04419)
322
+ + launch_editor: propagate signals from editor to git
323
+ + run-command: do not warn about child death from terminal
324
+ + launch_editor: ignore terminal signals while editor has control
325
+ + launch_editor: refactor to use start/finish_command
326
+ + run-command: drop silent_exec_failure arg from wait_or_whine
327
328
Avoid confusing cases where the user hits Ctrl-C while in the editor
329
session, not realizing git will receive the signal. Since most editors
330
will take over the terminal and will block SIGINT, this is not likely
331
to confuse anyone.
332
246
- Will merge to 'next'.
333
+ Will cook in 'next'.
334
335
336
* bc/append-signed-off-by (2012-11-26) 11 commits
@@ -276,15 +363,7 @@ repositories listed at
363
Update imap-send to reuse xml quoting code from http-push codepath,
364
clean up some code, and fix a small bug.
365
279
-
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
-
287
- Test clean-up.
366
+ Will cook in 'next'.
367
368
369
* jc/doc-maintainer (2012-11-27) 1 commit
@@ -301,16 +380,16 @@ repositories listed at
380
Will cook in 'next'.
381
382
304
-* mh/doc-remote-helpers (2012-11-27) 6 commits
305
- - git-remote-helpers.txt: clarify options & ref list attributes
306
- - git-remote-helpers.txt: clarify command <-> capability correspondences
307
- - git-remote-helpers.txt: rearrange description of capabilities
308
- - git-remote-helpers.txt: minor grammar fix
309
- - git-remote-helpers.txt: document missing capabilities
310
- - git-remote-helpers.txt: document invocation before input format
383
+* mh/doc-remote-helpers (2012-12-07) 6 commits
384
+ (merged to 'next' on 2012-12-07 at 7ac8c25)
385
+ + git-remote-helpers.txt: clarify options & ref list attributes
386
+ + git-remote-helpers.txt: clarify command <-> capability correspondences
387
+ + git-remote-helpers.txt: rearrange description of capabilities
388
+ + git-remote-helpers.txt: minor grammar fix
389
+ + git-remote-helpers.txt: document missing capabilities
390
+ + git-remote-helpers.txt: document invocation before input format
391
312
- Need comment and Ack from people who have worked on remote-helpers
313
- before this goes forward.
392
+ Will cook in 'next'.
393
394
395
* mh/pthreads-autoconf (2012-11-27) 1 commit
@@ -427,22 +506,6 @@ repositories listed at
506
Will cook in 'next'.
507
508
430
-* fc/remote-bzr (2012-11-28) 10 commits
431
- - (fixup) test-bzr.sh: fix multi-line string assignment
432
- - remote-bzr: detect local repositories
433
- - remote-bzr: add support for older versions of bzr
434
- - remote-bzr: add support to push special modes
435
- - remote-bzr: add support for fecthing special modes
436
- - remote-bzr: add simple tests
437
- - remote-bzr: update working tree
438
- - remote-bzr: add support for remote repositories
439
- - remote-bzr: add support for pushing
440
- - Add new remote-bzr transport helper
441
-
442
- New remote helper for bzr (v3). With minor fixes, this may be ready
443
- for 'next'.
444
-
445
-
509
* cr/push-force-tag-update (2012-12-03) 10 commits
510
(merged to 'next' on 2012-12-04 at af2e3a9)
511
+ push: allow already-exists advice to be disabled
@@ -457,3 +520,5 @@ repositories listed at
520
+ push: return reject reasons as a bitset
521
522
Require "-f" for push to update a tag, even if it is a fast-forward.
523
+
524
+ Will cook in 'next'.