What's cooking (2009/04 #02)
Junio C Hamano committed
Apr 15, 2009 at 22:27 UTC
70b38469e475caa5fe0c9af444e69f2eac894d4e
1 file changed
+125
-163
whats-cooking.txt
+125
-163
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2009, #01; Mon, 06)
3
-X-master-at: fbdc05661d9b732d06c47ccb3d5836d0d1b563e5
4
-X-next-at: 5efaefce91ae81a7490893cc6245a3f52998b522
2
+Subject: What's cooking in git.git (Apr 2009, #02; Sun, 12)
3
+X-master-at: c965c029330b1f81cc107c5d829e7fd79c61d8ea
4
+X-next-at: d07d5c8f15ddd1f2569e1778cb82501a201d2f22
5
6
-What's cooking in git.git (Apr 2009, #01; Mon, 06)
6
+What's cooking in git.git (Apr 2009, #02; Sun, 12)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,9 +14,78 @@ 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
17
+We are at 1.6.3-rc0; the tip of 'master' might have some unexpected
18
+minor regressions, and I'd appreciate people to test and report so that we
19
+can keep this cycle short.
20
+
21
----------------------------------------------------------------
22
[New Topics]
23
24
+* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
25
+ - [NEEDS SIGN OFF, DOC, AND REVIEW] git add -p: new "quit" command
26
+ at the prompt.
27
+
28
+I think this is Ok for 1.6.3, but some duplicated hunks bothered me. I
29
+did not read the patch really seriously.
30
+
31
+* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
32
+ - Allow users to un-configure rename detection
33
+
34
+The commit log message needs to be cleaned up, the patch needs to be
35
+signed off, and there probably needs a documentation, but I think
36
+otherwise this is a good idea.
37
+
38
+* nd/archive-attribute (Thu Apr 9 17:01:30 2009 +1000) 2 commits
39
+ - archive: do not read .gitattributes in working directory
40
+ - attr: add GIT_ATTR_INDEX "direction"
41
+
42
+I think this is Ok for 1.6.3 but it needs new tests to protect the new
43
+feature from future breakages.
44
+
45
+* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
46
+ - git-add: introduce --edit (to edit the diff vs. the index)
47
+
48
+I am Ok with the general idea, but the error detection needs to be more
49
+robust than merely relying on --recount.
50
+
51
+* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
52
+ - git-shell: Add 'git-upload-archive' to allowed commands.
53
+
54
+I think this is Ok for 1.6.3.
55
+
56
+* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
57
+ - Mark t1301 permission test to depend on POSIXPERM
58
+ - t1301-shared-repo: fix forced modes test
59
+
60
+J6t's updates to fix permission tests and make sure they won't run on
61
+systems without permission bits on the filesystem.
62
+
63
+I think this is Ok for 1.6.3.
64
+
65
+* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
66
+ - git-am: teach git-am to apply a patch to an unborn branch
67
+
68
+I think this is Ok for 1.6.3.
69
+
70
+* bw/short-ref-strict (Sat Apr 11 22:35:18 2009 +0200) 2 commits
71
+ . for-each-ref: refname:short utilize core.warnAmbiguousRefs
72
+ . get_short_ref(): add strict mode
73
+
74
+This is an "obviously good thing to do" candidate for 1.6.3 but had
75
+serious conflicts with other topics I didn't feel like resolving myself;
76
+as the series is coming from TopGit, I'd ask the submitter to rebase it
77
+for me ;-)
78
+
79
+* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
80
+ - show_object(): push path_name() call further down
81
+ - process_{tree,blob}: show objects without buffering
82
+
83
+This had some conflicts with Christian's bisect topic; I think I resolved
84
+them correctly, but double-checking would be nice.
85
+
86
+----------------------------------------------------------------
87
+[Graduated to "master"]
88
+
89
* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit
90
+ add --html-path to get the location of installed HTML docs
91
@@ -48,99 +117,39 @@ meant to be merged to the maintenance series have "maint-" in their names.
117
These should go to 'master' soonish.
118
119
* 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
120
+ + sha1-lookup: fix up the assertion message
121
+ + patch-ids: use the new generic "sha1_pos" function to lookup sha1
122
+ + sha1-lookup: add new "sha1_pos" function to efficiently lookup
123
sha1
124
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
-
125
* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
63
- - checkout -: make "-" to mean "previous branch" everywhere
126
+ + checkout -: make "-" to mean "previous branch" everywhere
127
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
71
- + Documentation: asciidoc.conf: fix verse block with block titles
72
- + Documentation: asciidoc.conf: always use <literallayout> for
73
- [blocktext]
74
- + Documentation: move "spurious .sp" code into manpage-base.xsl
75
- + Documentation: move quieting params into manpage-base.xsl
76
- + Documentation: rename docbook-xsl-172 attribute to git-asciidoc-
77
- no-roff
78
- + Documentation: use parametrized manpage-base.xsl with manpage-
79
- {1.72,normal}.xsl
80
- + Documentation: move callouts.xsl to manpage-{base,normal}.xsl
81
- + Documentation/Makefile: break up texi pipeline
82
- + Documentation/Makefile: make most operations "quiet"
83
-
84
-* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits
85
- + Documentation/Makefile: break up texi pipeline
86
- + Documentation/Makefile: make most operations "quiet"
87
-
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
91
- + Fix branch -m @{-1} newname
92
- + check-ref-format --branch: give Porcelain a way to grok branch
93
- shorthand
94
- + strbuf_branchname(): a wrapper for branch name shorthands
95
- + Rename interpret/substitute nth_last_branch functions
96
-
97
-* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits
98
- + log-tree: fix patch filename computation in "git format-patch"
99
- + format-patch: --numbered-files and --stdout aren't mutually
100
- exclusive
101
- + format-patch: --attach/inline uses filename instead of SHA1
102
- + format-patch: move get_patch_filename() into log-tree
103
- + format-patch: pass a commit to reopen_stdout()
104
- + format-patch: construct patch filename in one function
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
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
113
- should look like
114
- + move_temp_to_file(): do not forget to chmod() in "Coda hack"
115
- codepath
116
- + Move chmod(foo, 0444) into move_temp_to_file()
117
- + "core.sharedrepository = 0mode" should set, not loosen
118
-
119
-* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit
120
- + Documentation: format-patch --root clarifications
121
-
122
-* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit
123
- + format-patch: add arbitrary email headers
124
-
125
-* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits
126
- + builtin-fast-export.c: handle nested tags
127
- + builtin-fast-export.c: fix crash on tagged trees
128
- + builtin-fast-export.c: turn error into warning
129
- + test-suite: adding a test for fast-export with tag variants
130
-
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
-
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
137
- + t7700: demonstrate repack flaw which may loosen objects
138
- unnecessarily
139
- + Remove --kept-pack-only option and associated infrastructure
140
- + pack-objects: only repack or loosen objects residing in "local"
141
- packs
142
- + git-repack.sh: don't use --kept-pack-only option to pack-objects
143
- + t7700-repack: add two new tests demonstrating repacking flaws
128
+* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
129
+ + bisect--helper: string output variables together with "&&"
130
+ + rev-list: pass "int flags" as last argument of "show_bisect_vars"
131
+ + t6030: test bisecting with paths
132
+ + bisect: use "bisect--helper" and remove "filter_skipped" function
133
+ + bisect: implement "read_bisect_paths" to read paths in
134
+ "$GIT_DIR/BISECT_NAMES"
135
+ + bisect--helper: implement "git bisect--helper"
136
+ + bisect: use the new generic "sha1_pos" function to lookup sha1
137
+ + rev-list: call new "filter_skip" function
138
+ + Merge branch 'cc/sha1-bsearch' into HEAD
139
+ + patch-ids: use the new generic "sha1_pos" function to lookup sha1
140
+ + sha1-lookup: add new "sha1_pos" function to efficiently lookup
141
+ sha1
142
+ + rev-list: pass "revs" to "show_bisect_vars"
143
+ + rev-list: make "show_bisect_vars" non static
144
+ + rev-list: move code to show bisect vars into its own function
145
+ + rev-list: move bisect related code into its own file
146
+ + rev-list: make "bisect_list" variable local to "cmd_rev_list"
147
+ + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
148
+ functions
149
+ + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
150
+ array
151
+ + quote: implement "sq_dequote_many" to unwrap many args in one
152
+ string
153
154
----------------------------------------------------------------
155
[Stalled and may need help and prodding to go forward]
@@ -158,12 +167,6 @@ The one I posted had a few corner-case bugs that was caught with the test
167
suite; this one has them fixed. People did not like the UI so it is kept
168
out of 'next'
169
161
-* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
162
- - archive.c: add support for --submodules[=(all|checkedout)]
163
-
164
-Discussion stalled on the submodule selection criteria.
165
-Probably I should discard it and wait for a reroll if needed.
166
-
170
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
171
- git-merge-file: allow converting the results for the work tree
172
@@ -184,10 +187,10 @@ canonical representation and possibly add conflict markers, and then write
187
the results out after convert_to_working_tree(). It also needs to write
188
in binary mode as well.
189
187
-* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
188
- - Support fetching from foreign VCSes
189
- - Add specification of git-vcs helpers
190
- - Add "vcs" config option in remotes
190
+* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
191
+ - Add option for using a foreign VCS
192
+ - Document details of transport function APIs
193
+ - Allow late reporting of fetched hashes
194
195
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
196
- tests: fix "export var=val"
@@ -223,66 +226,27 @@ to resolve issues these tests identify.
226
----------------------------------------------------------------
227
[Actively cooking]
228
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
229
+* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
230
+ - mergetool--lib: simplify API usage by removing more global
231
+ variables
232
+ - Fix misspelled mergetool.keepBackup
233
+ - difftool/mergetool: refactor commands to use git-mergetool--lib
234
- mergetool: use $( ... ) instead of `backticks`
235
+ - bash completion: add git-difftool
236
- difftool: add support for a difftool.prompt config variable
237
+ - difftool: add various git-difftool tests
238
+ - difftool: move 'git-difftool' out of contrib
239
+ - difftool/mergetool: add diffuse as merge and diff tool
240
- difftool: add a -y shortcut for --no-prompt
241
- 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
-
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
242
+ - difftool: remove the backup file feature
243
+ - difftool: remove merge options for opendiff, tkdiff, kdiff3 and
244
+ xxdiff
245
+ - git-mergetool: add new merge tool TortoiseMerge
246
+ - git-mergetool/difftool: make (g)vimdiff workable under Windows
247
+ - doc/merge-config: list ecmerge as a built-in merge tool
248
+
249
+* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
250
- builtin-replace: use "usage_msg_opt" to give better error messages
251
- parse-options: add new function "usage_msg_opt"
252
- builtin-replace: teach "git replace" to actually replace
@@ -295,11 +259,9 @@ move this to 'next' soonish and aim to have it in 1.6.3
259
- replace_object: add mechanism to replace objects found in
260
"refs/replace/"
261
- 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
262
302
-Re-rolled based on the updated binary search API.
263
+I suspect an attempt to replace an object that is directly listed on the
264
+command line would not work very well with this series.
265
266
----------------------------------------------------------------
267
[On Hold]