What's cooking (2011/05 #05)
Junio C Hamano committed
May 11, 2011 at 13:08 UTC
af5a31b7adbc8b53dfb8102655b04d624b007418
1 file changed
+236
-173
whats-cooking.txt
+236
-173
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #04; Sun, 8)
3
-X-master-at: 4e3aa87d13b339fa678cd3cb7f23664d3a48fb21
4
-X-next-at: 761178c48dcef128045e10696ae41e2d891a5987
2
+Subject: What's cooking in git.git (May 2011, #05; Wed, 11)
3
+X-master-at: dbe9c5adf95e99c35dd728af2114fccfb9117c65
4
+X-next-at: 5aaf5cf1a3addf544db48634fb8abc1aec4e8174
5
6
-What's cooking in git.git (May 2011, #04; Sun, 8)
6
+What's cooking in git.git (May 2011, #05; Wed, 11)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,22 +12,40 @@ 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 about to begin week #3.
15
+We are in the middle of week #3.
16
17
--------------------------------------------------
18
-[New Topics]
18
+[Graduated to "master"]
19
20
-* bf/commit-template-no-cleanup (2011-05-08) 1 commit
21
- - Do not strip empty lines / trailing spaces from a commit message template
20
+* dm/http-cleanup (2011-05-04) 4 commits
21
+ (merged to 'next' on 2011-05-06 at 711ff78)
22
+ + t5541-http-push: add test for chunked
23
+ + http-push: refactor curl_easy_setup madness
24
+ + http-push: use const for strings in signatures
25
+ + http: make curl callbacks match contracts from curl header
26
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.)
27
+* jc/maint-add-p-overlapping-hunks (2011-05-08) 5 commits
28
+ (merged to 'next' on 2011-05-08 at bcf9228)
29
+ + t3701: add-p-fix makes the last test to pass
30
+ (merged to 'next' on 2011-05-02 at e57b66f)
31
+ + "add -p": work-around an old laziness that does not coalesce hunks
32
+ + add--interactive.perl: factor out repeated --recount option
33
+ + t3701: Editing a split hunk in an "add -p" session
34
+ + add -p: 'q' should really quit
35
30
-* jn/gitweb-dependency (2011-05-07) 2 commits
36
+* jc/maint-branch-mergeoptions (2011-05-06) 1 commit
37
+ (merged to 'next' on 2011-05-08 at fa6b154)
38
+ + merge: make branch.<name>.mergeoptions correctly override merge.<option>
39
+ (this branch is used by mg/merge-ff-config.)
40
+
41
+* jn/ctags (2011-04-29) 3 commits
42
+ (merged to 'next' on 2011-05-06 at 5c574ff)
43
+ + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
44
+ + gitweb: Change the way "content tags" ('ctags') are handled
45
+ + gitweb: Restructure projects list generation
46
+ (this branch is used by jn/ctags-more.)
47
+
48
+* jn/gitweb-dependency (2011-05-08) 2 commits
49
(merged to 'next' on 2011-05-08 at 9101342)
50
+ Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
51
+ git-instaweb: Simplify build dependency on gitweb
@@ -37,85 +55,70 @@ We are about to begin week #3.
55
+ tests: teach verify_parents to check for extra parents
56
+ tests: eliminate unnecessary setup test assertions
57
40
-* rr/rerere-libify-clear-gc (2011-05-08) 1 commit
41
- - rerere: libify rerere_clear() and rerere_gc()
58
+* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit
59
+ (merged to 'next' on 2011-05-08 at 367b148)
60
+ + fast-import: fix option parser for no-arg options
61
43
-This is pure code movement. Changing them to suit the need of other
44
-callers can be built on it as separate patches.
62
+* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits
63
+ (merged to 'next' on 2011-05-06 at 46b522c)
64
+ + git-reset.txt: better docs for '--patch'
65
+ + git-checkout.txt: better docs for '--patch'
66
+ + git-stash.txt: better docs for '--patch'
67
+ + git-add.txt: document 'interactive.singlekey'
68
+ + config.txt: 'interactive.singlekey; is used by...
69
+ (this branch is used by ci/commit--interactive-atomic.)
70
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.)
71
+--------------------------------------------------
72
+[New Topics]
73
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.)
74
+* jc/bigfile (2011-05-09) 3 commits
75
+ - Bigfile: teach "git add" to send a large file straight to a pack
76
+ - index_fd(): split into two helper functions
77
+ - index_fd(): turn write_object and format_check arguments into one flag
78
+
79
+This covers the entry point for a big file to the system. Other parts that
80
+need to know about them are the exit point (i.e. write_entry()), packing
81
+and repacking (as long as bigfilethreshold is sane this should work),
82
+diffs and status (avoid slurping large binary in core only to do nothing,
83
+which we already should), and transport (receive-pack/fetch-pack call
84
+either unpack-objects or index-pack, which still want to hold the full
85
+object in-core and need to be fixed).
86
+
87
+* jc/convert (2011-05-09) 4 commits
88
+ - convert: make it harder to screw up adding a conversion attribute
89
+ - convert: make it safer to add conversion attributes
90
+ - convert: give saner names to crlf/eol variables, types and functions
91
+ - convert: rename the "eol" global variable to "core_eol"
92
+
93
+Just a clean-up.
94
+Will merge to "next" by the end of week #3.
95
+
96
+* jk/blame-line-porcelain (2011-05-09) 3 commits
97
+ - blame: add --line-porcelain output format
98
+ - blame: refactor porcelain output
99
+ - add tests for various blame formats
100
104
-* jc/t1506-shell-param-expansion-gotcha (2011-05-08) 1 commit
105
- - t1507: avoid "${parameter<op>'word'}" inside double-quotes
101
+* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit
102
+ - tag: disallow '-' as tag name
103
+
104
+Will merge to "next" by the end of week #3.
105
+
106
+* fc/completion-zsh (2011-05-10) 1 commit
107
+ + git-completion: fix regression in zsh support
108
+ (this branch is used by sg/completion-updates.)
109
+
110
+* nd/sparse-co-fix (2011-05-10) 2 commits
111
+ - sparse checkout: do not eagerly decide the fate for whole directory
112
+ - t1011: fix sparse-checkout initialization and add new file
113
114
--------------------------------------------------
115
[Stalled]
116
110
-* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
111
- - config.mak.in: allow "configure --sysconfdir=/else/where"
112
- - Makefile: allow sysconfdir to be used from configure
113
- (merged to 'next' on 2011-05-02 at c747ba3)
114
- + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
117
+* mg/diff-stat-count (2011-05-03) 2 commits
118
+ - diff-options.txt: describe --stat-{width,name-width,count}
119
+ - diff: introduce --stat-count to limit the stat lines
120
116
-J6t is unhappy that sysconfdir is ignored in relocatable case. Although I
117
-personally do not think that is a problem, as it has never been an issue,
118
-let's see what others think.
121
+There was a miscounting spotted. Need another round.
122
123
* jn/gitweb-js (2011-04-28) 13 commits
124
- gitweb: Make JavaScript ability to adjust timezones configurable
@@ -138,29 +141,17 @@ Rerolled. Waiting for comments.
141
- gitweb: Optional grouping of projects by category
142
- gitweb: Modularized git_get_project_description to be more generic
143
- gitweb: Split git_project_list_body in two functions
141
- (this branch uses jn/ctags.)
144
145
Waiting for comments.
146
145
-* jc/dotdot-is-parent-directory (2011-05-02) 1 commit
146
- - specifying ranges: we did not mean to make ".." an empty set
147
-
148
-Updated documentation.
149
-
150
-* mg/diff-stat-count (2011-05-03) 2 commits
151
- - diff-options.txt: describe --stat-{width,name-width,count}
152
- - diff: introduce --stat-count to limit the stat lines
153
-
154
-There was a miscounting spotted. Need another round.
155
-
156
-* jc/require-work-tree-exists (2011-05-04) 1 commit
147
+* jc/require-work-tree-exists (2011-05-08) 1 commit
148
- require-work-tree wants more than what its name says
149
150
Make "git pull" run from a random place work as long as GIT_DIR and
151
GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
161
-is a sane use case, though.
152
+is a sane use case, though. May drop.
153
163
-* jc/add-delete-default (2011-04-19) 1 commit
154
+* jc/add-delete-default (2011-04-27) 1 commit
155
- git add: notice removal of tracked paths by default
156
(this branch uses jc/fix-add-u-unmerged.)
157
@@ -171,7 +162,7 @@ is a sane use case, though.
162
163
Peff wanted to reroll this.
164
174
-* jc/index-pack (2011-02-25) 5 commits
165
+* jc/index-pack (2011-02-27) 5 commits
166
- index-pack --verify: read anomalous offsets from v2 idx file
167
- write_idx_file: need_large_offset() helper function
168
- index-pack: --verify
@@ -181,6 +172,12 @@ Peff wanted to reroll this.
172
Still a WIP. Need to put histogram output into index-pack --verify to
173
really kill verify-pack.
174
175
+* jc/dotdot-is-parent-directory (2011-05-04) 1 commit
176
+ - specifying ranges: we did not mean to make ".." an empty set
177
+
178
+Updated documentation, but I do not feel a strong enough annoyance to push
179
+this forward. May drop.
180
+
181
* jk/tag-contains (2010-07-05) 4 commits
182
- Why is "git tag --contains" so slow?
183
- default core.clockskew variable to one day
@@ -200,89 +197,158 @@ Needs to tighten the advice to only govern the generic How-to part.
197
--------------------------------------------------
198
[Cooking]
199
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
200
+* kk/maint-prefix-in-config-mak (2011-05-09) 3 commits
201
+ (merged to 'next' on 2011-05-09 at 267a3aa)
202
+ + Honor $(prefix) set in config.mak* when defining ETC_GIT*
203
+ + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
204
+ (merged to 'next' on 2011-05-02 at c747ba3)
205
+ + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
206
+
207
+One revert and replace the whole thing from J6t. The end result looked
208
+reasonable.
209
+
210
+Will merge to "master" by the end of week #4.
211
+
212
+* bf/commit-template-no-cleanup (2011-05-11) 1 commit
213
+ (merged to 'next' on 2011-05-11 at 01fde0d)
214
+ + Do not strip empty lines / trailing spaces from a commit message template
215
+
216
+Will merge to "master" by the end of week #3.
217
+
218
+* ci/commit--interactive-atomic (2011-05-10) 6 commits
219
+ (merged to 'next' on 2011-05-11 at 7f36fd8)
220
+ + Test atomic git-commit --interactive
221
+ + Add commit to list of config.singlekey commands
222
+ + Add support for -p/--patch to git-commit
223
+ + Allow git commit --interactive with paths
224
+ + t7501.8: feed a meaningful command
225
+ + Use a temporary index for git commit --interactive
226
+
227
+Will merge to "master" by the end of week #4.
228
+
229
+* rr/rerere-libify-clear-gc (2011-05-08) 1 commit
230
+ (merged to 'next' on 2011-05-11 at b1d8c88)
231
+ + rerere: libify rerere_clear() and rerere_gc()
232
+
233
+This is pure code movement. Changing them to suit the need of other
234
+callers can be built on it as separate patches.
235
+
236
+Will merge to "master" by the end of week #3.
237
+
238
+* ab/i18n-scripts (2011-05-08) 48 commits
239
+ - i18n: git-bisect bisect_next_check "You need to" message
240
+ - i18n: git-bisect [Y/n] messages
241
+ - i18n: git-bisect bisect_replay + $1 messages
242
+ - i18n: git-bisect bisect_reset + $1 messages
243
+ - i18n: git-bisect bisect_run + $@ messages
244
+ - i18n: git-bisect die + eval_gettext messages
245
+ - i18n: git-bisect die + gettext messages
246
+ - i18n: git-bisect echo + eval_gettext message
247
+ - i18n: git-bisect echo + gettext messages
248
+ - i18n: git-bisect gettext + echo message
249
+ - i18n: git-bisect add git-sh-i18n
250
+ - i18n: git-stash drop_stash say/die messages
251
+ - i18n: git-stash "unknown option" message
252
+ - i18n: git-stash die + eval_gettext $1 messages
253
+ - i18n: git-stash die + eval_gettext $* messages
254
+ - i18n: git-stash die + eval_gettext messages
255
+ - i18n: git-stash die + gettext messages
256
+ - i18n: git-stash say + gettext messages
257
+ - i18n: git-stash echo + gettext message
258
+ - i18n: git-stash add git-sh-i18n
259
+ - i18n: git-submodule "blob" and "submodule" messages
260
+ - i18n: git-submodule "path not initialized" message
261
+ - i18n: git-submodule "[...] path is ignored" message
262
+ - i18n: git-submodule "Entering [...]" message
263
+ - i18n: git-submodule $errmsg messages
264
+ - i18n: git-submodule "Submodule change[...]" messages
265
+ - i18n: git-submodule "cached cannot be used" message
266
+ - i18n: git-submodule $update_module say + die messages
267
+ - i18n: git-submodule die + eval_gettext messages
268
+ - i18n: git-submodule say + eval_gettext messages
269
+ - i18n: git-submodule echo + eval_gettext messages
270
+ - i18n: git-submodule add git-sh-i18n
271
+ - i18n: git-pull eval_gettext + warning message
272
+ - i18n: git-pull eval_gettext + die message
273
+ - i18n: git-pull die messages
274
+ - i18n: git-pull add git-sh-i18n
275
+ - i18n: git-am printf(1) message to eval_gettext
276
+ - i18n: git-am core say messages
277
+ - i18n: git-am "Falling back" say message
278
+ - i18n: git-am "Apply?" message
279
+ - i18n: git-am clean_abort messages
280
+ - i18n: git-am cannot_fallback messages
281
+ - i18n: git-am die messages
282
+ - i18n: git-am echo + gettext message
283
+ - i18n: git-am eval_gettext messages
284
+ - i18n: git-am multi-line getttext $msg; echo
285
+ - i18n: git-am one-line gettext $msg; echo
286
+ - i18n: git-am add git-sh-i18n
287
+ (this branch uses ab/i18n-scripts-basic.)
288
+
289
+* ab/i18n-scripts-basic (2011-05-08) 4 commits
290
+ - Makefile: add xgettext target for *.sh files
291
+ - git-sh-i18n.sh: add GIT_GETTEXT_POISON support
292
+ - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
293
+ - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
294
+ (this branch is used by ab/i18n-scripts.)
295
+
296
+Will merge to "next" by the end of week #4.
297
207
-Will merge to "master".
298
+* jc/t1506-shell-param-expansion-gotcha (2011-05-09) 1 commit
299
+ (merged to 'next' on 2011-05-11 at 6c8619e)
300
+ + t1507: avoid "${parameter<op>'word'}" inside double-quotes
301
+
302
+Will merge to "master" by the end of week #3.
303
304
* mg/merge-ff-config (2011-05-06) 3 commits
305
(merged to 'next' on 2011-05-08 at 977b432)
306
+ tests: check git does not barf on merge.ff values for future versions of git
307
+ merge: introduce merge.ff configuration variable
308
+ Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
214
- (this branch uses jc/maint-branch-mergeoptions.)
309
216
-* mk/grep-pcre (2011-05-05) 3 commits
310
+Will merge to "master" by the end of week #4.
311
+
312
+* mk/grep-pcre (2011-05-09) 10 commits
313
+ - git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
314
+ - git-grep: Bail out when -P is used with -F or -E
315
+ - grep: Add basic tests
316
+ - configure: Check for libpcre
317
+ - git-grep: Learn PCRE
318
+ - grep: Extract compile_regexp_failed() from compile_regexp()
319
+ - grep: Fix a typo in a comment
320
(merged to 'next' on 2011-05-08 at 5d3bede)
321
+ grep: Put calls to fixmatch() and regmatch() into patmatch()
322
+ contrib/completion: --line-number to git grep
323
+ Documentation: Add --line-number to git-grep synopsis
324
222
-This is without the real PCRE integration. The above three looked
223
-reasonable clean-ups regardless.
325
+The tip is my "how about this" fix-up for the "Bail out" one.
326
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'
228
- + git-checkout.txt: better docs for '--patch'
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
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.)
327
+Will merge to "next" by the end of week #3.
328
239
-Fix branch.<name>.mergeoptions that does not override merge.<option>; this
240
-is needed for the "merge.ff" configuration topic to correctly work.
241
-
242
-* jn/ctags (2011-04-29) 3 commits
243
- (merged to 'next' on 2011-05-06 at 5c574ff)
244
- + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
245
- + gitweb: Change the way "content tags" ('ctags') are handled
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
254
- + http-push: refactor curl_easy_setup madness
255
- + http-push: use const for strings in signatures
256
- + http: make curl callbacks match contracts from curl header
257
-
258
-Will merge to "master".
259
-
260
-* sg/completion-updates (2011-04-27) 2 commits
329
+* sg/completion-updates (2011-05-10) 4 commits
330
+ (merged to 'next' on 2011-05-10 at eaf5398)
331
+ + Merge branch 'fc/completion-zsh' into sg/completion-updates
332
+ + Revert "completion: don't declare 'local words' to make zsh happy"
333
(merged to 'next' on 2011-05-08 at 761178c)
334
+ completion: move private shopt shim for zsh to __git_ namespace
335
(merged to 'next' on 2011-05-02 at 0fd443a)
336
+ completion: don't declare 'local words' to make zsh happy
337
+ (this branch uses fc/completion-zsh.)
338
266
-With an update from Jonathan.
267
-Will merge to "master".
339
+This reverts the "local words only on bash" thingy and uses the
340
+workaround blessed by zsh folks instead.
341
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
-
278
-Will merge to "master".
342
+Will merge to "master" by the end of week #4.
343
280
-* ld/p4-preserve-user-names (2011-05-07) 2 commits
281
- - git-p4: small improvements to user-preservation
344
+* ld/p4-preserve-user-names (2011-05-10) 3 commits
345
+ - git-p4: warn if git authorship won't be retained
346
+ (merged to 'next' on 2011-05-11 at bc14314)
347
+ + git-p4: small improvements to user-preservation
348
(merged to 'next' on 2011-04-29 at 25116c8)
349
+ git-p4: add option to preserve user names
350
285
-An incremental update waiting for a re-review.
351
+The tip one will be re-rolled.
352
353
* jh/dirstat-lines (2011-04-29) 8 commits
354
(merged to 'next' on 2011-04-29 at a302674)
@@ -310,7 +376,7 @@ Will merge to "master" by the end of week #3.
376
377
Will merge to "master" by the end of week #3.
378
313
-* jc/fix-add-u-unmerged (2011-04-20) 1 commit
379
+* jc/fix-add-u-unmerged (2011-04-23) 1 commit
380
(merged to 'next' on 2011-04-28 at f7ed821)
381
+ Fix "add -u" that sometimes fails to resolve unmerged paths
382
(this branch is used by jc/add-delete-default.)
@@ -333,21 +399,18 @@ Will merge to "master" by the end of week #3.
399
400
Will merge to "master" by the end of week #3.
401
336
-* jc/magic-pathspec (2011-04-06) 3 commits
402
+* jc/magic-pathspec (2011-05-10) 10 commits
403
+ (merged to 'next' on 2011-05-11 at aaad95e)
404
+ + t3703, t4208: add test cases for magic pathspec
405
+ + rev/path disambiguation: further restrict "misspelled index entry" diag
406
+ + fix overslow :/no-such-string-ever-existed diagnostics
407
+ + fix overstrict :<path> diagnosis
408
+ + grep: use get_pathspec() correctly
409
+ + pathspec: drop "lone : means no pathspec" from get_pathspec()
410
+ + Revert "magic pathspec: add ":(icase)path" to match case insensitively"
411
(merged to 'next' on 2011-04-25 at 788cd46)
412
+ magic pathspec: add ":(icase)path" to match case insensitively
413
+ magic pathspec: futureproof shorthand form
414
+ magic pathspec: add tentative ":/path/from/top/level" pathspec support
415
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
-
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...
416
+This seems to need more time to mature than I expected.