What's cooking

Junio C Hamano committed Jun 18, 2009 at 12:04 UTC 86c83fbadc8915aaf25fd1f819ec563419e3b3a4
1 file changed +380
whats/cooking/2009/06/02.txt new
+380
@@ -0,0 +1,380 @@
1 +To: git@vger.kernel.org
2 +Subject: What's cooking in git.git (Jun 2009, #02; Thu, 18)
3 +X-master-at: da4e4a65a27ca912c3f48289acf9ff7a67476c3f
4 +X-next-at: 04d09b6708a8fa33788706f00bbf43c80ea6af0e
5 +
6 +What's cooking in git.git (Jun 2009, #02; Thu, 18)
7 +--------------------------------------------------
8 +
9 +Here are the topics that have been cooking. Commits prefixed with '-' are
10 +only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11 +marked with '.' do not appear in any of the branches, but I am still
12 +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 +Unfortunately I am unusually short of time these days, and some of the
18 +topics unfortunately got less "final review before deciding to merge up"
19 +than I would have liked to give them. This message itself has more
20 +"please comment/review" requests than usual.
21 +
22 +----------------------------------------------------------------
23 +[New Topics]
24 +
25 +* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit
26 + - diff-tree -r -t: include added/removed directories in the output
27 +
28 +* sb/maint-1.6.0-add-config-fix (Thu Jun 18 02:17:54 2009 -0700) 2 commits
29 + - add: allow configurations to be overriden by command line
30 + - use xstrdup, not strdup in ll-merge.c
31 +
32 +* pb/maint-1.6.2-userdiff-fix (Wed Jun 17 12:11:10 2009 +0200) 2 commits
33 + - upload-archive: fix infinite loop on Cygwin
34 + - avoid exponential regex match for java and objc function names
35 +
36 +* fc/user-manual (Fri May 1 11:44:20 2009 +0300) 2 commits
37 + . user-manual: use 'fast-forward' instead of 'fast forward'
38 + . user-manual: general quoting improvements
39 +
40 +* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits
41 + - parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-
42 + parse
43 + - more tests for git rev-parse --parse-opt
44 +
45 +* js/daemon-log (Tue Jun 16 20:41:16 2009 +0200) 2 commits
46 + - upload-pack: squelch progress indicator if client cannot see it
47 + - daemon: send stderr of service programs to the syslog
48 +
49 +* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits
50 + - stash: teach quiet option
51 + - am, rebase: teach quiet option
52 + - submodule, repack: migrate to git-sh-setup's say()
53 + - git-sh-setup: introduce say() for quiet options
54 + - am: suppress apply errors when using 3-way
55 + - t4150: test applying with a newline in subject
56 +
57 +* lt/maint-unsigned-left-shift (Wed Jun 17 17:22:27 2009 -0700) 1 commit
58 + - Fix big left-shifts of unsigned char
59 +
60 +* jk/use-our-regexp (Tue Jun 16 15:08:21 2009 -0400) 2 commits
61 + - Makefile: use compat regex on Solaris
62 + - Makefile: refactor regex compat support
63 +
64 +* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit
65 + - fetch: do not create ref from empty name
66 +
67 +* pb/send-email-cccmd-fix (Thu Jun 18 14:31:32 2009 +0200) 1 commit
68 + - Test cccmd in t9001-send-email.sh and fix some bugs
69 +
70 +----------------------------------------------------------------
71 +[Graduated to "master"]
72 +
73 +* cb/maint-no-double-merge (Mon Jun 1 11:20:56 2009 +0200) 1 commit
74 + + refuse to merge during a merge
75 +
76 +* sp/msysgit (Thu Jun 11 22:56:12 2009 +0200) 13 commits
77 + + compat/ has subdirectories: do not omit them in 'make clean'
78 + + Fix typo in nedmalloc warning fix
79 + + MinGW: Teach Makefile to detect msysgit and apply specific
80 + settings
81 + + Fix warnings in nedmalloc when compiling with GCC 4.4.0
82 + + Add custom memory allocator to MinGW and MacOS builds
83 + + MinGW readdir reimplementation to support d_type
84 + + connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
85 + + git: browsing paths with spaces when using the start command
86 + + MinGW: fix warning about implicit declaration of _getch()
87 + + test-chmtime: work around Windows limitation
88 + + Work around a regression in Windows 7, causing erase_in_line() to
89 + crash sometimes
90 + + Quiet make: do not leave Windows behind
91 + + MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
92 +
93 +* mh/fix-send-email-threaded (Fri Jun 12 09:23:43 2009 -0700) 7 commits
94 + + Merge branch 'mh/maint-fix-send-email-threaded' into
95 + mh/fix-send-email-threaded
96 + + send-email: fix a typo in a comment
97 + + send-email: fix threaded mails without chain-reply-to
98 + + add a test for git-send-email for threaded mails without chain-reply-to
99 + + doc/send-email: clarify the behavior of --in-reply-to with
100 + --no-thread
101 + + send-email: fix non-threaded mails
102 + + add a test for git-send-email for non-threaded mails
103 +
104 +* rc/maint-http-local-slot-fix (Sat Jun 6 16:43:26 2009 +0800) 1 commit
105 + + http*: cleanup slot->local after fclose
106 +
107 +* sb/parse-options-integer (Thu Jun 4 16:43:57 2009 -0700) 2 commits
108 + + parse-options: simplify usage argh handling
109 + + parse-options: make OPT_INTEGER's argh explicit
110 +
111 +* bc/solaris (Sun Jun 7 07:40:29 2009 +0200) 10 commits
112 + + configure: test whether -lresolv is needed
113 + + Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
114 + + git-compat-util.h: avoid using c99 flex array feature with Sun
115 + compiler 5.8
116 + + Makefile: add section for SunOS 5.7
117 + + Makefile: introduce SANE_TOOL_PATH for prepending required
118 + elements to PATH
119 + + Makefile: define __sun__ on SunOS
120 + + git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
121 + + On Solaris choose the OLD_ICONV iconv() declaration based on the
122 + UNIX spec
123 + + Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
124 + arguments
125 + + Makefile: use /usr/ucb/install on SunOS platforms rather than
126 + ginstall
127 +
128 +* cb/match_refs_internal_tail (Sun May 31 16:26:48 2009 +0200) 1 commit
129 + + match_refs: search ref list tail internally
130 +
131 +* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
132 + + git-cvsexportcommit can't commit files which have been removed
133 + from CVS
134 +
135 +* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
136 + + for-each-ref: Do not lookup objects when they will not be used
137 +
138 +I think this makes sense, except that I have this nagging feeling that its
139 +use of for_each_rawref() where the original used for_each_ref() may have
140 +some unintended side effects in corner cases.
141 +
142 +* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
143 + + mergetool--lib: add support for araxis merge
144 +
145 +* rc/http-push (Sat Jun 6 16:44:02 2009 +0800) 24 commits
146 + + http*: add helper methods for fetching objects (loose)
147 + + http*: add helper methods for fetching packs
148 + + http: use new http API in fetch_index()
149 + + http*: add http_get_info_packs
150 + + http-push.c::fetch_symref(): use the new http API
151 + + http-push.c::remote_exists(): use the new http API
152 + + http.c::http_fetch_ref(): use the new http API
153 + + transport.c::get_refs_via_curl(): use the new http API
154 + + http.c: new functions for the http API
155 + + http: create function end_url_with_slash
156 + + http*: move common variables and macros to http.[ch]
157 + + transport.c::get_refs_via_curl(): do not leak refs_url
158 + + Don't expect verify_pack() callers to set pack_size
159 + + http-push: do not SEGV after fetching a bad pack idx file
160 + + http*: copy string returned by sha1_to_hex
161 + + http-walker: verify remote packs
162 + + http-push, http-walker: style fixes
163 + + t5550-http-fetch: test fetching of packed objects
164 + + http-push: fix missing "#ifdef USE_CURL_MULTI" around
165 + "is_running_queue"
166 + + http-push: send out fetch requests on queue
167 + + t5540-http-push: test fetching of packed objects
168 + + t5540-http-push: test fetching of loose objects
169 + + Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
170 + + http*: cleanup slot->local after fclose
171 +
172 +* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
173 + + t6030: test skipping away from an already skipped commit
174 + + bisect: when skipping, choose a commit away from a skipped commit
175 + + bisect: add parameters to "filter_skipped"
176 + + bisect: display first bad commit without forking a new process
177 + + bisect: drop unparse_commit() and use clear_commit_marks()
178 +
179 +Regardless of metrics, this is an improvement from the current one. Will
180 +merge to 'master', and let the finer details taken care of later, which
181 +is already happening.
182 +
183 +----------------------------------------------------------------
184 +[Will merge to "master" soon]
185 +
186 +* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 1 commit
187 + + git-submodule: add support for --merge.
188 +
189 +Even though some might still argue that "update --merge" is not a good
190 +mode of operation.
191 +
192 +* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
193 + + Avoid "diff-index --cached" optimization under --find-copies-
194 + harder
195 + + Optimize "diff-index --cached" using cache-tree
196 + + t4007: modernize the style
197 + + cache-tree.c::cache_tree_find(): simplify internal API
198 + + write-tree --ignore-cache-tree
199 +
200 +* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
201 + + fix handling of iconv configuration options
202 +
203 +----------------------------------------------------------------
204 +[Stalled and may need help and prodding to go forward]
205 +
206 +* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
207 + - Teach "-m <msg>" and "-F <file>" to "git notes edit"
208 + - Add an expensive test for git-notes
209 + - Speed up git notes lookup
210 + - Add a script to edit/inspect notes
211 + - Introduce commit notes
212 +
213 +Dscho asked about the performance implications of this; I do not think I
214 +saw any progress on that yet...
215 +
216 +* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
217 + - Add initial support for pathname conversion to UTF-8
218 + - read_directory(): infrastructure for pathname character set
219 + conversion
220 + - Add 'fill_directory()' helper function for directory traversal
221 +
222 +Before adding the real "conversion", this needs a few real fixups, I
223 +think. For example there is one hardcoded array that is used without
224 +bounds check.
225 +
226 +* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
227 + - Fix for a merge where a branch has an F->D transition
228 + - Add a reminder test case for a merge with F/D transition
229 +
230 +Although the reported breakage is covered with the patch, Alex feels the
231 +solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
232 +may be long overdue but seems to be a hard problem.
233 +
234 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
235 + - blame.c: start libifying the blame infrastructure
236 +
237 +A few minor point remains in this initial one.
238 +
239 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
240 + - Allow --date=local --date=other-format to work as expected
241 +
242 +The one I posted had a few corner-case bugs that was caught with the test
243 +suite; this one has them fixed. People did not like the UI so it is kept
244 +out of 'next'
245 +
246 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
247 + - git-merge-file: allow converting the results for the work tree
248 +
249 +This is a feature waiting for a user.
250 +
251 +We did not give scripted Porcelains a way to say "this temporary file I am
252 +using for merging is for this path, so use the core.autocrlf and attributes
253 +rules for that final path". Instead, merge-file simply wrote out the
254 +data in the canonical repository representation.
255 +
256 +rerere has the same issue, but it is a lot worse. It reads the three
257 +files (preimage, postimage and thisimage) from the work tree in the work
258 +tree representation, merges them without converting them to the canonical
259 +representation first but inserts the conflict markers with the canonical
260 +representation and writes the resulting mess out. It needs to be fixed to
261 +read with convert_to_git(), merge them while they are still in the
262 +canonical representation and possibly add conflict markers, and then write
263 +the results out after convert_to_working_tree(). It also needs to write
264 +in binary mode as well.
265 +
266 +* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
267 + - Add option for using a foreign VCS
268 + - Document details of transport function APIs
269 + - Allow late reporting of fetched hashes
270 +
271 +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
272 + - t/t9600: remove exit after test_done
273 + - cvsimport: extend testcase about patchset order to contain
274 + branches
275 + - cvsimport: add test illustrating a bug in cvsps
276 + - Add a test of "git cvsimport"'s handling of tags and branches
277 + - Add some tests of git-cvsimport's handling of vendor branches
278 + - Test contents of entire cvsimported "master" tree contents
279 + - Use CVS's -f option if available (ignore user's ~/.cvsrc file)
280 + - Start a library for cvsimport-related tests
281 +
282 +----------------------------------------------------------------
283 +[Actively cooking]
284 +
285 +* tr/die_errno (Fri Jun 12 09:00:59 2009 -0700) 5 commits
286 + - DONTMERGE fix double per-cent
287 + - Use die_errno() instead of die() when checking syscalls
288 + - Convert existing die(..., strerror(errno)) to die_errno()
289 + - die_errno(): double % in strerror() output just in case
290 + - Introduce die_errno() that appends strerror(errno) to die()
291 +
292 +I didn't check the individual conversion from die() to die_errno()
293 +in this latest round; comments?
294 +
295 +Thomas found issues in my "double per-cent hack", so this cannot be merged
296 +to yet until either it is fixed up, or drop the "double per-cent" attempt
297 +altogether.
298 +
299 +* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
300 + + parse-remote: remove unused functions
301 + + parse-remote: support default reflist in get_remote_merge_branch
302 + + parse-remote: function to get the tracking branch to be merge
303 +
304 +It would be nice if we can fix the "currently works only for the default
305 +mapping" before it goes to 'master'. I looked at, but haven't queued any
306 +of the recent RFC updates here.
307 +
308 +* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
309 + - Shift object enumeration out of upload-pack
310 +
311 +* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
312 + - http.c: add http.sslCertPasswordProtected option
313 + - http.c: prompt for SSL client certificate password
314 +
315 +I've rewritten these two to (1) move the #ifdef out of the main codepath,
316 +and (2) use configuration/environment to make the misfeature of always
317 +asking for a passphrase even a key/cert is unencrypted optional. I tried
318 +to be careful but extra sets of eyeballs would be nice to check the result.
319 +
320 +* mg/pushurl (Sun Jun 14 21:46:10 2009 +0200) 6 commits
321 + + avoid NULL dereference on failed malloc
322 + + builtin-remote: Make "remote -v" display push urls
323 + + builtin-remote: Show push urls as well
324 + + technical/api-remote: Describe new struct remote member pushurl
325 + + t5516: Check pushurl config setting
326 + + Allow push and fetch urls to be different
327 +
328 +* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits
329 + - Documentation: remove warning saying that "git bisect skip" may
330 + slow bisection
331 + - bisect: use a PRNG with a bias when skipping away from untestable
332 + commits
333 +
334 +Will be in 'next' shortly.
335 +
336 +* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
337 + - git-am: refactor 'cleaning up and aborting'
338 + - git-am foreign patch support: StGIT support
339 + - git-am foreign patch support: autodetect some patch formats
340 + - git-am foreign patch support: introduce patch_format
341 +
342 +Will be in 'next' shortly.
343 +
344 +* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
345 + - diff: Rename QUIET internal option to QUICK
346 + - diff: change semantics of "ignore whitespace" options
347 +
348 +I am not sure if it should wait for a major version bump but this is a
349 +good semantics change. Perhaps merge to 'next' soonish, but I am
350 +undecided. Comments?
351 +
352 +* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
353 + - t6050: check pushing something based on a replaced commit
354 + - Documentation: add documentation for "git replace"
355 + - Add git-replace to .gitignore
356 + - builtin-replace: use "usage_msg_opt" to give better error messages
357 + - parse-options: add new function "usage_msg_opt"
358 + - builtin-replace: teach "git replace" to actually replace
359 + - Add new "git replace" command
360 + - environment: add global variable to disable replacement
361 + - mktag: call "check_sha1_signature" with the replacement sha1
362 + - replace_object: add a test case
363 + - object: call "check_sha1_signature" with the replacement sha1
364 + - sha1_file: add a "read_sha1_file_repl" function
365 + - replace_object: add mechanism to replace objects found in
366 + "refs/replace/"
367 + - refs: add a "for_each_replace_ref" function
368 +
369 +----------------------------------------------------------------
370 +[On Hold]
371 +
372 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
373 + - receive-pack: default receive.denyDeleteCurrent to refuse
374 +
375 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
376 + - Refuse updating the current branch in a non-bare repository via
377 + push
378 +
379 +These are for 1.7.0, but the messages when they trigger together may need
380 +to be rethought.