What's cooking (2011/05 #04)
Junio C Hamano committed
May 8, 2011 at 22:28 UTC
fd623fa2e8e3b546bd7b25c64122f0846cc3aa1e
1 file changed
+141
-111
whats-cooking.txt
+141
-111
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #03; Fri, 6)
2
+Subject: What's cooking in git.git (May 2011, #04; Sun, 8)
3
X-master-at: 4e3aa87d13b339fa678cd3cb7f23664d3a48fb21
4
-X-next-at: 711ff7850102428a21459848c6ae899101e93bc6
4
+X-next-at: 761178c48dcef128045e10696ae41e2d891a5987
5
6
-What's cooking in git.git (May 2011, #03; Fri, 6)
6
+What's cooking in git.git (May 2011, #04; Sun, 8)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,99 +12,97 @@ only in 'pu' while commits prefixed with '+' are in 'next'.
12
The main part of this cycle is expected to run thru May, aiming for a
13
feature freeze in early June.
14
15
-We are late in the week #2 of this cycle.
16
-
17
---------------------------------------------------
18
-[Graduated to "master"]
19
-
20
-* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
21
- (merged to 'next' on 2011-05-02 at 9a159a5)
22
- + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
23
-
24
-* cj/p4merge (2011-05-01) 1 commit
25
- (merged to 'next' on 2011-05-02 at 7197ef3)
26
- + Pass empty file to p4merge where no base is suitable.
27
-
28
-* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
29
- (merged to 'next' on 2011-05-02 at 5a89e3e)
30
- + Look for password in both CVS and CVSNT password files.
31
-
32
-* im/hashcmp-optim (2011-04-28) 1 commit
33
- (merged to 'next' on 2011-05-02 at f131195)
34
- + hashcmp(): inline memcmp() by hand to optimize
35
-
36
-* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
37
- (merged to 'next' on 2011-04-28 at f1f837c)
38
- + diff-files: show unmerged entries correctly
39
- + diff: remove often unused parameters from diff_unmerge()
40
- + diff.c: return filepair from diff_unmerge()
41
- + test: use $_z40 from test-lib
42
- (this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
43
-
44
-* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
45
- (merged to 'next' on 2011-04-28 at 587f2d4)
46
- + pretty: quote rfc822 specials in email addresses
47
-
48
-* jk/merge-one-file-working-tree (2011-04-29) 2 commits
49
- (merged to 'next' on 2011-05-02 at 308fe21)
50
- + merge-one-file: fix broken merges with alternate work trees
51
- + add tests for merge-index / merge-one-file
52
-
53
-* jn/run-command-error-failure (2011-04-20) 2 commits
54
- (merged to 'next' on 2011-04-26 at a1f171e)
55
- + run-command: handle short writes and EINTR in die_child
56
- + tests: check error message from run_command
57
-
58
-* js/blame-parsename (2011-05-05) 2 commits
59
- (merged to 'next' on 2011-05-05 at 1d5e505)
60
- + t/annotate-tests: Use echo & cat instead of sed
61
- (merged to 'next' on 2011-04-29 at 5fde945)
62
- + blame: tolerate bogus e-mail addresses a bit better
63
-
64
-* js/info-man-path (2011-05-02) 2 commits
65
- (merged to 'next' on 2011-05-02 at 20a15dd)
66
- + Documentation: clarify meaning of --html-path, --man-path, and --info-path
67
- + git: add --info-path and --man-path options
68
-
69
-* mg/alias-expose-prefix (2011-04-27) 2 commits
70
- (merged to 'next' on 2011-05-02 at 1c01d3a)
71
- + handle_alias: provide GIT_PREFIX to !alias
72
- + t1020: test !alias in subdirectory
73
-
74
-* mg/diff-uiconfig-doc (2011-04-27) 1 commit
75
- (merged to 'next' on 2011-05-02 at 579a515)
76
- + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
77
-
78
-* nd/struct-pathspec (2011-04-05) 5 commits
79
- (merged to 'next' on 2011-04-25 at 65dbe80)
80
- + pathspec: rename per-item field has_wildcard to use_wildcard
81
- + Improve tree_entry_interesting() handling code
82
- + Convert read_tree{,_recursive} to support struct pathspec
83
- + Reimplement read_tree_recursive() using tree_entry_interesting()
84
- + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
85
-
86
-* sg/completion-cleanup (2011-04-28) 2 commits
87
- + completion: remove unnecessary _get_comp_words_by_ref() invocations
88
- + completion: don't modify the $cur variable in completion functions
89
- (this branch is used by sg/completion-updates.)
15
+We are about to begin week #3.
16
17
--------------------------------------------------
18
[New Topics]
19
94
-* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit
95
- - fast-import: fix option parser for no-arg options
96
-
97
-Will merge to "next".
98
-
99
-* jc/advice-about-to-lose-commit (2011-05-06) 1 commit
100
- - checkout: honor advice.detachedHead when reattaching to a branch
101
-
102
-A weather-balloon.
103
-
104
-* mg/merge-ff-config (2011-05-06) 2 commits
105
- - merge: introduce merge.ff configuration variable
106
- - Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
107
- (this branch uses jc/maint-branch-mergeoptions.)
20
+* bf/commit-template-no-cleanup (2011-05-08) 1 commit
21
+ - Do not strip empty lines / trailing spaces from a commit message template
22
+
23
+* ci/commit--interactive-atomic (2011-05-07) 4 commits
24
+ - Add commit to list of config.singlekey commands
25
+ - Add support for -p/--patch to git-commit
26
+ - Allow git commit --interactive with paths
27
+ - Use a temporary index for git commit --interactive
28
+ (this branch uses vh/config-interactive-singlekey-doc.)
29
+
30
+* jn/gitweb-dependency (2011-05-07) 2 commits
31
+ (merged to 'next' on 2011-05-08 at 9101342)
32
+ + Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
33
+ + git-instaweb: Simplify build dependency on gitweb
34
+
35
+* jn/maint-test-merge-verify-parents (2011-05-06) 2 commits
36
+ (merged to 'next' on 2011-05-08 at 35a7c66)
37
+ + tests: teach verify_parents to check for extra parents
38
+ + tests: eliminate unnecessary setup test assertions
39
+
40
+* rr/rerere-libify-clear-gc (2011-05-08) 1 commit
41
+ - rerere: libify rerere_clear() and rerere_gc()
42
+
43
+This is pure code movement. Changing them to suit the need of other
44
+callers can be built on it as separate patches.
45
+
46
+* ab/i18n-scripts (2011-05-08) 48 commits
47
+ - i18n: git-bisect bisect_next_check "You need to" message
48
+ - i18n: git-bisect [Y/n] messages
49
+ - i18n: git-bisect bisect_replay + $1 messages
50
+ - i18n: git-bisect bisect_reset + $1 messages
51
+ - i18n: git-bisect bisect_run + $@ messages
52
+ - i18n: git-bisect die + eval_gettext messages
53
+ - i18n: git-bisect die + gettext messages
54
+ - i18n: git-bisect echo + eval_gettext message
55
+ - i18n: git-bisect echo + gettext messages
56
+ - i18n: git-bisect gettext + echo message
57
+ - i18n: git-bisect add git-sh-i18n
58
+ - i18n: git-stash drop_stash say/die messages
59
+ - i18n: git-stash "unknown option" message
60
+ - i18n: git-stash die + eval_gettext $1 messages
61
+ - i18n: git-stash die + eval_gettext $* messages
62
+ - i18n: git-stash die + eval_gettext messages
63
+ - i18n: git-stash die + gettext messages
64
+ - i18n: git-stash say + gettext messages
65
+ - i18n: git-stash echo + gettext message
66
+ - i18n: git-stash add git-sh-i18n
67
+ - i18n: git-submodule "blob" and "submodule" messages
68
+ - i18n: git-submodule "path not initialized" message
69
+ - i18n: git-submodule "[...] path is ignored" message
70
+ - i18n: git-submodule "Entering [...]" message
71
+ - i18n: git-submodule $errmsg messages
72
+ - i18n: git-submodule "Submodule change[...]" messages
73
+ - i18n: git-submodule "cached cannot be used" message
74
+ - i18n: git-submodule $update_module say + die messages
75
+ - i18n: git-submodule die + eval_gettext messages
76
+ - i18n: git-submodule say + eval_gettext messages
77
+ - i18n: git-submodule echo + eval_gettext messages
78
+ - i18n: git-submodule add git-sh-i18n
79
+ - i18n: git-pull eval_gettext + warning message
80
+ - i18n: git-pull eval_gettext + die message
81
+ - i18n: git-pull die messages
82
+ - i18n: git-pull add git-sh-i18n
83
+ - i18n: git-am printf(1) message to eval_gettext
84
+ - i18n: git-am core say messages
85
+ - i18n: git-am "Falling back" say message
86
+ - i18n: git-am "Apply?" message
87
+ - i18n: git-am clean_abort messages
88
+ - i18n: git-am cannot_fallback messages
89
+ - i18n: git-am die messages
90
+ - i18n: git-am echo + gettext message
91
+ - i18n: git-am eval_gettext messages
92
+ - i18n: git-am multi-line getttext $msg; echo
93
+ - i18n: git-am one-line gettext $msg; echo
94
+ - i18n: git-am add git-sh-i18n
95
+ (this branch uses ab/i18n-scripts-basic.)
96
+
97
+* ab/i18n-scripts-basic (2011-05-08) 4 commits
98
+ - Makefile: add xgettext target for *.sh files
99
+ - git-sh-i18n.sh: add GIT_GETTEXT_POISON support
100
+ - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
101
+ - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
102
+ (this branch is used by ab/i18n-scripts.)
103
+
104
+* jc/t1506-shell-param-expansion-gotcha (2011-05-08) 1 commit
105
+ - t1507: avoid "${parameter<op>'word'}" inside double-quotes
106
107
--------------------------------------------------
108
[Stalled]
@@ -173,12 +171,6 @@ is a sane use case, though.
171
172
Peff wanted to reroll this.
173
176
-* rr/rerere-clear-libify (2011-04-13) 1 commit
177
- - rerere: Expose an API corresponding to 'clear' functionality
178
-
179
-Jonathan had good comments on moving the garbage collection interface as
180
-well. Perhaps needs a re-roll.
181
-
174
* jc/index-pack (2011-02-25) 5 commits
175
- index-pack --verify: read anomalous offsets from v2 idx file
176
- write_idx_file: need_large_offset() helper function
@@ -200,19 +192,36 @@ flags needs to be rethought, or at least the helper needs to be moved to
192
builtin/tag.c to make it clear that it should not be used outside the
193
current usage context.
194
195
+* jc/advice-about-to-lose-commit (2011-05-06) 1 commit
196
+ - checkout: honor advice.detachedHead when reattaching to a branch
197
+
198
+Needs to tighten the advice to only govern the generic How-to part.
199
+
200
--------------------------------------------------
201
[Cooking]
202
203
+* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit
204
+ (merged to 'next' on 2011-05-08 at 367b148)
205
+ + fast-import: fix option parser for no-arg options
206
+
207
+Will merge to "master".
208
+
209
+* mg/merge-ff-config (2011-05-06) 3 commits
210
+ (merged to 'next' on 2011-05-08 at 977b432)
211
+ + tests: check git does not barf on merge.ff values for future versions of git
212
+ + merge: introduce merge.ff configuration variable
213
+ + Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
214
+ (this branch uses jc/maint-branch-mergeoptions.)
215
+
216
* mk/grep-pcre (2011-05-05) 3 commits
207
- - grep: Put calls to fixmatch() and regmatch() into patmatch()
208
- - contrib/completion: --line-number to git grep
209
- - Documentation: Add --line-number to git-grep synopsis
217
+ (merged to 'next' on 2011-05-08 at 5d3bede)
218
+ + grep: Put calls to fixmatch() and regmatch() into patmatch()
219
+ + contrib/completion: --line-number to git grep
220
+ + Documentation: Add --line-number to git-grep synopsis
221
222
This is without the real PCRE integration. The above three looked
223
reasonable clean-ups regardless.
224
214
-Will merge to "next".
215
-
225
* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits
226
(merged to 'next' on 2011-05-06 at 46b522c)
227
+ git-reset.txt: better docs for '--patch'
@@ -220,9 +229,11 @@ Will merge to "next".
229
+ git-stash.txt: better docs for '--patch'
230
+ git-add.txt: document 'interactive.singlekey'
231
+ config.txt: 'interactive.singlekey; is used by...
232
+ (this branch is used by ci/commit--interactive-atomic.)
233
234
* jc/maint-branch-mergeoptions (2011-05-04) 1 commit
225
- - merge: fix branch.<name>.mergeoptions
235
+ (merged to 'next' on 2011-05-08 at fa6b154)
236
+ + merge: make branch.<name>.mergeoptions correctly override merge.<option>
237
(this branch is used by mg/merge-ff-config.)
238
239
Fix branch.<name>.mergeoptions that does not override merge.<option>; this
@@ -235,6 +246,8 @@ is needed for the "merge.ff" configuration topic to correctly work.
246
+ gitweb: Restructure projects list generation
247
(this branch is used by jn/ctags-more.)
248
249
+Will merge to "master".
250
+
251
* dm/http-cleanup (2011-05-05) 4 commits
252
(merged to 'next' on 2011-05-06 at 711ff78)
253
+ t5541-http-push: add test for chunked
@@ -242,25 +255,34 @@ is needed for the "merge.ff" configuration topic to correctly work.
255
+ http-push: use const for strings in signatures
256
+ http: make curl callbacks match contracts from curl header
257
245
-* sg/completion-updates (2011-04-28) 1 commit
258
+Will merge to "master".
259
+
260
+* sg/completion-updates (2011-04-27) 2 commits
261
+ (merged to 'next' on 2011-05-08 at 761178c)
262
+ + completion: move private shopt shim for zsh to __git_ namespace
263
(merged to 'next' on 2011-05-02 at 0fd443a)
264
+ completion: don't declare 'local words' to make zsh happy
265
249
-* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
266
+With an update from Jonathan.
267
+Will merge to "master".
268
+
269
+* jc/maint-add-p-overlapping-hunks (2011-05-08) 5 commits
270
+ (merged to 'next' on 2011-05-08 at bcf9228)
271
+ + t3701: add-p-fix makes the last test to pass
272
(merged to 'next' on 2011-05-02 at e57b66f)
273
+ "add -p": work-around an old laziness that does not coalesce hunks
274
+ add--interactive.perl: factor out repeated --recount option
275
+ t3701: Editing a split hunk in an "add -p" session
276
+ add -p: 'q' should really quit
277
256
-Probably needs tests.
278
+Will merge to "master".
279
258
-* ld/p4-preserve-user-names (2011-04-21) 1 commit
280
+* ld/p4-preserve-user-names (2011-05-07) 2 commits
281
+ - git-p4: small improvements to user-preservation
282
(merged to 'next' on 2011-04-29 at 25116c8)
283
+ git-p4: add option to preserve user names
284
262
-Luke wants to update this, so will not be merging to "master" until the
263
-update settles down.
285
+An incremental update waiting for a re-review.
286
287
* jh/dirstat-lines (2011-04-29) 8 commits
288
(merged to 'next' on 2011-04-29 at a302674)
@@ -320,4 +342,12 @@ Will merge to "master" by the end of week #3.
342
Thanks to Peff, Duy, and Michael for helping to whip the syntax and the
343
basic semantics into a not-so-horrible shape. Duy wanted to add tests.
344
323
-Will merge to "master" by the end of week #3.
345
+Taking out of "will-merge-soon" list before all the tests pass.
346
+
347
+--------------------------------------------------
348
+[Discarded]
349
+
350
+* rr/rerere-clear-libify (2011-04-13) 1 commit
351
+ . rerere: Expose an API corresponding to 'clear' functionality
352
+
353
+Re-roll is happening...