Last issue of What's in/cooking for 2008
Junio C Hamano committed
Jan 5, 2009 at 21:21 UTC
e518dea10cbd1544bf8fbbf85ee3235e017f1012
2 files changed
+311
whats/cooking/2008/12/04.txt
new
+247
@@ -0,0 +1,247 @@
1
+To: git@vger.kernel.org
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
10
+with '-' are only in 'pu' while commits prefixed with '+' are
11
+in 'next'. The ones marked with '.' do not appear in any of the branches,
12
+but I am still holding onto them.
13
+
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
+
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
90
+ + Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
91
+ recursive-fix
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
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
101
+ - Speed up git notes lookup
102
+ - Add a script to edit/inspect notes
103
+ - Introduce commit notes
104
+
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
108
+
109
+* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
110
+ - gitweb: cache $parent_commit info in git_blame()
111
+ - gitweb: A bit of code cleanup in git_blame()
112
+ - gitweb: Move 'lineno' id from link to row element in git_blame
113
+
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
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
+
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
125
+ - gitweb: Modularized git_get_project_description to be more generic
126
+
127
+* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
128
+ - gitweb: link to patch(es) view in commit(diff) and (short)log view
129
+ - gitweb: add patches view
130
+ - gitweb: change call pattern for git_commitdiff
131
+ - gitweb: add patch view
132
+
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
+
149
+----------------------------------------------------------------
150
+[Will merge to "master" soon]
151
+
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
+
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
+
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
+
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
+
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
206
+ refs
207
+ - rev-list: make it possible to disable replacing using "--no-
208
+ bisect-replace"
209
+ - bisect: use "--bisect-replace" options when checking merge bases
210
+ - merge-base: add "--bisect-replace" option to use fixed up revs
211
+ - commit: add "bisect_replace_all" prototype to "commit.h"
212
+ - rev-list: add "--bisect-replace" to list revisions with fixed up
213
+ history
214
+ - Documentation: add "git bisect replace" documentation
215
+ - bisect: add test cases for "git bisect replace"
216
+ - bisect: add "git bisect replace" subcommand
217
+
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,
221
+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
+
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
+
228
+This seems to have a deadlock during communication between the peers.
229
+Someone needs to pick up this topic and resolve the deadlock before it can
230
+continue.
231
+
232
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
233
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
234
+ asked for
235
+
236
+This would be the right thing to do for command line use,
237
+but gitk will be hit due to tcl/tk's limitation, so I am holding
238
+this back for now.
239
+
240
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
241
+ - git-am --forge: add Signed-off-by: line for the author
242
+ - git-am: clean-up Signed-off-by: lines
243
+ - stripspace: add --log-clean option to clean up signed-off-by:
244
+ lines
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
whats/in/2008/12/04.txt
new
+64
@@ -0,0 +1,64 @@
1
+To: git@vger.kernel.org
2
+Subject: What's in git.git (Dec 2008, #04; Mon, 29)
3
+X-maint-at: 936b7057e8401665a2d106e8de018561db6333fe
4
+X-master-at: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf
5
+X-maint-was: 8104ebfe8276657ee803cca7eb8665a78cf3ef83
6
+X-master-was: b3eae84dc10e452add0e79c7373ceee16f73f7f0
7
+
8
+What's in git.git (Dec 2008, #04; Mon, 29)
9
+
10
+ maint 936b705 (Prepare for v1.6.1.1 maintenance release)
11
+ master c32f76f (Merge branch 'lt/reset-merge')
12
+------------------------------------------------------------------------
13
+
14
+BLURB HERE
15
+
16
+* The 'maint' branch has these fixes since the last announcement.
17
+
18
+Adeodato Simó (2):
19
+ git-shortlog.txt: improve documentation about .mailmap files
20
+ git-send-email.txt: move --format-patch paragraph to a proper location
21
+
22
+Devin Doucette (1):
23
+ gitweb: Fix export check in git_get_projects_list
24
+
25
+Junio C Hamano (1):
26
+ Prepare for v1.6.1.1 maintenance release
27
+
28
+René Scharfe (7):
29
+ daemon: handle freopen() failure
30
+ daemon: cleanup: replace loop with if
31
+ daemon: cleanup: factor out xstrdup_tolower()
32
+ merge-file: handle freopen() failure
33
+ pretty: factor out skip_empty_lines()
34
+ pretty: factor out format_subject()
35
+ pretty: support multiline subjects with format:
36
+
37
+Shawn O. Pearce (1):
38
+ describe: Avoid unnecessary warning when using --all
39
+
40
+jidanni@jidanni.org (1):
41
+ Documentation/diff-options.txt: unify options
42
+
43
+
44
+* The 'master' branch has these since the last announcement
45
+ in addition to the above.
46
+
47
+Johannes Schindelin (1):
48
+ Force t5302 to use a single thread
49
+
50
+Junio C Hamano (2):
51
+ Document "git-reset --merge"
52
+ Start 1.6.2 cycle
53
+
54
+Linus Torvalds (1):
55
+ Add 'merge' mode to 'git reset'
56
+
57
+Nicolas Pitre (2):
58
+ autodetect number of CPUs by default when using threads
59
+ pack-objects: don't use too many threads with few objects
60
+
61
+Teemu Likonen (2):
62
+ Fix the building of user-manual.texi and gitman.texi documents
63
+ Fix the building of gitman.info document
64
+