What's cooking (2009/04 #01)
Junio C Hamano committed
Apr 6, 2009 at 01:06 UTC
3bfece3adf44bcf315b708aeb3f2f54a62bd9aac
1 file changed
+134
-137
whats-cooking.txt
+134
-137
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30)
3
-X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90
4
-X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f
2
+Subject: What's cooking in git.git (Apr 2009, #01; Mon, 06)
3
+X-master-at: fbdc05661d9b732d06c47ccb3d5836d0d1b563e5
4
+X-next-at: 5efaefce91ae81a7490893cc6245a3f52998b522
5
6
-What's cooking in git.git (Mar 2009, #07; Mon, 30)
6
+What's cooking in git.git (Apr 2009, #01; Mon, 06)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -17,6 +17,54 @@ meant to be merged to the maintenance series have "maint-" in their names.
17
----------------------------------------------------------------
18
[New Topics]
19
20
+* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit
21
+ + add --html-path to get the location of installed HTML docs
22
+
23
+* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits
24
+ + Speed up reflog pruning of unreachable commits
25
+ + Clean up reflog unreachability pruning decision
26
+
27
+* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits
28
+ + match_tree_entry(): a pathspec only matches at directory
29
+ boundaries
30
+ + tree_entry_interesting: a pathspec only matches at directory
31
+ boundary
32
+
33
+* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit
34
+ + Allow curl to rewind the read buffers
35
+
36
+* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit
37
+ + Fix 'git checkout <submodule>' to update the index
38
+
39
+* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits
40
+ + simplify output of conflicting merge
41
+ + update cache for conflicting submodule entries
42
+ + add tests for merging with submodules
43
+
44
+* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits
45
+ + git remote update: New option --prune
46
+ + builtin-remote.c: Split out prune_remote as a separate function.
47
+
48
+These should go to 'master' soonish.
49
+
50
+* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits
51
+ - sha1-lookup: fix up the assertion message
52
+ - patch-ids: use the new generic "sha1_pos" function to lookup sha1
53
+ - sha1-lookup: add new "sha1_pos" function to efficiently lookup
54
+ sha1
55
+
56
+I think this is Ok for 'next', but somebody might want to prove me wrong
57
+by running some benchmarks.
58
+
59
+----------------------------------------------------------------
60
+[Will Discard]
61
+
62
+* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
63
+ - checkout -: make "-" to mean "previous branch" everywhere
64
+
65
+----------------------------------------------------------------
66
+[Graduated to "master"]
67
+
68
* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits
69
+ Merge branch 'cj/doc-quiet' into cj/doc-format
70
+ Documentation: option to render literal text as bold for manpages
@@ -37,15 +85,6 @@ meant to be merged to the maintenance series have "maint-" in their names.
85
+ Documentation/Makefile: break up texi pipeline
86
+ Documentation/Makefile: make most operations "quiet"
87
40
-I think these are ready for 'master'.
41
-
42
-* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits
43
- - checkout -: make "-" to mean "previous branch" everywhere
44
- - Don't permit ref/branch names to end with ".lock"
45
- - check_ref_format(): tighten refname rules
46
-
47
-After all the bottom two are probably not so iffy.
48
-
88
* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits
89
+ strbuf_check_branch_ref(): a helper to check a refname for a
90
branch
@@ -66,34 +105,8 @@ After all the bottom two are probably not so iffy.
105
+ pretty.c: add %f format specifier to format_commit_message()
106
107
* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits
69
- - [Reroll requested] Make local branches behave like remote branches
70
- when --tracked
71
- - Test for local branches being followed with --track
72
-
73
-* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 commits
74
- - bisect--helper: string output variables together with "&&"
75
- - rev-list: pass "int flags" as last argument of "show_bisect_vars"
76
- - t6030: test bisecting with paths
77
- - bisect: use "bisect--helper" and remove "filter_skipped" function
78
- - bisect: implement "read_bisect_paths" to read paths in
79
- "$GIT_DIR/BISECT_NAMES"
80
- - bisect--helper: implement "git bisect--helper"
81
- - rev-list: call new "filter_skip" function
82
- + rev-list: pass "revs" to "show_bisect_vars"
83
- + rev-list: make "show_bisect_vars" non static
84
- + rev-list: move code to show bisect vars into its own function
85
- + rev-list: move bisect related code into its own file
86
- + rev-list: make "bisect_list" variable local to "cmd_rev_list"
87
- + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
88
- functions
89
- + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
90
- array
91
- + quote: implement "sq_dequote_many" to unwrap many args in one
92
- string
93
-
94
-I've reordered them to make the early three patches independent to the
95
-rest of the series. Dscho had a suggestion on the search it internally
96
-does, so we might see further reroll of some patches in the series.
108
+ + Make local branches behave like remote branches when --tracked
109
+ + Test for local branches being followed with --track
110
111
* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits
112
+ set_shared_perm(): sometimes we know what the final mode bits
@@ -115,78 +128,9 @@ does, so we might see further reroll of some patches in the series.
128
+ builtin-fast-export.c: turn error into warning
129
+ test-suite: adding a test for fast-export with tag variants
130
118
-----------------------------------------------------------------
119
-[Graduated to "master"]
120
-
121
-* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit
122
- + make oneline reflog dates more consistent with multiline format
123
-
124
-* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit
125
- + export GIT_EXEC_PATH when git is run with --exec-path
126
-
127
-* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit
128
- + blame: read custom grafts given by -S before calling
129
- setup_revisions()
130
-
131
-The above are all ready for 'next'.
132
-
133
-* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits
134
- + Documentation: reword example text in git-bisect.txt.
135
- + Documentation: reworded the "Description" section of git-
136
- bisect.txt.
137
- + Documentation: minor grammatical fixes in git-branch.txt.
138
- + Documentation: minor grammatical fixes in git-blame.txt.
139
- + Documentation: reword the "Description" section of git-bisect.txt.
140
- + Documentation: minor grammatical fixes in git-archive.txt.
141
-
142
-* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits
143
- + test-lib.sh: Allow running the test suite against installed git
144
- + test-lib.sh: Test for presence of git-init in the right path.
145
-
146
-* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits
147
- + Add a test for checking whether gitattributes is honored by
148
- checkout.
149
- + Read attributes from the index that is being checked out
150
-
151
-Original issue identified, and test provided by Kristian Amlie.
152
-
153
-* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
154
- + Display warning for default git push with no push.default config
155
- + New config push.default to decide default behavior for push
156
-
157
-* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits
158
- + http-push.c: use a faux remote to pass to http_init
159
- + Do not name "repo" struct "remote" in push_http.c
160
- + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
161
- versions of cURL
162
- + http authentication via prompts
163
- + http_init(): Fix config file parsing
164
- + http.c: style cleanups
165
-
166
-Amos King added push side support on top of my fetch side support.
167
-
168
-We may want to also pass --remote parameter from git-push to this backend
169
-as Daniel did as an interim solution for the fetch side, so that we can
170
-handle the configuration better.
171
-
172
-* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
173
- + Move push matching and reporting logic into transport.c
174
- + Use a common function to get the pretty name of refs
175
-
176
-----------------------------------------------------------------
177
-[Will merge to 'master' soon]
178
-
131
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
132
+ stat_tracking_info(): only count real commits
133
182
-This gives the merge commits zero weight when talking about how many
183
-commits you have ahead (or behind) of the branch you are tracking. Even
184
-though I agree that they should carry much less weight than the "real"
185
-commits, because your repeated merge from the other branch does not really
186
-add any real value to the end result, giving them absolute zero weight
187
-somehow feels wrong. At least it shows that your have been _active_ on the
188
-branch. But I do not feel very strongly about it.
189
-
134
* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits
135
+ pack-objects: don't loosen objects available in alternate or kept
136
packs
@@ -204,7 +148,8 @@ branch. But I do not feel very strongly about it.
148
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
149
- blame.c: start libifying the blame infrastructure
150
207
-A few minor point remains in this initial one.
151
+A few minor point remains in this initial one. I hate to do these minor
152
+fix-ups myself, but I may end up doing so...
153
154
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
155
- Allow --date=local --date=other-format to work as expected
@@ -244,23 +189,6 @@ in binary mode as well.
189
- Add specification of git-vcs helpers
190
- Add "vcs" config option in remotes
191
247
-* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
248
- - builtin-replace: use "usage_msg_opt" to give better error messages
249
- - parse-options: add new function "usage_msg_opt"
250
- - builtin-replace: teach "git replace" to actually replace
251
- - Add new "git replace" command
252
- - environment: add global variable to disable replacement
253
- - mktag: call "check_sha1_signature" with the replacement sha1
254
- - replace_object: add a test case
255
- - object: call "check_sha1_signature" with the replacement sha1
256
- - sha1_file: add a "read_sha1_file_repl" function
257
- - replace_object: add mechanism to replace objects found in
258
- "refs/replace/"
259
- - refs: add a "for_each_replace_ref" function
260
-
261
-I know, I really have to drop everything else and re-read these, but I
262
-haven't managed to.
263
-
192
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
193
- tests: fix "export var=val"
194
- notes: refuse to edit notes outside refs/notes/
@@ -277,15 +205,16 @@ haven't managed to.
205
- Add a script to edit/inspect notes
206
- Introduce commit notes
207
280
-* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits
208
+* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
209
+ - t/t9600: remove exit after test_done
210
- cvsimport: extend testcase about patchset order to contain
211
branches
212
- cvsimport: add test illustrating a bug in cvsps
284
- - Add a test of "git cvsimport"'s handling of tags and branches
285
- - Add some tests of git-cvsimport's handling of vendor branches
286
- - Test contents of entire cvsimported "master" tree contents
287
- - Use CVS's -f option if available (ignore user's ~/.cvsrc file)
288
- - Start a library for cvsimport-related tests
213
+ + Add a test of "git cvsimport"'s handling of tags and branches
214
+ + Add some tests of git-cvsimport's handling of vendor branches
215
+ + Test contents of entire cvsimported "master" tree contents
216
+ + Use CVS's -f option if available (ignore user's ~/.cvsrc file)
217
+ + Start a library for cvsimport-related tests
218
219
Two cvsimport test topics were rewound from 'next' and merged into this
220
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
@@ -294,15 +223,83 @@ to resolve issues these tests identify.
223
----------------------------------------------------------------
224
[Actively cooking]
225
297
-* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits
226
+* da/difftool (Sat Apr 4 21:00:24 2009 -0700) 25 commits
227
+ - mergetool--lib: add new merge tool TortoiseMerge
228
+ - mergetool--lib: make (g)vimdiff workable under Windows
229
+ - mergetool--lib: consolidate the last redundant bits in
230
+ {diff,merge}tool
231
+ - mergetool-lib: specialize opendiff options when in diff mode
232
+ - mergetool-lib: refactor run_mergetool and check_unchanged
233
+ - bash completion: add git-difftool
234
+ - {diff,merge}tool: rename helpers to remove them from tab-
235
+ completion
236
+ - mergetool-lib: add diffuse as merge and diff tool
237
+ - mergetool-lib: specialize xxdiff options when in diff mode
238
+ - mergetool-lib: specialize kdiff3 options when in diff mode
239
+ - mergetool: use run_mergetool from git-mergetool-lib
240
+ - difftool: use run_mergetool from git-mergetool-lib
241
+ - mergetool-lib: introduce run_mergetool
242
+ - difftool: use valid_tool from git-mergetool-lib
243
+ - mergetool: use valid_tool from git-mergetool-lib
244
+ - difftool: use get_mergetool_path from git-mergetool-lib
245
+ - mergetool: use get_mergetool_path from git-mergetool-lib
246
+ - Add a mergetool-lib scriptlet for holding common merge tool
247
+ functions
248
+ - mergetool: use $( ... ) instead of `backticks`
249
+ - difftool: add support for a difftool.prompt config variable
250
- difftool: add a -y shortcut for --no-prompt
251
- difftool: use perl built-ins when testing for msys
252
- difftool: add various git-difftool tests
253
- difftool: add git-difftool to the list of commands
254
+ difftool: move 'git-difftool' out of contrib
255
304
-David has further refactoring which was a bit too early for me to pick
305
-up.
256
+* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
257
+ - bisect--helper: string output variables together with "&&"
258
+ - rev-list: pass "int flags" as last argument of "show_bisect_vars"
259
+ - t6030: test bisecting with paths
260
+ - bisect: use "bisect--helper" and remove "filter_skipped" function
261
+ - bisect: implement "read_bisect_paths" to read paths in
262
+ "$GIT_DIR/BISECT_NAMES"
263
+ - bisect--helper: implement "git bisect--helper"
264
+ - bisect: use the new generic "sha1_pos" function to lookup sha1
265
+ - rev-list: call new "filter_skip" function
266
+ - Merge branch 'cc/sha1-bsearch' into HEAD
267
+ - patch-ids: use the new generic "sha1_pos" function to lookup sha1
268
+ - sha1-lookup: add new "sha1_pos" function to efficiently lookup
269
+ sha1
270
+ + rev-list: pass "revs" to "show_bisect_vars"
271
+ + rev-list: make "show_bisect_vars" non static
272
+ + rev-list: move code to show bisect vars into its own function
273
+ + rev-list: move bisect related code into its own file
274
+ + rev-list: make "bisect_list" variable local to "cmd_rev_list"
275
+ + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
276
+ functions
277
+ + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
278
+ array
279
+ + quote: implement "sq_dequote_many" to unwrap many args in one
280
+ string
281
+
282
+Re-rolled and made earlier parts ready for 'master'. I think we should
283
+move this to 'next' soonish and aim to have it in 1.6.3
284
+
285
+* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 13 commits
286
+ - builtin-replace: use "usage_msg_opt" to give better error messages
287
+ - parse-options: add new function "usage_msg_opt"
288
+ - builtin-replace: teach "git replace" to actually replace
289
+ - Add new "git replace" command
290
+ - environment: add global variable to disable replacement
291
+ - mktag: call "check_sha1_signature" with the replacement sha1
292
+ - replace_object: add a test case
293
+ - object: call "check_sha1_signature" with the replacement sha1
294
+ - sha1_file: add a "read_sha1_file_repl" function
295
+ - replace_object: add mechanism to replace objects found in
296
+ "refs/replace/"
297
+ - refs: add a "for_each_replace_ref" function
298
+ - patch-ids: use the new generic "sha1_pos" function to lookup sha1
299
+ - sha1-lookup: add new "sha1_pos" function to efficiently lookup
300
+ sha1
301
+
302
+Re-rolled based on the updated binary search API.
303
304
----------------------------------------------------------------
305
[On Hold]