What's cooking (2009/04 #03)
Junio C Hamano committed
Apr 15, 2009 at 22:46 UTC
40b523eff97a9f74ba81fbbbeca752d248fd9cf1
1 file changed
+111
-135
whats-cooking.txt
+111
-135
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2009, #02; Sun, 12)
3
-X-master-at: c965c029330b1f81cc107c5d829e7fd79c61d8ea
4
-X-next-at: d07d5c8f15ddd1f2569e1778cb82501a201d2f22
2
+Subject: What's cooking in git.git (Apr 2009, #03; Wed, 15)
3
+X-master-at: f800b65bea1504299747e7be03ee279508a74e1f
4
+X-next-at: 40869ef2c65a11295fc4c83e257fa4564b3e18f5
5
6
-What's cooking in git.git (Apr 2009, #02; Sun, 12)
6
+What's cooking in git.git (Apr 2009, #03; Wed, 15)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,146 +14,107 @@ 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.
17
+We are a bit past 1.6.3-rc0, and this report will show pretty much what
18
+the final should look like from the feature-set point-of-view.
19
20
----------------------------------------------------------------
21
[New Topics]
22
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.
23
+* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit
24
+ + graph API: Added logic for colored edges
25
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.
26
+This has been under discussion since before 1.6.3-rc0, hopefully in
27
+1.6.3-rc1.
28
31
-* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
32
- - Allow users to un-configure rename detection
29
+* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
30
+ - send-email: Remove superfluous `my $editor = ...'
31
+ - send-email: 'References:' should only reference what is sent
32
+ - send-email: Handle "GIT:" rather than "GIT: " during --compose
33
+ - Docs: send-email: --smtp-server-port can take symbolic ports
34
+ - Docs: send-email: Refer to CONFIGURATION section for
35
+ sendemail.multiedit
36
+ - Docs: send-email: Put options back into alphabetical order
37
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.
38
+Only partially queued, but this is not 1.6.3 material and we are not in a
39
+hurry.
40
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
+* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits
42
+ + docs/checkout: clarify what "non-branch" means
43
+ + doc/checkout: split checkout and branch creation in synopsis
44
+ + doc/checkout: refer to git-branch(1) as appropriate
45
+ + doc: refer to tracking configuration as "upstream"
46
+ + doc: clarify --no-track option
47
42
-I think this is Ok for 1.6.3 but it needs new tests to protect the new
43
-feature from future breakages.
48
+For 1.6.3
49
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)
50
+* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits
51
+ + builtin-apply: keep information about files to be deleted
52
+ + tests: test applying criss-cross rename patch
53
48
-I am Ok with the general idea, but the error detection needs to be more
49
-robust than merely relying on --recount.
54
+For 1.6.3; perhaps needs to be cherry-picked to 1.6.2.X series as well.
55
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.
56
+----------------------------------------------------------------
57
+[Will merge to 'master' before 1.6.3-rc1]
58
54
-I think this is Ok for 1.6.3.
59
+* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
60
+ + git add -p: new "quit" command at the prompt.
61
+
62
+I did a minimal documentation update myself.
63
+
64
+* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
65
+ + git-shell: Add 'git-upload-archive' to allowed commands.
66
67
* 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
68
+ + Mark t1301 permission test to depend on POSIXPERM
69
+ + t1301-shared-repo: fix forced modes test
70
+
71
+* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit
72
+ + t1301-shared-repo: fix forced modes test
73
74
J6t's updates to fix permission tests and make sure they won't run on
75
systems without permission bits on the filesystem.
76
63
-I think this is Ok for 1.6.3.
64
-
77
* 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
78
+ + git-am: teach git-am to apply a patch to an unborn branch
79
68
-I think this is Ok for 1.6.3.
80
+* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits
81
+ + rev-parse: --abbrev-ref option to shorten ref name
82
+ + for-each-ref: utilize core.warnAmbiguousRefs for :short-format
83
+ + shorten_unambiguous_ref(): add strict mode
84
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
+* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
86
+ + mergetool--lib: simplify API usage by removing more global
87
+ variables
88
+ + Fix misspelled mergetool.keepBackup
89
+ + difftool/mergetool: refactor commands to use git-mergetool--lib
90
+ + mergetool: use $( ... ) instead of `backticks`
91
+ + bash completion: add git-difftool
92
+ + difftool: add support for a difftool.prompt config variable
93
+ + difftool: add various git-difftool tests
94
+ + difftool: move 'git-difftool' out of contrib
95
+ + difftool/mergetool: add diffuse as merge and diff tool
96
+ + difftool: add a -y shortcut for --no-prompt
97
+ + difftool: use perl built-ins when testing for msys
98
+ + difftool: remove the backup file feature
99
+ + difftool: remove merge options for opendiff, tkdiff, kdiff3 and
100
+ xxdiff
101
+ + git-mergetool: add new merge tool TortoiseMerge
102
+ + git-mergetool/difftool: make (g)vimdiff workable under Windows
103
+ + doc/merge-config: list ecmerge as a built-in merge tool
104
105
----------------------------------------------------------------
106
[Graduated to "master"]
107
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
-
92
-* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits
93
- + Speed up reflog pruning of unreachable commits
94
- + Clean up reflog unreachability pruning decision
95
-
96
-* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits
97
- + match_tree_entry(): a pathspec only matches at directory
98
- boundaries
99
- + tree_entry_interesting: a pathspec only matches at directory
100
- boundary
101
-
102
-* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit
103
- + Allow curl to rewind the read buffers
104
-
105
-* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit
106
- + Fix 'git checkout <submodule>' to update the index
107
-
108
-* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits
109
- + simplify output of conflicting merge
110
- + update cache for conflicting submodule entries
111
- + add tests for merging with submodules
112
-
113
-* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits
114
- + git remote update: New option --prune
115
- + builtin-remote.c: Split out prune_remote as a separate function.
116
-
117
-These should go to 'master' soonish.
118
-
119
-* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits
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
-
125
-* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
126
- + checkout -: make "-" to mean "previous branch" everywhere
127
-
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
108
+(none)
109
110
----------------------------------------------------------------
111
[Stalled and may need help and prodding to go forward]
112
113
+* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
114
+ + Allow users to un-configure rename detection
115
+
116
+Still lacks doc updates.
117
+
118
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
119
- blame.c: start libifying the blame infrastructure
120
@@ -192,7 +153,8 @@ in binary mode as well.
153
- Document details of transport function APIs
154
- Allow late reporting of fetched hashes
155
195
-* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
156
+* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
157
+ - Documentation: fix 'linkgit' macro in "git-notes.txt"
158
- tests: fix "export var=val"
159
- notes: refuse to edit notes outside refs/notes/
160
- t3301: use test_must_fail instead of !
@@ -226,27 +188,29 @@ to resolve issues these tests identify.
188
----------------------------------------------------------------
189
[Actively cooking]
190
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
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
191
+* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
192
+ + show_object(): push path_name() call further down
193
+ + process_{tree,blob}: show objects without buffering
194
+
195
+This had some conflicts with Christian's bisect topic; I think I resolved
196
+them correctly, but double-checking would be nice.
197
+
198
+* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits
199
+ + archive test: test new --fix-attributes feature
200
+ + archive: do not read .gitattributes in working directory
201
+ + unpack-trees: do not muck with attributes when we are not checking
202
+ out
203
+ + attr: add GIT_ATTR_INDEX "direction"
204
+ + archive tests: do not use .gitattributes in working directory
205
+
206
+With fix-ups from René and myself. Perhaps 1.6.3 material, perhaps not.
207
+
208
+* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
209
+ - git-add: introduce --edit (to edit the diff vs. the index)
210
249
-* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
211
+* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
212
+ - Documentation: add documentation for "git replace"
213
+ - Add git-replace to .gitignore
214
- builtin-replace: use "usage_msg_opt" to give better error messages
215
- parse-options: add new function "usage_msg_opt"
216
- builtin-replace: teach "git replace" to actually replace
@@ -263,6 +227,18 @@ to resolve issues these tests identify.
227
I suspect an attempt to replace an object that is directly listed on the
228
command line would not work very well with this series.
229
230
+----------------------------------------------------------------
231
+[Reverted]
232
+
233
+* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
234
+ + Add a test of "git cvsimport"'s handling of tags and branches
235
+ + Add some tests of git-cvsimport's handling of vendor branches
236
+ + Test contents of entire cvsimported "master" tree contents
237
+ + Use CVS's -f option if available (ignore user's ~/.cvsrc file)
238
+ + Start a library for cvsimport-related tests
239
+
240
+This has been reverted out of 'next' for some time now.
241
+
242
----------------------------------------------------------------
243
[On Hold]
244