What's cooking (2010/12 #07)
Junio C Hamano committed
Dec 28, 2010 at 14:13 UTC
971140908e3b87f48a539c226bb165fe348f66c8
1 file changed
+109
-183
whats-cooking.txt
+109
-183
@@ -1,61 +1,128 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2010, #06; Tue, 21)
3
-X-master-at: 853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3
4
-X-next-at: 8883a0cd5dc07da65afadda4c449e5c028ed63f7
2
+Subject: What's cooking in git.git (Dec 2010, #07; Tue, 28)
3
+X-master-at: 01b97a4cb60723d18b437efdc474503d2a9dd384
4
+X-next-at: dee8dc8369a19c1b8b12dd40bf3a563a7524825b
5
6
-What's cooking in git.git (Dec 2010, #06; Tue, 21)
6
+What's cooking in git.git (Dec 2010, #07; Tue, 28)
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 integration branches, but I am
12
-still holding onto them.
10
+only in 'pu' while commits prefixed with '+' are in 'next'.
11
14
-I'd like to merge nd/setup, nd/struct-pathspec, and everything in
15
-tonight's 'next' soon and tag 1.7.4-rc1 but I might be being a bit too
16
-ambitious.
17
---------------------------------------------------
18
-[Graduated to "master"]
12
+We are finally at 1.7.4-rc0 as of tonight ;-).
13
20
-* jk/maint-decorate-01-bool (2010-12-18) 1 commit
21
- (merged to 'next' on 2010-12-20 at 72471ca)
22
- + handle arbitrary ints in git_config_maybe_bool
14
+--------------------------------------------------
15
+[New Topics]
16
24
-* jk/t2107-now-passes (2010-12-18) 1 commit
25
- (merged to 'next' on 2010-12-20 at c9156b5)
26
- + t2107: mark passing test as success
17
+* ae/better-template-failure-report (2010-12-18) 1 commit
18
+ - Improve error messages when temporary file creation fails
19
28
-* jn/maint-gitweb-pathinfo-fix (2010-12-14) 1 commit
29
- (merged to 'next' on 2010-12-14 at 1af8cca)
30
- + gitweb: Fix handling of whitespace in generated links
20
+* jc/unpack-trees (2010-12-22) 2 commits
21
+ - unpack_trees(): skip trees that are the same in all input
22
+ - unpack-trees.c: cosmetic fix
23
32
-* ks/blame-worktree-textconv-cached (2010-12-18) 2 commits
33
- (merged to 'next' on 2010-12-20 at 459c940)
34
- + fill_textconv(): Don't get/put cache if sha1 is not valid
35
- + t/t8006: Demonstrate blame is broken when cachetextconv is on
24
+* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
25
+ - cherry-pick/revert: add support for -X/--strategy-option
26
37
-* nd/oneline-sha1-name-from-specific-ref (2010-12-15) 4 commits
38
- (merged to 'next' on 2010-12-20 at 553cf37)
39
- + get_sha1: handle special case $commit^{/}
40
- + get_sha1: support $commit^{/regex} syntax
41
- + get_sha1_oneline: make callers prepare the commit list to traverse
42
- + get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
27
+* jn/perl-funcname (2010-12-27) 2 commits
28
+ - userdiff/perl: catch BEGIN/END/... and POD as headers
29
+ - diff: funcname and word patterns for perl
30
44
-* tc/completion-reflog (2010-12-16) 1 commit
45
- (merged to 'next' on 2010-12-20 at 2fa91e0)
46
- + bash completion: add basic support for git-reflog
31
+* pw/convert-pathname-substitution (2010-12-22) 2 commits
32
+ - t0021: avoid getting filter killed with SIGPIPE
33
+ - convert filter: supply path to external driver
34
35
--------------------------------------------------
49
-[New Topics]
36
+[Graduated to "master"]
37
+
38
+* jc/maint-am-abort-safely (2010-12-21) 1 commit
39
+ (merged to 'next' on 2010-12-21 at 81602bc)
40
+ + am --abort: keep unrelated commits since the last failure and warn
41
42
* jk/commit-die-on-bogus-ident (2010-12-20) 2 commits
43
(merged to 'next' on 2010-12-21 at 7785c31)
44
+ commit: die before asking to edit the log message
45
+ ident: die on bogus date format
46
56
-* jc/maint-am-abort-safely (2010-12-21) 1 commit
57
- (merged to 'next' on 2010-12-21 at 81602bc)
58
- + am --abort: keep unrelated commits since the last failure and warn
47
+* nd/maint-fix-add-typo-detection (2010-11-27) 5 commits
48
+ (merged to 'next' on 2010-12-21 at 87c702b)
49
+ + Revert "excluded_1(): support exclude files in index"
50
+ + unpack-trees: fix sparse checkout's "unable to match directories"
51
+ + unpack-trees: move all skip-worktree checks back to unpack_trees()
52
+ + dir.c: add free_excludes()
53
+ + cache.h: realign and use (1 << x) form for CE_* constants
54
+
55
+* nd/setup (2010-11-26) 47 commits
56
+ (merged to 'next' on 2010-12-23 at a2bc4196)
57
+ + setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
58
+ + git.txt: correct where --work-tree path is relative to
59
+ + Revert "Documentation: always respect core.worktree if set"
60
+ + t0001: test git init when run via an alias
61
+ + Remove all logic from get_git_work_tree()
62
+ + setup: rework setup_explicit_git_dir()
63
+ + setup: clean up setup_discovered_git_dir()
64
+ + t1020-subdirectory: test alias expansion in a subdirectory
65
+ + setup: clean up setup_bare_git_dir()
66
+ + setup: limit get_git_work_tree()'s to explicit setup case only
67
+ + Use git_config_early() instead of git_config() during repo setup
68
+ + Add git_config_early()
69
+ + git-rev-parse.txt: clarify --git-dir
70
+ + t1510: setup case #31
71
+ + t1510: setup case #30
72
+ + t1510: setup case #29
73
+ + t1510: setup case #28
74
+ + t1510: setup case #27
75
+ + t1510: setup case #26
76
+ + t1510: setup case #25
77
+ + t1510: setup case #24
78
+ + t1510: setup case #23
79
+ + t1510: setup case #22
80
+ + t1510: setup case #21
81
+ + t1510: setup case #20
82
+ + t1510: setup case #19
83
+ + t1510: setup case #18
84
+ + t1510: setup case #17
85
+ + t1510: setup case #16
86
+ + t1510: setup case #15
87
+ + t1510: setup case #14
88
+ + t1510: setup case #13
89
+ + t1510: setup case #12
90
+ + t1510: setup case #11
91
+ + t1510: setup case #10
92
+ + t1510: setup case #9
93
+ + t1510: setup case #8
94
+ + t1510: setup case #7
95
+ + t1510: setup case #6
96
+ + t1510: setup case #5
97
+ + t1510: setup case #4
98
+ + t1510: setup case #3
99
+ + t1510: setup case #2
100
+ + t1510: setup case #1
101
+ + t1510: setup case #0
102
+ + Add t1510 and basic rules that run repo setup
103
+ + builtins: print setup info if repo is found
104
+
105
+* pd/bash-4-completion (2010-12-15) 3 commits
106
+ (merged to 'next' on 2010-12-21 at dbf80ff)
107
+ + Merge branch 'master' (early part) into pd/bash-4-completion
108
+ + bash: simple reimplementation of _get_comp_words_by_ref
109
+ + bash: get --pretty=m<tab> completion to work with bash v4
110
+
111
+* rj/maint-difftool-cygwin-workaround (2010-12-14) 1 commit
112
+ (merged to 'next' on 2010-12-21 at 74b9069)
113
+ + difftool: Fix failure on Cygwin
114
+
115
+* rj/maint-test-fixes (2010-12-14) 5 commits
116
+ (merged to 'next' on 2010-12-21 at 8883a0c)
117
+ + t9501-*.sh: Fix a test failure on Cygwin
118
+ + lib-git-svn.sh: Add check for mis-configured web server variables
119
+ + lib-git-svn.sh: Avoid setting web server variables unnecessarily
120
+ + t9142: Move call to start_httpd into the setup test
121
+ + t3600-rm.sh: Don't pass a non-existent prereq to test #15
122
+
123
+* tf/commit-list-prefix (2010-11-26) 1 commit
124
+ (merged to 'next' on 2010-12-21 at 16e1351)
125
+ + commit: Add commit_list prefix in two function names.
126
127
--------------------------------------------------
128
[Stalled]
@@ -96,27 +163,9 @@ flags needs to be rethought, or at least the helper needs to be moved to
163
builtin/tag.c to make it clear that it should not be used outside the
164
current usage context.
165
99
-* tr/config-doc (2010-10-24) 2 commits
100
- . Documentation: complete config list from other manpages
101
- . Documentation: Move variables from config.txt to separate file
102
-
103
-This unfortunately heavily conflicts with patches in flight...
104
-
166
--------------------------------------------------
167
[Cooking]
168
108
-* rj/maint-difftool-cygwin-workaround (2010-12-14) 1 commit
109
- (merged to 'next' on 2010-12-21 at 74b9069)
110
- + difftool: Fix failure on Cygwin
111
-
112
-* rj/maint-test-fixes (2010-12-14) 5 commits
113
- (merged to 'next' on 2010-12-21 at 8883a0c)
114
- + t9501-*.sh: Fix a test failure on Cygwin
115
- + lib-git-svn.sh: Add check for mis-configured web server variables
116
- + lib-git-svn.sh: Avoid setting web server variables unnecessarily
117
- + t9142: Move call to start_httpd into the setup test
118
- + t3600-rm.sh: Don't pass a non-existent prereq to test #15
119
-
169
* rj/test-fixes (2010-12-14) 4 commits
170
- t4135-*.sh: Skip the "backslash" tests on cygwin
171
- t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
@@ -131,18 +180,6 @@ hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs
180
outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels
181
safer and saner.
182
134
-* by/log-l (2010-12-14) 8 commits
135
- . log -L: implement move/copy detection (-M/-C)
136
- . log -L: add --full-line-diff option
137
- . log -L: add --graph prefix before output
138
- . log -L: support parent rewriting
139
- . Implement line-history search (git log -L)
140
- . Export rewrite_parents() for 'log -L'
141
- . Export three functions from diff.c
142
- . Refactor parse_loc
143
-
144
-Seems to have some bad interactions with nd/struct-pathspec.
145
-
183
* hv/mingw-fs-funnies (2010-12-14) 5 commits
184
- mingw_rmdir: set errno=ENOTEMPTY when appropriate
185
- mingw: add fallback for rmdir in case directory is in use
@@ -150,20 +187,7 @@ Seems to have some bad interactions with nd/struct-pathspec.
187
- mingw: work around irregular failures of unlink on windows
188
- mingw: move unlink wrapper to mingw.c
189
153
-Can somebody remind me what the status of this series is?
154
-
155
-* tf/commit-list-prefix (2010-11-26) 1 commit
156
- (merged to 'next' on 2010-12-21 at 16e1351)
157
- + commit: Add commit_list prefix in two function names.
158
-
159
-This churn already introduced an unnecessary conflict. It is not by
160
-itself a biggie, but these things tend to add up.
161
-
162
-* pd/bash-4-completion (2010-12-15) 3 commits
163
- (merged to 'next' on 2010-12-21 at dbf80ff)
164
- + Merge branch 'master' (early part) into pd/bash-4-completion
165
- + bash: simple reimplementation of _get_comp_words_by_ref
166
- + bash: get --pretty=m<tab> completion to work with bash v4
190
+Will be rerolled (Heiko, 2010-12-23)
191
192
* jn/svn-fe (2010-12-06) 18 commits
193
- vcs-svn: Allow change nodes for root of tree (/)
@@ -187,106 +211,6 @@ itself a biggie, but these things tend to add up.
211
212
Some RFC patches, to give them early and wider exposure.
213
190
-* nd/maint-fix-add-typo-detection (2010-11-27) 5 commits
191
- (merged to 'next' on 2010-12-21 at 87c702b)
192
- + Revert "excluded_1(): support exclude files in index"
193
- + unpack-trees: fix sparse checkout's "unable to match directories"
194
- + unpack-trees: move all skip-worktree checks back to unpack_trees()
195
- + dir.c: add free_excludes()
196
- + cache.h: realign and use (1 << x) form for CE_* constants
197
-
198
-* jh/gitweb-caching (2010-12-03) 4 commits
199
- . gitweb: Minimal testing of gitweb caching
200
- . gitweb: File based caching layer (from git.kernel.org)
201
- . gitweb: add output buffering and associated functions
202
- . gitweb: Prepare for splitting gitweb
203
-
204
-Previous iteration; dropped.
205
-
206
-* jh/gitweb-caching-8 (2010-12-09) 18 commits
207
- . gitweb: Add better error handling for gitweb caching
208
- . gitweb: Prepare for cached error pages & better error page handling
209
- . gitweb: When changing output (STDOUT) change STDERR as well
210
- . gitweb: Add show_warning() to display an immediate warning, with refresh
211
- . gitweb: add print_transient_header() function for central header printing
212
- . gitweb: Add commented url & url hash to page footer
213
- . gitweb: Change file handles (in caching) to lexical variables as opposed to globs
214
- . gitweb: add isDumbClient() check
215
- . gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type
216
- . gitweb: Revert reset_output() back to original code
217
- . gitweb: Change is_cacheable() to return true always
218
- . gitweb: Revert back to $cache_enable vs. $caching_enabled
219
- . gitweb: Add more explicit means of disabling 'Generating...' page
220
- . gitweb: Regression fix concerning binary output of files
221
- . gitweb: Minimal testing of gitweb caching
222
- . gitweb: File based caching layer (from git.kernel.org)
223
- . gitweb: add output buffering and associated functions
224
- . gitweb: Prepare for splitting gitweb
225
-
226
-It appears that John and Jakub are finally working together to help
227
-producing something that we can ship in-tree, finally. I am looking
228
-forward to seeing the conclusion of the discussion.
229
-
230
-* nd/setup (2010-11-26) 47 commits
231
- - git.txt: correct where --work-tree path is relative to
232
- - Revert "Documentation: always respect core.worktree if set"
233
- - t0001: test git init when run via an alias
234
- - Remove all logic from get_git_work_tree()
235
- - setup: rework setup_explicit_git_dir()
236
- - setup: clean up setup_discovered_git_dir()
237
- - t1020-subdirectory: test alias expansion in a subdirectory
238
- - setup: clean up setup_bare_git_dir()
239
- - setup: limit get_git_work_tree()'s to explicit setup case only
240
- - Use git_config_early() instead of git_config() during repo setup
241
- - Add git_config_early()
242
- - rev-parse: prints --git-dir relative to user's cwd
243
- - git-rev-parse.txt: clarify --git-dir
244
- - t1510: setup case #31
245
- - t1510: setup case #30
246
- - t1510: setup case #29
247
- - t1510: setup case #28
248
- - t1510: setup case #27
249
- - t1510: setup case #26
250
- - t1510: setup case #25
251
- - t1510: setup case #24
252
- - t1510: setup case #23
253
- - t1510: setup case #22
254
- - t1510: setup case #21
255
- - t1510: setup case #20
256
- - t1510: setup case #19
257
- - t1510: setup case #18
258
- - t1510: setup case #17
259
- - t1510: setup case #16
260
- - t1510: setup case #15
261
- - t1510: setup case #14
262
- - t1510: setup case #13
263
- - t1510: setup case #12
264
- - t1510: setup case #11
265
- - t1510: setup case #10
266
- - t1510: setup case #9
267
- - t1510: setup case #8
268
- - t1510: setup case #7
269
- - t1510: setup case #6
270
- - t1510: setup case #5
271
- - t1510: setup case #4
272
- - t1510: setup case #3
273
- - t1510: setup case #2
274
- - t1510: setup case #1
275
- - t1510: setup case #0
276
- - Add t1510 and basic rules that run repo setup
277
- - builtins: print setup info if repo is found
278
-
279
-Need to re-read this series to move it forward.
280
-
281
-* yd/dir-rename (2010-10-29) 5 commits
282
- - Allow hiding renames of individual files involved in a directory rename.
283
- - Unified diff output format for bulk moves.
284
- - Add testcases for the --detect-bulk-moves diffcore flag.
285
- - Raw diff output format for bulk moves.
286
- - Introduce bulk-move detection in diffcore.
287
-
288
-Need to re-queue the reroll.
289
-
214
* nd/struct-pathspec (2010-12-15) 21 commits
215
- t7810: overlapping pathspecs and depth limit
216
- grep: drop pathspec_matches() in favor of tree_entry_interesting()
@@ -311,13 +235,15 @@ Need to re-queue the reroll.
235
- Add struct pathspec
236
(this branch is used by en/object-list-with-pathspec.)
237
314
-Rerolled again. Getting nicer by the round ;-)
238
+On hold, perhaps in 'next', til 1.7.4 final.
239
240
* en/object-list-with-pathspec (2010-09-20) 2 commits
241
- Add testcases showing how pathspecs are handled with rev-list --objects
242
- Make rev-list --objects work together with pathspecs
243
(this branch uses nd/struct-pathspec.)
244
245
+On hold, perhaps in 'next', til 1.7.4 final.
246
+
247
* tr/merge-unborn-clobber (2010-08-22) 1 commit
248
- Exhibit merge bug that clobbers index&WT
249