What's in/cooking
Junio C Hamano committed
May 31, 2009 at 18:21 UTC
0b6e2f236bec9d38fbcf8790a41aa5b72cef7cbb
2 files changed
+465
whats/cooking/2009/05/04.txt
new
+306
@@ -0,0 +1,306 @@
1
+To: git@vger.kernel.org
2
+Subject: What's cooking in git.git (May 2009, #04; Sun, 31)
3
+X-master-at: f9275c68af58e0f65e1557b5109ccbfdbbbc384a
4
+X-next-at: 426b5a935392df623347be0aea16bca045d44b52
5
+
6
+What's cooking in git.git (May 2009, #04; Sun, 31)
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
+----------------------------------------------------------------
18
+[New Topics]
19
+
20
+All of these are soon to be in 'next'.
21
+
22
+* bc/solaris (Wed May 27 21:17:08 2009 -0500) 4 commits
23
+ - Makefile: introduce SANE_TOOL_PATH for prepending required
24
+ elements to PATH
25
+ - Makefile: add section for SunOS 5.7
26
+ - Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
27
+ arguments
28
+ - Makefile: use /usr/ucb/install on SunOS platforms rather than
29
+ ginstall
30
+
31
+* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
32
+ - git-cvsexportcommit can't commit files which have been removed
33
+ from CVS
34
+
35
+* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
36
+ - Documentation: teach stash/pop workflow instead of stash/apply
37
+
38
+* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
39
+ - diff: generate pretty filenames in prep_temp_blob()
40
+ - compat: add a basename() compatibility function
41
+ - compat: add a mkstemps() compatibility function
42
+
43
+* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
44
+ - for-each-ref: Do not lookup objects when they will not be used
45
+
46
+* cb/match_refs_internal_tail (Wed May 27 22:13:44 2009 +0200) 1 commit
47
+ - match_refs: search ref list tail internally
48
+
49
+I need to replace this with the new iteration...
50
+
51
+* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
52
+ - git-am: refactor 'cleaning up and aborting'
53
+ - git-am foreign patch support: StGIT support
54
+ - git-am foreign patch support: autodetect some patch formats
55
+ - git-am foreign patch support: introduce patch_format
56
+
57
+----------------------------------------------------------------
58
+[Graduated to "master"]
59
+
60
+* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 2 commits
61
+ + parse-opts: add OPT_FILENAME and transition builtins
62
+ + parse-opts: prepare for OPT_FILENAME
63
+
64
+* rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit
65
+ + grep: fix word-regexp at the beginning of lines
66
+
67
+* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit
68
+ + apply: handle filenames with double slashes better
69
+
70
+* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits
71
+ + t8005: convert CP1251 character set to ISO8859-5
72
+ + t8005: use more portable character encoding names
73
+ + t5100: use ancient encoding syntax for backwards compatibility
74
+ + t9301: use ISO8859-1 rather than ISO-8859-1
75
+ + t3901: Use ISO8859-1 instead of ISO-8859-1 for backward
76
+ compatibility
77
+ + t3901: avoid negation on right hand side of '|'
78
+ + builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as
79
+ fallback encoding
80
+ + builtin-mailinfo.c: compare character encodings case insensitively
81
+ + Use 'UTF-8' rather than 'utf-8' everywhere for backward
82
+ compatibility
83
+ + t3900: use ancient iconv names for backward compatibility
84
+
85
+* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits
86
+ + show-branch: migrate to parse-options API
87
+ + Merge branch 'mh/show-branch-color' into sb/show-branch-parse-
88
+ options
89
+ + parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated
90
+ argh's
91
+
92
+* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits
93
+ + apply, fmt-merge-msg: use relative filenames
94
+ + commit: -F overrides -t
95
+
96
+* jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits
97
+ - OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
98
+ - Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
99
+
100
+* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
101
+ + send-email: Remove superfluous `my $editor = ...'
102
+ + send-email: 'References:' should only reference what is sent
103
+ + send-email: Handle "GIT:" rather than "GIT: " during --compose
104
+ + Docs: send-email: --smtp-server-port can take symbolic ports
105
+ + Docs: send-email: Refer to CONFIGURATION section for
106
+ sendemail.multiedit
107
+ + Docs: send-email: Put options back into alphabetical order
108
+
109
+* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
110
+ + mktree: validate entry type in input
111
+ + mktree --batch: build more than one tree object
112
+ + mktree --missing: updated usage message and man page
113
+ + mktree --missing: allow missing objects
114
+ + t1010: add mktree test
115
+ + mktree: do not barf on a submodule commit
116
+ + builtin-mktree.c: use a helper function to handle one line of
117
+ input
118
+ + mktree: use parse-options
119
+ + build-in git-mktree
120
+
121
+* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
122
+ + Revert "git-add--interactive: remove hunk coalescing"
123
+ + Splitting a hunk that adds a line at the top fails in "add -p"
124
+
125
+* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
126
+ + format-patch: migrate to parse-options API
127
+
128
+* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits (early part)
129
+ + bisect: check ancestors without forking a "git rev-list" process
130
+ + commit: add function to unparse a commit and its parents
131
+ + bisect: rework some rev related functions to make them more
132
+ reusable
133
+
134
+----------------------------------------------------------------
135
+[Stalled and may need help and prodding to go forward]
136
+
137
+* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
138
+ - Teach "-m <msg>" and "-F <file>" to "git notes edit"
139
+ - Add an expensive test for git-notes
140
+ - Speed up git notes lookup
141
+ - Add a script to edit/inspect notes
142
+ - Introduce commit notes
143
+
144
+Dscho asked about the performance implications of this; I do not think I
145
+saw any progress on that yet...
146
+
147
+* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
148
+ + git-submodule: add support for --rebase.
149
+
150
+There was a discussion on --rebase vs --merge and needs for unified
151
+configuration variable handling for this patch...
152
+
153
+* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
154
+ - Add initial support for pathname conversion to UTF-8
155
+ - read_directory(): infrastructure for pathname character set
156
+ conversion
157
+ - Add 'fill_directory()' helper function for directory traversal
158
+
159
+Before adding the real "conversion", this needs a few real fixups, I
160
+think. For example there is one hardcoded array that is used without
161
+bounds check.
162
+
163
+* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
164
+ - Fix for a merge where a branch has an F->D transition
165
+ - Add a reminder test case for a merge with F/D transition
166
+
167
+Although the reported breakage is covered with the patch, Alex feels the
168
+solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
169
+may be long overdue but seems to be a hard problem.
170
+
171
+* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
172
+ - blame.c: start libifying the blame infrastructure
173
+
174
+A few minor point remains in this initial one. I hate to do these minor
175
+fix-ups myself, but I may end up doing so...
176
+
177
+* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
178
+ - Allow --date=local --date=other-format to work as expected
179
+
180
+The one I posted had a few corner-case bugs that was caught with the test
181
+suite; this one has them fixed. People did not like the UI so it is kept
182
+out of 'next'
183
+
184
+* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
185
+ - git-merge-file: allow converting the results for the work tree
186
+
187
+This is a feature waiting for a user.
188
+
189
+We did not give scripted Porcelains a way to say "this temporary file I am
190
+using for merging is for this path, so use the core.autocrlf and attributes
191
+rules for that final path". Instead, merge-file simply wrote out the
192
+data in the canonical repository representation.
193
+
194
+rerere has the same issue, but it is a lot worse. It reads the three
195
+files (preimage, postimage and thisimage) from the work tree in the work
196
+tree representation, merges them without converting them to the canonical
197
+representation first but inserts the conflict markers with the canonical
198
+representation and writes the resulting mess out. It needs to be fixed to
199
+read with convert_to_git(), merge them while they are still in the
200
+canonical representation and possibly add conflict markers, and then write
201
+the results out after convert_to_working_tree(). It also needs to write
202
+in binary mode as well.
203
+
204
+* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
205
+ - Add option for using a foreign VCS
206
+ - Document details of transport function APIs
207
+ - Allow late reporting of fetched hashes
208
+
209
+* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
210
+ - t/t9600: remove exit after test_done
211
+ - cvsimport: extend testcase about patchset order to contain
212
+ branches
213
+ - cvsimport: add test illustrating a bug in cvsps
214
+ - Add a test of "git cvsimport"'s handling of tags and branches
215
+ - Add some tests of git-cvsimport's handling of vendor branches
216
+ - Test contents of entire cvsimported "master" tree contents
217
+ - Use CVS's -f option if available (ignore user's ~/.cvsrc file)
218
+ - Start a library for cvsimport-related tests
219
+
220
+----------------------------------------------------------------
221
+[Actively cooking]
222
+
223
+* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
224
+ + mergetool--lib: add support for araxis merge
225
+
226
+* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
227
+ + Avoid "diff-index --cached" optimization under --find-copies-
228
+ harder
229
+ + Optimize "diff-index --cached" using cache-tree
230
+ + t4007: modernize the style
231
+ + cache-tree.c::cache_tree_find(): simplify internal API
232
+ + write-tree --ignore-cache-tree
233
+
234
+* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
235
+ - Change xdl_merge to generate output even for null merges
236
+ - t6023: merge-file fails to output anything for a degenerate merge
237
+
238
+Soon in 'next';
239
+
240
+* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
241
+ - diff: Rename QUIET internal option to QUICK
242
+ - diff: change semantics of "ignore whitespace" options
243
+
244
+* cc/bisect (Thu May 28 23:21:16 2009 +0200) 2 commits
245
+ - bisect: display first bad commit without forking a new process
246
+ - bisect: drop unparse_commit() and use clear_commit_marks()
247
+
248
+Soon in 'next';
249
+
250
+* rc/http-push (Sat May 30 01:59:50 2009 +0800) 21 commits
251
+ - http*: add helper methods for fetching objects (loose)
252
+ - http*: add helper methods for fetching packs
253
+ - http: use new http API in fetch_index()
254
+ - http*: add http_get_info_packs
255
+ - Use the new http API in fetch_symref()
256
+ - Use the new http API in update_remote_info_refs()
257
+ - Use the new http API in http_fetch_ref()
258
+ - Use the new http API in get_refs_via_curl()
259
+ - Two new functions for the http API
260
+ - http: create function end_url_with_slash
261
+ - http*: move common variables and macros to http.[ch]
262
+ - Some cleanup in get_refs_via_curl()
263
+ - Don't expect verify_pack() callers to set pack_size
264
+ - http-push: do not SEGV after fetching a bad pack idx file
265
+ - http*: copy string returned by sha1_to_hex
266
+ - http-walker: verify remote packs
267
+ - http-push, http-walker: style fixes
268
+ - http-push: fix missing "#ifdef USE_CURL_MULTI" around
269
+ "is_running_queue"
270
+ - http-push: send out fetch requests on queue
271
+ - t5540-http-push: test fetching of packed objects
272
+ - t5540-http-push: test fetching of loose objects
273
+
274
+Updated (but not yet with the "slot->local = NULL" patch)
275
+
276
+* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
277
+ - t6050: check pushing something based on a replaced commit
278
+ - Documentation: add documentation for "git replace"
279
+ - Add git-replace to .gitignore
280
+ - builtin-replace: use "usage_msg_opt" to give better error messages
281
+ - parse-options: add new function "usage_msg_opt"
282
+ - builtin-replace: teach "git replace" to actually replace
283
+ - Add new "git replace" command
284
+ - environment: add global variable to disable replacement
285
+ - mktag: call "check_sha1_signature" with the replacement sha1
286
+ - replace_object: add a test case
287
+ - object: call "check_sha1_signature" with the replacement sha1
288
+ - sha1_file: add a "read_sha1_file_repl" function
289
+ - replace_object: add mechanism to replace objects found in
290
+ "refs/replace/"
291
+ - refs: add a "for_each_replace_ref" function
292
+
293
+Rebased to master.
294
+
295
+----------------------------------------------------------------
296
+[On Hold]
297
+
298
+* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
299
+ - receive-pack: default receive.denyDeleteCurrent to refuse
300
+
301
+* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
302
+ - Refuse updating the current branch in a non-bare repository via
303
+ push
304
+
305
+These are for 1.7.0, but the messages when they trigger together may need
306
+to be rethought.
whats/in/2009/05/03.txt
new
+159
@@ -0,0 +1,159 @@
1
+To: git@vger.kernel.org
2
+Subject: What's in git.git (May 2009, #03; Sun, 31)
3
+X-maint-at: 6a01554e6350123c78de805d820e90f1c56e5fdc
4
+X-master-at: f9275c68af58e0f65e1557b5109ccbfdbbbc384a
5
+X-maint-was: e701fadb9e0e51a6811690d95a53bd1f5b6fad86
6
+X-master-was: b74d779bd90477f6514d0a9be4a75b4c40ed946c
7
+
8
+What's in git.git (May 2009, #03; Sun, 31)
9
+
10
+ maint 6a01554 (fix segfault showing an empty remote)
11
+ master f9275c6 (Merge branch 'sb/opt-filename')
12
+------------------------------------------------------------------------
13
+
14
+A rather large-ish updates on the 'master' front. The 'maint' has some
15
+fixes that should eventually produce 1.6.3.2.
16
+
17
+* The 'maint' branch has these fixes since the last announcement.
18
+
19
+Alex Riesen (5):
20
+ Introduce an unlink(2) wrapper which gives warning if unlink failed
21
+ replace direct calls to unlink(2) with unlink_or_warn
22
+ print unlink(2) errno in copy_or_link_directory
23
+ Clarify kind of conflict in merge-one-file helper
24
+ http-push.c::remove_locks(): fix use after free
25
+
26
+Clemens Buchacher (1):
27
+ fix segfault showing an empty remote
28
+
29
+Dave Olszewski (1):
30
+ merge-recursive: never leave index unmerged while recursing
31
+
32
+Jeff King (5):
33
+ fix GIT_TRACE segfault with shell-quoted aliases
34
+ add: don't complain when adding empty project root
35
+ lock_ref: inform callers of unavailable ref
36
+ fetch: report ref storage DF errors more accurately
37
+ fix cat-file usage message and documentation
38
+
39
+Jim Meyering (1):
40
+ format-patch let -k override a config-specified format.numbered
41
+
42
+Johannes Schindelin (1):
43
+ Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
44
+
45
+Junio C Hamano (1):
46
+ Prepare for 1.6.3.2
47
+
48
+Linus Torvalds (2):
49
+ Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
50
+ Teach 'git checkout' to preload the index contents
51
+
52
+Michael J Gruber (1):
53
+ merge-options.txt: Clarify merge --squash
54
+
55
+Nicolas Pitre (1):
56
+ allow OFS_DELTA objects during a push
57
+
58
+
59
+* The 'master' branch has these since the last announcement
60
+ in addition to the above.
61
+
62
+Benjamin Kramer (1):
63
+ imap-send: add support for IPv6
64
+
65
+Björn Steinbrink (1):
66
+ git-apply(1): Clarify that one can select where to apply the patch
67
+
68
+Brandon Casey (11):
69
+ t3900: use ancient iconv names for backward compatibility
70
+ Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
71
+ builtin-mailinfo.c: compare character encodings case insensitively
72
+ builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback
73
+ encoding
74
+ t3901: avoid negation on right hand side of '|'
75
+ t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
76
+ t9301: use ISO8859-1 rather than ISO-8859-1
77
+ t5100: use ancient encoding syntax for backwards compatibility
78
+ t8005: use more portable character encoding names
79
+ t8005: convert CP1251 character set to ISO8859-5
80
+ t8005: fix typo, it's ISO-8859-5, not KOI8-R
81
+
82
+Christian Couder (3):
83
+ bisect: rework some rev related functions to make them more reusable
84
+ commit: add function to unparse a commit and its parents
85
+ bisect: check ancestors without forking a "git rev-list" process
86
+
87
+Clemens Buchacher (1):
88
+ http-push: reuse existing is_null_ref
89
+
90
+Eric Wong (1):
91
+ git-svn: refuse to dcommit non-UTF-8 messages
92
+
93
+Jeff King (2):
94
+ convert bare readlink to strbuf_readlink
95
+ git-add: no need for -f when resolving a conflict in already tracked path
96
+
97
+Jim Meyering (1):
98
+ post-receive-email: hooks.showrev: show how to include both web link and
99
+ patch
100
+
101
+Johannes Sixt (1):
102
+ t3701: ensure correctly set up repository after skipped tests
103
+
104
+Josh Micich (3):
105
+ mktree --missing: updated usage message and man page
106
+ mktree --batch: build more than one tree object
107
+ mktree: validate entry type in input
108
+
109
+Junio C Hamano (11):
110
+ build-in git-mktree
111
+ mktree: use parse-options
112
+ builtin-mktree.c: use a helper function to handle one line of input
113
+ mktree: do not barf on a submodule commit
114
+ t1010: add mktree test
115
+ mktree --missing: allow missing objects
116
+ Revert "git-add--interactive: remove hunk coalescing"
117
+ Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
118
+ OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
119
+ Update draft release notes to 1.6.4
120
+ completion: fix PS1 display during an AM on detached HEAD
121
+
122
+Matt Graham (1):
123
+ Splitting a hunk that adds a line at the top fails in "add -p"
124
+
125
+Michael Witten (6):
126
+ Docs: send-email: Put options back into alphabetical order
127
+ Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
128
+ Docs: send-email: --smtp-server-port can take symbolic ports
129
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
130
+ send-email: 'References:' should only reference what is sent
131
+ send-email: Remove superfluous `my $editor = ...'
132
+
133
+Michal Marek (1):
134
+ apply: handle filenames with double slashes better
135
+
136
+Nguyễn Thái Ngọc Duy (1):
137
+ t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
138
+
139
+René Scharfe (1):
140
+ grep: fix word-regexp at the beginning of lines
141
+
142
+SZEDER Gábor (1):
143
+ bash: remove always true if statement from __git_ps1()
144
+
145
+Stephen Boyd (10):
146
+ format-patch: migrate to parse-options API
147
+ parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
148
+ show-branch: migrate to parse-options API
149
+ commit: -F overrides -t
150
+ apply, fmt-merge-msg: use relative filenames
151
+ parse-opts: prepare for OPT_FILENAME
152
+ parse-opts: add OPT_FILENAME and transition builtins
153
+ t5500: Modernize test style
154
+ t9120: don't expect failure with SVN_HTTPD_PORT unset
155
+ config.txt: document add.ignore-errors
156
+
157
+Thomas Rast (1):
158
+ Documentation: teach stash/pop workflow instead of stash/apply
159
+