What's cooking (2011/05 #10)
Junio C Hamano committed
May 23, 2011 at 15:51 UTC
d407eab6cfa3dcfbcdcb927992c638865d2072db
1 file changed
+300
-238
whats-cooking.txt
+300
-238
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #09; Wed, 18)
3
-X-master-at: b602ed7dea968d72c5b3f61ca016de7f285d80ef
4
-X-next-at: d7180b92680b81e5de1cd29156f51a7371d65fe1
2
+Subject: What's cooking in git.git (May 2011, #10; Mon, 23)
3
+X-master-at: 5df3e2b3ca5ebe8123927a81d682993ad597a584
4
+X-next-at: fbd4877f301a9ed26bffbebd340b19d5a18c8573
5
6
-What's cooking in git.git (May 2011, #09; Wed, 18)
6
+What's cooking in git.git (May 2011, #10; Mon, 23)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,47 +12,236 @@ 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 at the beginning of week #4 of this cycle.
15
+We are at the beginning of week #5 of this cycle. Let's plan to tag -rc0
16
+with what is in 'master' at the end of the month.
17
18
--------------------------------------------------
19
[New Topics]
20
20
-* hg/add-i-qq (2011-05-17) 1 commit
21
- - add-interactive: add 'Quit' shortcut to add hunk and quit
21
+* jc/notes-batch-removal (2011-05-19) 4 commits
22
+ (merged to 'next' on 2011-05-23 at 5bd78a6)
23
+ + show: --ignore-missing
24
+ + notes remove: --stdin reads from the standard input
25
+ + notes remove: --ignore-missing
26
+ + notes remove: allow removing more than one
27
+
28
+Will merge to "master" by the end of week #5.
29
+
30
+* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit
31
+ (merged to 'next' on 2011-05-23 at b56fb81)
32
+ + fetch: avoid repeated commits in mark_complete
33
+
34
+Trivially correct.
35
+Will merge to "master" by the end of week #5.
36
+
37
+* jk/haves-from-alternate-odb (2011-05-19) 3 commits
38
+ (merged to 'next' on 2011-05-23 at 53b4735)
39
+ + receive-pack: eliminate duplicate .have refs
40
+ + bisect: refactor sha1_array into a generic sha1 list
41
+ + refactor refs_from_alternate_cb to allow passing extra data
42
+
43
+Will merge to "master" by the end of week #5.
44
+
45
+* rg/no-gecos-in-pwent (2011-05-19) 1 commit
46
+ (merged to 'next' on 2011-05-23 at d2c4c33)
47
+ + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
48
+
49
+Trivially correct and not intrusive, but the real value unknown.
50
+Will merge to "master" by the end of week #5.
51
+
52
+* jc/streaming-filter (2011-05-21) 6 commits
53
+ - streaming: filter cascading
54
+ - streaming filter: ident filter
55
+ - Add LF-to-CRLF streaming conversion
56
+ - stream filter: add "no more input" to the filters
57
+ - Add streaming filter API
58
+ - convert.h: move declarations for conversion from cache.h
59
+ (this branch uses jc/bigfile, jc/streaming and jc/streaming.)
60
+
61
+Trivial lf-to-crlf and ident conversions can be performed without reading
62
+everything in-core first. Cascading is probably still broken. Will not
63
+merge before 1.7.6.
64
+
65
+* jn/userdiff-perl-updates (2011-05-23) 8 commits
66
+ (merged to 'next' on 2011-05-23 at 2595ae1)
67
+ + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
68
+ + tests: make test_expect_code quieter on success
69
+ + userdiff/perl: catch sub with brace on second line
70
+ + userdiff/perl: match full line of POD headers
71
+ + userdiff/perl: anchor "sub" and "package" patterns on the left
72
+ + t4018 (funcname patterns): minor cleanups
73
+ + t4018 (funcname patterns): make configuration easier to track
74
+ + t4018 (funcname patterns): make .gitattributes state easier to track
75
+
76
+Will merge to "master" by the end of week #5.
77
+
78
+* da/git-prefix-everywhere (2011-05-23) 3 commits
79
+ - git-mergetool--lib: Make vimdiff retain the current directory
80
+ - git: Remove handling for GIT_PREFIX
81
+ - setup: Provide GIT_PREFIX to built-ins
82
+
83
+* jc/git-handle-options-miscount (2011-05-23) 1 commit
84
+ - handle_options(): do not miscount how many arguments were used
85
+
86
+* jk/combine-diff-binary-etc (2011-05-23) 5 commits
87
+ - combine-diff: respect textconv attributes
88
+ - refactor get_textconv to not require diff_filespec
89
+ - combine-diff: handle binary files as binary
90
+ - combine-diff: calculate mode_differs earlier
91
+ - combine-diff: split header printing into its own function
92
23
-The question "why is y+q any more deserving for a short-cut than d+q" was
24
-raised late in the discussion, and I think it a very valid concern.
93
+--------------------------------------------------
94
+[Graduated to "master"]
95
26
-May drop.
96
+* ab/i18n-scripts-basic (2011-05-14) 4 commits
97
+ (merged to 'next' on 2011-05-18 at 3dc69f0)
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
28
-* js/log-abbrev-commit-config (2011-05-18) 2 commits
29
- - Add log.abbrevCommit config variable
30
- - "git log -h": typofix misspelled 'suppress'
104
+* jc/magic-pathspec (2011-05-17) 14 commits
105
+ (merged to 'next' on 2011-05-18 at d7180b9)
106
+ + setup.c: Fix some "symbol not declared" sparse warnings
107
+ (merged to 'next' on 2011-05-12 at 656c8b5)
108
+ + t3703: Skip tests using directory name ":" on Windows
109
+ (merged to 'next' on 2011-05-11 at 86d1d6d)
110
+ + revision.c: leave a note for "a lone :" enhancement
111
+ + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
112
+ (merged to 'next' on 2011-05-11 at aaad95e)
113
+ + t3703, t4208: add test cases for magic pathspec
114
+ + rev/path disambiguation: further restrict "misspelled index entry" diag
115
+ + fix overslow :/no-such-string-ever-existed diagnostics
116
+ + fix overstrict :<path> diagnosis
117
+ + grep: use get_pathspec() correctly
118
+ + pathspec: drop "lone : means no pathspec" from get_pathspec()
119
+ + Revert "magic pathspec: add ":(icase)path" to match case insensitively"
120
+ (merged to 'next' on 2011-04-25 at 788cd46)
121
+ + magic pathspec: add ":(icase)path" to match case insensitively
122
+ + magic pathspec: futureproof shorthand form
123
+ + magic pathspec: add tentative ":/path/from/top/level" pathspec support
124
+
125
+* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
126
+ + setup_revisions(): take pathspec from command line and --stdin correctly
127
+ (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)
128
+
129
+* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
130
+ + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
131
+
132
+* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits
133
+ (merged to 'next' on 2011-05-15 at b4e3a75)
134
+ + Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
135
+ + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
136
+ (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.)
137
+
138
+These are to fix an ancient bug where feeding "git log --stdin path" with
139
+an input that also has additional pathspec corrupted memory.
140
+
141
+* jc/replacing (2011-05-15) 5 commits
142
+ (merged to 'next' on 2011-05-16 at 5d0b584)
143
+ + read_sha1_file(): allow selective bypassing of replacement mechanism
144
+ + inline lookup_replace_object() calls
145
+ + read_sha1_file(): get rid of read_sha1_file_repl() madness
146
+ + t6050: make sure we test not just commit replacement
147
+ + Declare lookup_replace_object() in cache.h, not in commit.h
148
+ (this branch is used by jc/streaming.)
149
+
150
+Code restructuring without much new feature.
151
+
152
+* jk/blame-line-porcelain (2011-05-09) 3 commits
153
+ (merged to 'next' on 2011-05-15 at 93232b3)
154
+ + blame: add --line-porcelain output format
155
+ + blame: refactor porcelain output
156
+ + add tests for various blame formats
157
+
158
+* jk/cherry-pick-root-with-resolve (2011-05-16) 3 commits
159
+ (merged to 'next' on 2011-05-16 at 2a63845)
160
+ + t3503: test cherry picking and reverting root commits
161
+ + revert: allow reverting a root commit
162
+ + cherry-pick: handle root commits with external strategies
163
+
164
+* jk/git-connection-deadlock-fix (2011-05-18) 4 commits
165
+ (merged to 'next' on 2011-05-18 at d4567da)
166
+ + test core.gitproxy configuration
167
+ (merged to 'next' on 2011-05-16 at 33e6c11)
168
+ + send-pack: avoid deadlock on git:// push with failed pack-objects
169
+ + connect: let callers know if connection is a socket
170
+ + connect: treat generic proxy processes like ssh processes
171
+ (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with js/maint-send-pack-stateless-rpc-deadlock-fix.)
172
+
173
+* jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits
174
+ (merged to 'next' on 2011-05-16 at cc6c7e8)
175
+ + Submodules: Don't parse .gitmodules when it contains, merge conflicts
176
+ + test that git status works with merge conflict in, .gitmodules
177
+
178
+* jm/maint-diff-words-with-sbe (2011-05-20) 1 commit
179
+ (merged to 'next' on 2011-05-20 at c0db85c)
180
+ + do not read beyond end of malloc'd buffer
181
+
182
+* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-16) 1 commit
183
+ + sideband_demux(): fix decl-after-stmt
184
+ (this branch is used by jk/git-connection-deadlock-fix and js/maint-send-pack-stateless-rpc-deadlock-fix.)
185
+
186
+* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-16) 1 commit
187
+ (merged to 'next' on 2011-05-16 at ad83470)
188
+ + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
189
+ (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with jk/git-connection-deadlock-fix.)
190
191
* js/mingw-shutdown (2011-05-18) 1 commit
33
- - Windows: add a wrapper for the shutdown() system call
192
+ (merged to 'next' on 2011-05-19 at c085b22)
193
+ + Windows: add a wrapper for the shutdown() system call
194
35
-Meant for maint-1.7.4 and later.
195
+* ld/p4-preserve-user-names (2011-05-13) 3 commits
196
+ (merged to 'next' on 2011-05-15 at bdedb60)
197
+ + git-p4: warn if git authorship won't be retained
198
+ (merged to 'next' on 2011-05-11 at bc14314)
199
+ + git-p4: small improvements to user-preservation
200
+ (merged to 'next' on 2011-04-29 at 25116c8)
201
+ + git-p4: add option to preserve user names
202
203
* mg/config-symbolic-constants (2011-05-17) 2 commits
38
- - config: Give error message when not changing a multivar
39
- - config: define and document exit codes
204
+ (merged to 'next' on 2011-05-19 at ac538c0)
205
+ + config: Give error message when not changing a multivar
206
+ + config: define and document exit codes
207
208
* ms/ls-remote-exit-with-status (2011-05-18) 1 commit
42
- - ls-remote: the --exit-code option reports "no matching refs"
209
+ (merged to 'next' on 2011-05-19 at c4238ce)
210
+ + ls-remote: the --exit-code option reports "no matching refs"
211
+
212
+* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit
213
+ (merged to 'next' on 2011-05-15 at 7df0461)
214
+ + tag: disallow '-' as tag name
215
+
216
+* nd/sparse-co-fix (2011-05-10) 2 commits
217
+ (merged to 'next' on 2011-05-15 at 1a85791)
218
+ + sparse checkout: do not eagerly decide the fate for whole directory
219
+ + t1011: fix sparse-checkout initialization and add new file
220
221
* rg/copy-gecos-username (2011-05-17) 1 commit
222
(merged to 'next' on 2011-05-17 at 6080944)
223
+ copy_gecos: fix not adding nlen to len when processing "&"
224
225
* tr/add-i-no-escape (2011-05-17) 1 commit
49
- - add -i: ignore terminal escape sequences
50
-
51
-Will merge to "next".
226
+ (merged to 'next' on 2011-05-19 at d1c7a10)
227
+ + add -i: ignore terminal escape sequences
228
229
--------------------------------------------------
230
[Stalled]
231
232
+* hg/add-i-qq (2011-05-17) 1 commit
233
+ - add-interactive: add 'Quit' shortcut to add hunk and quit
234
+
235
+The question "why is y+q any more deserving for a short-cut than d+q" was
236
+raised late in the discussion, and I think it a very valid concern.
237
+
238
+May drop.
239
+
240
+* jl/read-tree-m-dry-run (2011-05-11) 1 commit
241
+ - Teach read-tree the -n|--dry-run option
242
+
243
+Waiting for a reroll.
244
+
245
* mg/diff-stat-count (2011-05-03) 2 commits
246
- diff-options.txt: describe --stat-{width,name-width,count}
247
- diff: introduce --stat-count to limit the stat lines
@@ -135,116 +324,49 @@ Needs to tighten the advice to only govern the generic How-to part.
324
--------------------------------------------------
325
[Cooking]
326
138
-* jh/receive-count-limit (2011-05-14) 1 commit
139
- - receive-pack: Add receive.objectCountLimit to refuse push with too many objects
327
+* jh/receive-count-limit (2011-05-23) 10 commits
328
+ - receive-pack: Allow server to refuse pushes with too many objects
329
+ - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
330
+ - send-pack/receive-pack: Allow server to refuse pushing too large packs
331
+ - pack-objects: Allow --max-pack-size to be used together with --stdout
332
+ - send-pack/receive-pack: Allow server to refuse pushes with too many commits
333
+ - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
334
+ - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
335
+ - Tighten rules for matching server capabilities in server_supports()
336
+ - send-pack: Attempt to retrieve remote status even if pack-objects fails
337
+ - Update technical docs to reflect side-band-64k capability in receive-pack
338
141
-Re-rolled but decided not to pick it up while it is still being
142
-discussed.
143
-
144
-* jk/cherry-pick-root-with-resolve (2011-05-16) 3 commits
145
- (merged to 'next' on 2011-05-16 at 2a63845)
146
- + t3503: test cherry picking and reverting root commits
147
- + revert: allow reverting a root commit
148
- + cherry-pick: handle root commits with external strategies
149
-
150
-Will merge to "master" soonish, to merge further to "maint" later.
151
-
152
-* jk/git-connection-deadlock-fix (2011-05-18) 4 commits
153
- (merged to 'next' on 2011-05-18 at d4567da)
154
- + test core.gitproxy configuration
155
- (merged to 'next' on 2011-05-16 at 33e6c11)
156
- + send-pack: avoid deadlock on git:// push with failed pack-objects
157
- + connect: let callers know if connection is a socket
158
- + connect: treat generic proxy processes like ssh processes
159
- (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with js/maint-send-pack-stateless-rpc-deadlock-fix.)
160
-
161
-Will merge to "master" soonish, to merge further to "maint" later.
162
-
163
-* jc/replacing (2011-05-15) 5 commits
164
- (merged to 'next' on 2011-05-16 at 5d0b584)
165
- + read_sha1_file(): allow selective bypassing of replacement mechanism
166
- + inline lookup_replace_object() calls
167
- + read_sha1_file(): get rid of read_sha1_file_repl() madness
168
- + t6050: make sure we test not just commit replacement
169
- + Declare lookup_replace_object() in cache.h, not in commit.h
170
- (this branch is used by jc/streaming.)
171
-
172
-Code restructuring without much new feature.
173
-Will merge to "master" by the end of week #4.
174
-
175
-* jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits
176
- (merged to 'next' on 2011-05-16 at cc6c7e8)
177
- + Submodules: Don't parse .gitmodules when it contains, merge conflicts
178
- + test that git status works with merge conflict in, .gitmodules
179
-
180
-Will merge to "master" by the end of week #4.
181
-
182
-* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-16) 1 commit
183
- + sideband_demux(): fix decl-after-stmt
184
- (this branch is used by jk/git-connection-deadlock-fix and js/maint-send-pack-stateless-rpc-deadlock-fix.)
185
-
186
-Will merge to "master" soonish, to merge further to "maint" later.
187
-
188
-* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-16) 1 commit
189
- (merged to 'next' on 2011-05-16 at ad83470)
190
- + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
191
- (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with jk/git-connection-deadlock-fix.)
192
-
193
-Will merge to "master" soonish, to merge further to "maint" later.
194
-
195
-* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
196
- + setup_revisions(): take pathspec from command line and --stdin correctly
197
- (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)
198
-
199
-Will merge to "master" soonish, to merge further to "maint" later.
200
-
201
-* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
202
- - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
203
- (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.)
204
-
205
-Will merge to "master" soonish, to merge further to "maint" later.
206
-
207
-* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits
208
- (merged to 'next' on 2011-05-15 at b4e3a75)
209
- + Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
210
- + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
211
- (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.)
212
-
213
-These are to fix an ancient bug where feeding "git log --stdin path" with
214
-an input that also has additional pathspec corrupted memory.
215
-
216
-Will merge to "master" soonish, to merge further to "maint" later.
217
-
218
-* jl/read-tree-m-dry-run (2011-05-11) 1 commit
219
- - Teach read-tree the -n|--dry-run option
339
+* js/log-abbrev-commit-config (2011-05-18) 2 commits
340
+ (merged to 'next' on 2011-05-23 at 4e7e932)
341
+ + Add log.abbrevCommit config variable
342
+ + "git log -h": typofix misspelled 'suppress'
343
221
-Looked good. We _might_ want to make -n simply ignore -u, though.
222
-Waiting for a reroll.
344
+Should be fine after several rounds of reviews.
345
+Will merge to "master" by the middle of week #5.
346
224
-* jc/streaming (2011-05-18) 12 commits
225
- - streaming: read loose objects incrementally
226
- - sha1_file.c: expose helpers to read loose objects
227
- - streaming: read non-delta incrementally from a pack
228
- - streaming_write_entry(): support files with holes
229
- - streaming_write_entry(): use streaming API in write_entry()
230
- - streaming: a new API to read from the object store
231
- - write_entry(): separate two helper functions out
232
- - unpack_object_header(): make it public
233
- - sha1_object_info_extended(): hint about objects in delta-base cache
234
- - sha1_object_info_extended(): expose a bit more info
235
- - packed_object_info_detail(): do not return a string
236
- - Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
237
- (this branch uses jc/bigfile and jc/replacing.)
238
-
239
-Thanks to Peff, it has become clear that sha1_object_info_extended()
240
-change was not paying enough attention to the performance.
347
+* jc/streaming (2011-05-20) 13 commits
348
+ (merged to 'next' on 2011-05-23 at 7fd0b52)
349
+ + streaming: read loose objects incrementally
350
+ + sha1_file.c: expose helpers to read loose objects
351
+ + streaming: read non-delta incrementally from a pack
352
+ + streaming_write_entry(): support files with holes
353
+ + convert: CRLF_INPUT is a no-op in the output codepath
354
+ + streaming_write_entry(): use streaming API in write_entry()
355
+ + streaming: a new API to read from the object store
356
+ + write_entry(): separate two helper functions out
357
+ + unpack_object_header(): make it public
358
+ + sha1_object_info_extended(): hint about objects in delta-base cache
359
+ + sha1_object_info_extended(): expose a bit more info
360
+ + packed_object_info_detail(): do not return a string
361
+ + Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
362
+ (this branch is used by jc/streaming-filter and jc/streaming-filter; uses jc/bigfile.)
363
364
* jc/bigfile (2011-05-13) 3 commits
365
(merged to 'next' on 2011-05-15 at 0ee7144)
366
+ Bigfile: teach "git add" to send a large file straight to a pack
367
+ index_fd(): split into two helper functions
368
+ index_fd(): turn write_object and format_check arguments into one flag
247
- (this branch is used by jc/streaming.)
369
+ (this branch is used by jc/streaming and jc/streaming-filter.)
370
371
This covers the entry point for a big file to the system. Other parts that
372
need to know about them are the exit point (i.e. write_entry()), packing
@@ -256,87 +378,62 @@ object in-core and need to be fixed).
378
379
Will merge to "master" by the middle of week #5.
380
259
-* jk/blame-line-porcelain (2011-05-09) 3 commits
260
- (merged to 'next' on 2011-05-15 at 93232b3)
261
- + blame: add --line-porcelain output format
262
- + blame: refactor porcelain output
263
- + add tests for various blame formats
264
-
265
-Will merge to "master" by the end of week #4.
266
-
267
-* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit
268
- (merged to 'next' on 2011-05-15 at 7df0461)
269
- + tag: disallow '-' as tag name
270
-
271
-Will merge to "master" by the end of week #4.
272
-
273
-* nd/sparse-co-fix (2011-05-10) 2 commits
274
- (merged to 'next' on 2011-05-15 at 1a85791)
275
- + sparse checkout: do not eagerly decide the fate for whole directory
276
- + t1011: fix sparse-checkout initialization and add new file
277
-
278
-Will merge to "master" by the end of week #4.
279
-
280
-* ab/i18n-scripts (2011-05-14) 48 commits
281
- - i18n: git-bisect bisect_next_check "You need to" message
282
- - i18n: git-bisect [Y/n] messages
283
- - i18n: git-bisect bisect_replay + $1 messages
284
- - i18n: git-bisect bisect_reset + $1 messages
285
- - i18n: git-bisect bisect_run + $@ messages
286
- - i18n: git-bisect die + eval_gettext messages
287
- - i18n: git-bisect die + gettext messages
288
- - i18n: git-bisect echo + eval_gettext message
289
- - i18n: git-bisect echo + gettext messages
290
- - i18n: git-bisect gettext + echo message
291
- - i18n: git-bisect add git-sh-i18n
292
- - i18n: git-stash drop_stash say/die messages
293
- - i18n: git-stash "unknown option" message
294
- - i18n: git-stash die + eval_gettext $1 messages
295
- - i18n: git-stash die + eval_gettext $* messages
296
- - i18n: git-stash die + eval_gettext messages
297
- - i18n: git-stash die + gettext messages
298
- - i18n: git-stash say + gettext messages
299
- - i18n: git-stash echo + gettext message
300
- - i18n: git-stash add git-sh-i18n
301
- - i18n: git-submodule "blob" and "submodule" messages
302
- - i18n: git-submodule "path not initialized" message
303
- - i18n: git-submodule "[...] path is ignored" message
304
- - i18n: git-submodule "Entering [...]" message
305
- - i18n: git-submodule $errmsg messages
306
- - i18n: git-submodule "Submodule change[...]" messages
307
- - i18n: git-submodule "cached cannot be used" message
308
- - i18n: git-submodule $update_module say + die messages
309
- - i18n: git-submodule die + eval_gettext messages
310
- - i18n: git-submodule say + eval_gettext messages
311
- - i18n: git-submodule echo + eval_gettext messages
312
- - i18n: git-submodule add git-sh-i18n
313
- - i18n: git-pull eval_gettext + warning message
314
- - i18n: git-pull eval_gettext + die message
315
- - i18n: git-pull die messages
316
- - i18n: git-pull add git-sh-i18n
317
- - i18n: git-am printf(1) message to eval_gettext
318
- - i18n: git-am core say messages
319
- - i18n: git-am "Falling back" say message
320
- - i18n: git-am "Apply?" message
321
- - i18n: git-am clean_abort messages
322
- - i18n: git-am cannot_fallback messages
323
- - i18n: git-am die messages
324
- - i18n: git-am echo + gettext message
325
- - i18n: git-am eval_gettext messages
326
- - i18n: git-am multi-line getttext $msg; echo
327
- - i18n: git-am one-line gettext $msg; echo
328
- - i18n: git-am add git-sh-i18n
329
- (this branch uses ab/i18n-scripts-basic.)
330
-
331
-* ab/i18n-scripts-basic (2011-05-14) 4 commits
332
- (merged to 'next' on 2011-05-18 at 3dc69f0)
333
- + Makefile: add xgettext target for *.sh files
334
- + git-sh-i18n.sh: add GIT_GETTEXT_POISON support
335
- + git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
336
- + git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
337
- (this branch is used by ab/i18n-scripts.)
338
-
339
-* mk/grep-pcre (2011-05-16) 12 commits
381
+* ab/i18n-scripts (2011-05-21) 48 commits
382
+ (merged to 'next' on 2011-05-23 at 69164a3)
383
+ + i18n: git-bisect bisect_next_check "You need to" message
384
+ + i18n: git-bisect [Y/n] messages
385
+ + i18n: git-bisect bisect_replay + $1 messages
386
+ + i18n: git-bisect bisect_reset + $1 messages
387
+ + i18n: git-bisect bisect_run + $@ messages
388
+ + i18n: git-bisect die + eval_gettext messages
389
+ + i18n: git-bisect die + gettext messages
390
+ + i18n: git-bisect echo + eval_gettext message
391
+ + i18n: git-bisect echo + gettext messages
392
+ + i18n: git-bisect gettext + echo message
393
+ + i18n: git-bisect add git-sh-i18n
394
+ + i18n: git-stash drop_stash say/die messages
395
+ + i18n: git-stash "unknown option" message
396
+ + i18n: git-stash die + eval_gettext $1 messages
397
+ + i18n: git-stash die + eval_gettext $* messages
398
+ + i18n: git-stash die + eval_gettext messages
399
+ + i18n: git-stash die + gettext messages
400
+ + i18n: git-stash say + gettext messages
401
+ + i18n: git-stash echo + gettext message
402
+ + i18n: git-stash add git-sh-i18n
403
+ + i18n: git-submodule "blob" and "submodule" messages
404
+ + i18n: git-submodule "path not initialized" message
405
+ + i18n: git-submodule "[...] path is ignored" message
406
+ + i18n: git-submodule "Entering [...]" message
407
+ + i18n: git-submodule $errmsg messages
408
+ + i18n: git-submodule "Submodule change[...]" messages
409
+ + i18n: git-submodule "cached cannot be used" message
410
+ + i18n: git-submodule $update_module say + die messages
411
+ + i18n: git-submodule die + eval_gettext messages
412
+ + i18n: git-submodule say + eval_gettext messages
413
+ + i18n: git-submodule echo + eval_gettext messages
414
+ + i18n: git-submodule add git-sh-i18n
415
+ + i18n: git-pull eval_gettext + warning message
416
+ + i18n: git-pull eval_gettext + die message
417
+ + i18n: git-pull die messages
418
+ + i18n: git-pull add git-sh-i18n
419
+ + i18n: git-am printf(1) message to eval_gettext
420
+ + i18n: git-am core say messages
421
+ + i18n: git-am "Falling back" say message
422
+ + i18n: git-am "Apply?" message
423
+ + i18n: git-am clean_abort messages
424
+ + i18n: git-am cannot_fallback messages
425
+ + i18n: git-am die messages
426
+ + i18n: git-am gettext + gettext to stderr message
427
+ + i18n: git-am eval_gettext messages
428
+ + i18n: git-am multi-line getttext $msg; echo
429
+ + i18n: git-am one-line gettext $msg; echo
430
+ + i18n: git-am add git-sh-i18n
431
+
432
+Rerolled.
433
+
434
+* mk/grep-pcre (2011-05-23) 13 commits
435
+ (merged to 'next' on 2011-05-23 at fbd4877)
436
+ + git-grep: Update tests (mainly for -P)
437
(merged to 'next' on 2011-05-16 at 0c6c25e)
438
+ Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
439
+ git-grep: update tests now regexp type is "last one wins"
@@ -353,39 +450,4 @@ Will merge to "master" by the end of week #4.
450
+ contrib/completion: --line-number to git grep
451
+ Documentation: Add --line-number to git-grep synopsis
452
356
-Fixed up the build procedure that did not update GIT-BUILD-OPTIONS.
453
Will merge to "master" by the middle of week #5.
358
-
359
-* ld/p4-preserve-user-names (2011-05-13) 3 commits
360
- (merged to 'next' on 2011-05-15 at bdedb60)
361
- + git-p4: warn if git authorship won't be retained
362
- (merged to 'next' on 2011-05-11 at bc14314)
363
- + git-p4: small improvements to user-preservation
364
- (merged to 'next' on 2011-04-29 at 25116c8)
365
- + git-p4: add option to preserve user names
366
-
367
-Will merge to "master" by the end of week #4.
368
-
369
-* jc/magic-pathspec (2011-05-17) 14 commits
370
- (merged to 'next' on 2011-05-18 at d7180b9)
371
- + setup.c: Fix some "symbol not declared" sparse warnings
372
- (merged to 'next' on 2011-05-12 at 656c8b5)
373
- + t3703: Skip tests using directory name ":" on Windows
374
- (merged to 'next' on 2011-05-11 at 86d1d6d)
375
- + revision.c: leave a note for "a lone :" enhancement
376
- + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
377
- (merged to 'next' on 2011-05-11 at aaad95e)
378
- + t3703, t4208: add test cases for magic pathspec
379
- + rev/path disambiguation: further restrict "misspelled index entry" diag
380
- + fix overslow :/no-such-string-ever-existed diagnostics
381
- + fix overstrict :<path> diagnosis
382
- + grep: use get_pathspec() correctly
383
- + pathspec: drop "lone : means no pathspec" from get_pathspec()
384
- + Revert "magic pathspec: add ":(icase)path" to match case insensitively"
385
- (merged to 'next' on 2011-04-25 at 788cd46)
386
- + magic pathspec: add ":(icase)path" to match case insensitively
387
- + magic pathspec: futureproof shorthand form
388
- + magic pathspec: add tentative ":/path/from/top/level" pathspec support
389
- (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)
390
-
391
-Will merge to "master" by the end of week #4.