What's cooking (2009/12 #04)
Junio C Hamano committed
Dec 9, 2009 at 16:35 UTC
1dbdbcba2d68165ed37ebcaf3061e6b97677e4c2
1 file changed
+79
-50
whats-cooking.txt
+79
-50
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2009, #03; Tue, 08)
3
-X-master-at: f9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d
4
-X-next-at: 3c2c08adfbff17e13665b5151a337380f57275d8
2
+Subject: What's cooking in git.git (Dec 2009, #04; Wed, 09)
3
+X-master-at: 80d93611c55fec171e0d9aba98db079952f9d7aa
4
+X-next-at: 245e2a65f71e0255a90a3c45ea82bcdd19f85eff
5
6
-What's cooking in git.git (Dec 2009, #03; Tue, 08)
6
+What's cooking in git.git (Dec 2009, #04; Wed, 09)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,45 +12,41 @@ marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
--------------------------------------------------
15
-[New Topics]
15
+[Graduated to "master"]
16
17
-* bg/maint-add-all-doc (2009-12-07) 4 commits.
18
- - squash! rm documentation--also mention add-u where we mention commit-a
19
- - git-rm doc: Describe how to sync index & work tree
20
- - git-add/rm doc: Consistently back-quote
21
- - Documentation: 'git add -A' can remove files
17
+* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.
18
+ (merged to 'next' on 2009-12-08 at 3c2c08a)
19
+ + add-interactive: fix deletion of non-empty files
20
23
-I didn't like the existing documentation for "add -u" myself (especially
24
-because I wrote the initial version) and this neatly fix it as well.
21
+Fixes a regression in 1.6.5.3.
22
26
-* il/vcs-helper (2009-12-06) 8 commits
27
- - Remove special casing of http, https and ftp
28
- - Support remote archive from external protocol helpers
29
- - Support remote helpers implementing smart transports
30
- - Support taking over transports
31
- - Refactor git transport options parsing
32
- - Pass unknown protocols to external protocol handlers
33
- - Support mandatory capabilities
34
- - Add remote helper debug mode
35
- (this branch is related to sr/vcs-helper.)
23
+* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
24
+ (merged to 'next' on 2009-12-03 at 2ced03c)
25
+ + pull: clarify advice for the unconfigured error case
26
37
-Under active discussion and review; another round expected.
27
+Replaces old 'jn/rfc-pull-rebase-error-message' topic.
28
39
-* jh/commit-status (2009-12-07) 1 commit
40
- - [test?] Add commit.status, --status, and --no-status
29
+--------------------------------------------------
30
+[New Topics]
31
42
-* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.
43
- (merged to 'next' on 2009-12-08 at 3c2c08a)
44
- + add-interactive: fix deletion of non-empty files
32
+* cc/reset-more (2009-12-08) 6 commits
33
+ - Documentation: reset: add some tables to describe the different options
34
+ - Documentation: reset: describe new "--keep-local-changes" option
35
+ - reset: add test cases for "--keep-local-changes" option
36
+ - reset: add option "--keep-local-changes" to "git reset"
37
+ - reset: use "unpack_trees()" directly instead of "git read-tree"
38
+ - reset: add a few tests for "git reset --merge"
39
46
-Fixes a regression in 1.6.5.3.
40
+The documentation is much clearer than the previous round in describing
41
+what it does, but I find it a bit unclear in describing what it is _good_
42
+for (iow, scenarios and use cases).
43
48
-* mm/diag-path-in-treeish (2009-12-07) 1 commit
49
- - Detailed diagnosis when parsing an object name fails.
44
+Breaks 'pu' and does not pass test on its own yet.
45
51
-* ns/rebase-auto-squash (2009-12-08) 1 commit
52
- - rebase -i --autosquash: auto-squash commits
53
- (this branch uses mh/rebase-fixup.)
46
+* tr/http-push-ref-status (2009-12-08) 3 commits
47
+ - transport-helper.c::push_refs(): emit "no refs" error message
48
+ - transport.c::transport_push(): make ref status affect return value
49
+ - refactor ref status logic for pushing
50
51
--------------------------------------------------
52
[Stalled]
@@ -97,16 +93,42 @@ This has some stupid bugs and reverted from 'next' until I can fix it, but
93
the "temporarily" turned out to be very loooong. Sigh. We won't have a
94
proper fix in 1.6.6.
95
100
-* jc/grep-full-tree (2009-11-24) 1 commit.
101
- - grep: --full-tree
102
-
103
-The interaction with this option and pathspecs need to be worked out
104
-better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
105
-all the header files in the tree, for example.
106
-
96
--------------------------------------------------
97
[Cooking]
98
99
+* bg/maint-add-all-doc (2009-12-07) 4 commits.
100
+ - squash! rm documentation--also mention add-u where we mention commit-a
101
+ - git-rm doc: Describe how to sync index & work tree
102
+ - git-add/rm doc: Consistently back-quote
103
+ - Documentation: 'git add -A' can remove files
104
+
105
+I didn't like the existing documentation for "add -u" myself (especially
106
+because I wrote the initial version) and this neatly fix it as well.
107
+
108
+* il/vcs-helper (2009-12-09) 8 commits
109
+ - Remove special casing of http, https and ftp
110
+ - Support remote archive from all smart transports
111
+ - Support remote helpers implementing smart transports
112
+ - Support taking over transports
113
+ - Refactor git transport options parsing
114
+ - Pass unknown protocols to external protocol handlers
115
+ - Support mandatory capabilities
116
+ - Add remote helper debug mode
117
+ (this branch uses early parts of sr/vcs-helper.)
118
+
119
+Yet another round.
120
+
121
+* jh/commit-status (2009-12-07) 1 commit
122
+ - [test?] Add commit.status, --status, and --no-status
123
+
124
+* mm/diag-path-in-treeish (2009-12-07) 1 commit
125
+ - Detailed diagnosis when parsing an object name fails.
126
+
127
+* ns/rebase-auto-squash (2009-12-08) 2 commits
128
+ - fixup! rebase -i --autosquash
129
+ - rebase -i --autosquash: auto-squash commits
130
+ (this branch uses mh/rebase-fixup.)
131
+
132
* jh/notes (2009-12-07) 11 commits
133
- Refactor notes concatenation into a flexible interface for combining notes
134
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
@@ -122,12 +144,6 @@ all the header files in the tree, for example.
144
145
Rerolled and under discussion.
146
125
-* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
126
- (merged to 'next' on 2009-12-03 at 2ced03c)
127
- + pull: clarify advice for the unconfigured error case
128
-
129
-Replaces old 'jn/rfc-pull-rebase-error-message' topic.
130
-
147
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
148
- General --quiet improvements
149
@@ -209,7 +225,7 @@ Comments?
225
+ Use a function to determine whether a remote is valid
226
+ Allow programs to not depend on remotes having urls
227
+ Fix memory leak in helper method for disconnect
212
- (this branch is related to il/vcs-helper.)
228
+ (this branch shares commits with il/vcs-helper.)
229
230
Should be among the first to graduate after 1.6.6 final.
231
@@ -254,7 +270,10 @@ Fix-up expected.
270
--------------------------------------------------
271
[For 1.7.0]
272
257
-* jk/1.7.0-status (2009-12-07) 11 commits.
273
+* jk/1.7.0-status (2009-12-08) 13 commits.
274
+ (merged to 'next' on 2009-12-08 at 9b57d84)
275
+ + t7508-status: test all modes with color
276
+ + t7508-status: status --porcelain ignores relative paths setting
277
(merged to 'next' on 2009-12-07 at 7723acf)
278
+ status: reduce duplicated setup code
279
+ status: disable color for porcelain format
@@ -278,7 +297,7 @@ is similar to that of post 1.7.0 "git status".
297
298
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
299
few commits at the tip, as "docs: affects only long format" describes a
281
-limitation that will disappear soon.
300
+limitation that has disappeared.
301
302
* jc/1.7.0-status (2009-09-05) 4 commits.
303
(merged to 'next' on 2009-10-11 at 9558627)
@@ -358,3 +377,13 @@ fix from Ramsay is already in 'master'.
377
378
Reverted out of 'next', to be replaced with jn/faster-completion-startup
379
topic.
380
+
381
+--------------------------------------------------
382
+[Haven't been purged from 'pu' yet]
383
+
384
+* jc/grep-full-tree (2009-11-24) 1 commit.
385
+ - grep: --full-tree
386
+
387
+The interaction with this option and pathspecs need to be worked out
388
+better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
389
+all the header files in the tree, for example.