What's cooking (2008/12 #04)
Junio C Hamano committed
Jan 5, 2009 at 21:21 UTC
cb4ead20c84aa5a0480f7759497e0f72d9ec64f4
1 file changed
+133
-149
whats-cooking.txt
+133
-149
@@ -1,12 +1,9 @@
1
To: git@vger.kernel.org
2
-cc: Johannes Sixt <j6t@kdbg.org>,
3
- Johannes Schindelin <Johannes.Schindelin@gmx.de>,
4
- "Simon Schubert" <corecode@fs.ei.tum.de>
5
-Subject: What's cooking in git.git (Dec 2008, #03; Sun, 21)
6
-X-master-at: b3eae84dc10e452add0e79c7373ceee16f73f7f0
7
-X-next-at: 43db18a982c1bdb5d2c1849c429ae3a456b8a51e
8
-
9
-What's cooking in git.git (Dec 2008, #03; Sun, 21)
2
+Subject: What's cooking in git.git (Dec 2008, #04; Mon, 29)
3
+X-master-at: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf
4
+X-next-at: 6f67462436796045e0656107418221a6696bd5f2
5
+
6
+What's cooking in git.git (Dec 2008, #04; Mon, 29)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed
@@ -17,25 +14,87 @@ but I am still holding onto them.
14
The topics list the commits in reverse chronological order. The topics
15
meant to be merged to the maintenance series have "maint-" in their names.
16
20
-As we have already passed -rc3, things queued in 'next' let alone 'pu' are
21
-unlikely to be merged to 'master' by the end of year unless otherwise
22
-noted.
23
-
17
----------------------------------------------------------------
18
[New Topics]
19
20
+* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
21
+ - grep: grep cache entries if they are "assume unchanged"
22
+ - grep: support --no-ext-grep to test builtin grep
23
+
24
+* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit
25
+ + diff: add option to show context between close hunks
26
+
27
+* as/maint-shortlog-cleanup (Wed Dec 24 17:34:44 2008 +0100) 2 commits
28
+ - builtin-shortlog.c: do not unnecessarily strdup before insertion
29
+ in list
30
+ - builtin-shortlog.c: use string_list_append() instead of
31
+ duplicating its code
32
+
33
+* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit
34
+ + merge-recursive: mark rename/delete conflict as unmerged
35
+
36
+* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit
37
+ + http-push: support full URI in handle_remote_ls_ctx()
38
+
39
+* jc/maint-ls-tree (Thu Dec 25 16:54:23 2008 -0800) 1 commit
40
+ + ls-tree: add --full-tree option
41
+
42
+* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit
43
+ + doc/git-send-email: mention sendemail.cc config variable
44
+
45
+----------------------------------------------------------------
46
+[Stalled and may need help and prodding to go forward]
47
+
48
+* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
49
+ . In add --patch, Handle K,k,J,j slightly more gracefully.
50
+ . Add / command in add --patch
51
+ . git-add -i/-p: Change prompt separater from slash to comma
52
+
53
+I am still holding onto this earlier topic to add '/' subcommand to allow
54
+finding a hunk with given text, but I'd rather not merge/rebase it on top
55
+of wp/add-p-goto series myself. Waiting for a reroll.
56
+
57
+* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
58
+ . git-am: Pass the --directory option through to git-apply
59
+
60
+A reroll of this by Simon Schubert triggered a series to fix a parameter
61
+propagation bug, and another reroll to add "git am --directory=path/"
62
+should be much easier now. I am not likely to use the feature myself, so
63
+it is up to intrested volunteers to carry it forward.
64
+
65
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
66
+ - autoconf: Enable threaded delta search when pthreads are supported
67
+
68
+This automatically enables threaded delta search code when autoconf
69
+detects pthreads are usable. I haven't heard neither positive nor
70
+negative comments from minority platforms that might be harmed.
71
+
72
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
73
+ + blame: show "previous" information in --porcelain/--incremental
74
+ format
75
+ + git-blame: refactor code to emit "porcelain format" output
76
+
77
+This gives Porcelains (like gitweb) the information on the commit _before_
78
+the one that the final blame is laid on, which should save them one
79
+rev-parse to dig further. The line number in the "previous" information
80
+may need refining, and sanity checking code for reference counting may
81
+need to be resurrected before this can move forward.
82
+
83
+----------------------------------------------------------------
84
+[Actively cooking]
85
+
86
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
87
- gitweb: unify boolean feature subroutines
88
89
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
31
- - Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
90
+ + Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
91
recursive-fix
33
- - merge-recursive: do not clobber untracked working tree garbage
34
- - modify/delete conflict resolution overwrites untracked file
92
+ + merge-recursive: do not clobber untracked working tree garbage
93
+ + modify/delete conflict resolution overwrites untracked file
94
95
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
37
- - merge-recursive: do not clobber untracked working tree garbage
38
- - modify/delete conflict resolution overwrites untracked file
96
+ + merge-recursive: do not clobber untracked working tree garbage
97
+ + modify/delete conflict resolution overwrites untracked file
98
99
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
100
- Add an expensive test for git-notes
@@ -43,16 +102,6 @@ noted.
102
- Add a script to edit/inspect notes
103
- Introduce commit notes
104
46
-* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits
47
- - rebase -i -p: Fix --continue after a merge could not be redone
48
- - Show a failure of rebase -p if the merge had a conflict
49
-
50
-I am undecided whether I should include these in 1.6.1 and have been
51
-waiting for comments from Dscho.
52
-
53
-----------------------------------------------------------------
54
-[Post 1.6.1 items]
55
-
105
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
106
+ Add 'g' command to go to a hunk
107
+ Add subroutine to display one-line summary of hunks
@@ -62,20 +111,14 @@ waiting for comments from Dscho.
111
- gitweb: A bit of code cleanup in git_blame()
112
- gitweb: Move 'lineno' id from link to row element in git_blame
113
65
-I've briefly looked at the resurrection of Ajaxy blame that comes on top
66
-of this series and it looked promising.
114
+Jakub seemed to feel they are not yet ready.
115
116
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
69
- - Add support for a pdf version of the user manual
117
+ + Add support for a pdf version of the user manual
118
119
I do not have a new enough combination of dblatex and asciidoc myself but
120
this may help interested people.
121
74
-* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits
75
- + Force t5302 to use a single thread
76
- + pack-objects: don't use too many threads with few objects
77
- + autodetect number of CPUs by default when using threads
78
-
122
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
123
- gitweb: Optional grouping of projects by category
124
- gitweb: Split git_project_list_body in two functions
@@ -87,60 +130,76 @@ this may help interested people.
130
- gitweb: change call pattern for git_commitdiff
131
- gitweb: add patch view
132
90
-Updated series.
133
+----------------------------------------------------------------
134
+[Graduated to "master"]
135
+
136
+* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits
137
+ + rebase -i -p: Fix --continue after a merge could not be redone
138
+ + Show a failure of rebase -p if the merge had a conflict
139
+
140
+* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits
141
+ + Force t5302 to use a single thread
142
+ + pack-objects: don't use too many threads with few objects
143
+ + autodetect number of CPUs by default when using threads
144
145
* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
146
+ Document "git-reset --merge"
147
+ Add 'merge' mode to 'git reset'
148
96
-* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
97
- . In add --patch, Handle K,k,J,j slightly more gracefully.
98
- . Add / command in add --patch
99
- . git-add -i/-p: Change prompt separater from slash to comma
100
-
101
-I am still holding onto this earlier topic to add '/' subcommand to allow
102
-finding a hunk with given text, but I'd rather not merge/rebase it on top
103
-of wp/add-p-goto series myself. Waiting for a reroll.
104
-
105
-* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
106
- - mergetool: Don't keep temporary merge files unless told to
107
- - mergetool: Add prompt to continue after failing to merge a file
108
- - Add -y/--no-prompt option to mergetool
109
- - Fix some tab/space inconsistencies in git-mergetool.sh
110
-
111
-Updated series. Waiting for comments from the original author (Ted) and
112
-other interested parties.
113
-
114
-----------------------------------------------------------------
115
-[Graduated to "master"]
116
-
117
-Nothing cooking was "not so trivial but want to have in final".
118
-
149
----------------------------------------------------------------
150
[Will merge to "master" soon]
151
122
-What are you looking for? We are in -rc ;-)
152
+* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
153
+ + mergetool: Don't keep temporary merge files unless told to
154
+ + mergetool: Add prompt to continue after failing to merge a file
155
+ + Add -y/--no-prompt option to mergetool
156
+ + Fix some tab/space inconsistencies in git-mergetool.sh
157
+
158
+I have been waiting for comments from the original author and other
159
+interested parties, but haven't heard anything yet. This tool is on the
160
+fringe from my point of view anyway, so I'll push them out to 'master'
161
+soon. If there is a breakage that annoys real people, we will hear from
162
+them, and we can take it from there.
163
164
----------------------------------------------------------------
165
[On Hold]
166
127
-* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
128
- . git-am: Pass the --directory option through to git-apply
129
-
130
-A reroll of this by Simon Schubert triggered a series to fix a parameter
131
-propagation bug, and another reroll to add "git am --directory=path/"
132
-should be much easier now. I am not likely to use the feature myself, so
133
-it is up to intrested volunteers to carry it forward.
167
+* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
168
+ - wt-status: show sparse checkout info
169
+ - Introduce default sparse patterns (core.defaultsparse)
170
+ - checkout: add new options to support sparse checkout
171
+ - clone: support sparse checkout with --sparse-checkout option
172
+ - unpack_trees(): add support for sparse checkout
173
+ - unpack_trees(): keep track of unmerged entries
174
+ - Introduce "sparse patterns"
175
+ - Merge branch 'master' into nd/narrow
176
+ - t2104: touch portability fix
177
+ - grep: skip files outside sparse checkout area
178
+ - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
179
+ - Prevent diff machinery from examining worktree outside sparse
180
+ checkout
181
+ - ls-files: Add tests for --sparse and friends
182
+ - update-index: add --checkout/--no-checkout to update
183
+ CE_NO_CHECKOUT bit
184
+ - update-index: refactor mark_valid() in preparation for new options
185
+ - ls-files: add options to support sparse checkout
186
+ - Introduce CE_NO_CHECKOUT bit
187
135
-* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
136
- + blame: show "previous" information in --porcelain/--incremental
137
- format
138
- + git-blame: refactor code to emit "porcelain format" output
188
+Kicked out of 'next' by popular demand (see recent discussion on the
189
+interaction between the checkout area and commands such as "grep").
190
140
-* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
141
- - autoconf: Enable threaded delta search when pthreads are supported
191
+* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
192
+ - clone: test the new HEAD detection logic
193
+ - Merge commit 'HEAD@{2}' into HEAD
194
+ - upload-pack: send the HEAD information
195
+ - clone: find the current branch more explicitly
196
+ - connect.c::read_extra_info(): find where HEAD points at
197
+ - connect.c::read_extra_info(): prepare to receive more than server
198
+ capabilities
199
+ - get_remote_heads(): refactor code to read "server capabilities"
200
143
-Rebased to 'master', that introduced NO_PTHREADS.
201
+An attempt to extend the fetch protocol to make the logic to detect where
202
+HEAD on the origin site points to more robust.
203
204
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
205
- bisect: add "--no-replace" option to bisect without using replace
@@ -156,25 +215,6 @@ Rebased to 'master', that introduced NO_PTHREADS.
215
- bisect: add test cases for "git bisect replace"
216
- bisect: add "git bisect replace" subcommand
217
159
-I really hate the idea of introducing a potentially much more useful
160
-replacement of the existing graft mechanism and tie it very tightly to
161
-bisect, making it unusable from outside.
162
-
163
- (1) I do not think "bisect replace" workflow is a practical and usable
164
- one;
165
-
166
- (2) The underlying mechanism to express "this object replaces that other
167
- object" is much easier to work with than what the graft does which is
168
- "the parents of this commit are these", and idea to use the normal
169
- ref to point at them means this can potentially be used for
170
- transferring the graft information across repositories, which the
171
- current graft mechanism cannot do.
172
-
173
- (3) Because I like the aspect (2) of this series so much, it deeply
174
- disappoints and troubles me that this is implemented minimally near
175
- the surface, and that it is controlled by the "bisect" Porcelain
176
- alone, by explicitly passing command line arguments.
177
-
218
I think a mechanism like this should be added to replace grafts, but it
219
should always be enabled for normal revision traversal operation, while
220
always disabled for object enumeration and transfer operation (iow, fsck,
@@ -182,43 +222,6 @@ fetch and push should use the real ancestry information recorded in the
222
underlying objects, while rev-list, log, etc. should always use the
223
replaced objects). I have a suspicion that even cat-file could honor it.
224
185
-* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
186
- - wt-status: show sparse checkout info
187
- - Introduce default sparse patterns (core.defaultsparse)
188
- - checkout: add new options to support sparse checkout
189
- - clone: support sparse checkout with --sparse-checkout option
190
- - unpack_trees(): add support for sparse checkout
191
- - unpack_trees(): keep track of unmerged entries
192
- - Introduce "sparse patterns"
193
- - Merge branch 'master' into nd/narrow
194
- + t2104: touch portability fix
195
- + grep: skip files outside sparse checkout area
196
- + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
197
- + Prevent diff machinery from examining worktree outside sparse
198
- checkout
199
- + ls-files: Add tests for --sparse and friends
200
- + update-index: add --checkout/--no-checkout to update
201
- CE_NO_CHECKOUT bit
202
- + update-index: refactor mark_valid() in preparation for new options
203
- + ls-files: add options to support sparse checkout
204
- + Introduce CE_NO_CHECKOUT bit
205
-
206
-Kicked back to 'on hold' until 1.6.1 final by popular demand; will be
207
-dropped from 'next' (see recent discussion on the interaction between the
208
-checkout area and commands such as "grep").
209
-
210
-* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
211
- - clone: test the new HEAD detection logic
212
- - Merge commit 'HEAD@{2}' into HEAD
213
- - upload-pack: send the HEAD information
214
- - clone: find the current branch more explicitly
215
- - connect.c::read_extra_info(): find where HEAD points at
216
- - connect.c::read_extra_info(): prepare to receive more than server
217
- capabilities
218
- - get_remote_heads(): refactor code to read "server capabilities"
219
-
220
-This is no way meant for 1.6.1, let alone next, yet.
221
-
225
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
226
- "git push": tellme-more protocol extension
227
@@ -242,22 +245,3 @@ this back for now.
245
- stripspace: use parse_options()
246
- Add "git am -s" test
247
- git-am: refactor code to add signed-off-by line for the committer
245
-
246
-* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
247
- . revision --simplify-merges: incremental simplification
248
- . revision --simplify-merges: prepare for incremental simplification
249
-
250
-* jc/clone-symref (Sat Nov 29 23:38:21 2008 -0800) 6 commits
251
- . clone: test the new HEAD detection logic
252
- . Merge sender side of "symbolic-ref" protocol extension
253
- . upload-pack: implement protocol extension "symbolic-ref"
254
- . clone: find the current branch more explicitly
255
- . get_remote_heads(): do not assume that the operation is one-way
256
- . upload-pack.c: refactor receive_needs()
257
-
258
-* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
259
- . valgrind: ignore ldso errors
260
- . add valgrind support in test scripts
261
-
262
-* jc/apply (Sun Sep 7 14:36:24 2008 -0700) 1 commit
263
- . WIP