What's cooking (2011/07 #02)
Junio C Hamano committed
Jul 13, 2011 at 16:58 UTC
5e91064083eef6f29f8142ddc0a37b4add44b38a
1 file changed
+207
-261
whats-cooking.txt
+207
-261
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2011, #01; Wed, 6)
3
-X-master-at: cf13f6ca40529a33b66c5e1e7cc69947974b3648
4
-X-next-at: 02b4229c523b5c12ecb6c426ad6edd106405518c
2
+Subject: What's cooking in git.git (Jul 2011, #02; Wed, 13)
3
+X-master-at: 55272570dbe1c3f2a6f2f142c4bfe806665cd111
4
+X-next-at: 867dc3783dfcad0e8c9bdd1c8d299d5a82f5babc
5
6
-What's cooking in git.git (Jul 2011, #01; Wed, 6)
6
+What's cooking in git.git (Jul 2011, #02; Wed, 13)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,135 +12,134 @@ only in 'pu' while commits prefixed with '+' are in 'next'.
12
--------------------------------------------------
13
[New Topics]
14
15
-* jc/maint-mergetool-read-fix (2011-07-01) 1 commit
16
- - mergetool: check return value from read
15
+* bw/log-all-ref-updates-doc (2011-07-12) 1 commit
16
+ - Documentation: clearly specify what refs are honored by core.logAllRefUpdates
17
18
-* nk/branch-v-abbrev (2011-07-01) 1 commit
19
- - branch -v: honor core.abbrev
18
+* di/fast-import-doc (2011-07-13) 2 commits
19
+ - doc/fast-import: document feature import-marks-if-exists
20
+ - doc/fast-import: clarify notemodify command
21
21
-Perhaps needs an updated commit log message?
22
+* dz/connect-error-report (2011-07-13) 2 commits
23
+ - connect.c: (fixup) report errors from failed socket(2) call as well
24
+ - Do not log unless all connect() attempts fail
25
23
-* jc/checkout-reflog-fix (2011-07-06) 3 commits
24
- - Merge commit 'v1.7.6' into jc/checkout-reflog-fix
25
- - Merge commit 'v1.7.0' into jc/checkout-reflog-fix
26
- - Merge commit 'v1.6.0' into jc/checkout-reflog-fix
27
- (this branch uses jc/maint-checkout-reflog-fix.)
26
+Needs squashing these into one.
27
29
-* jc/maint-checkout-reflog-fix (2011-07-06) 1 commit
30
- - checkout: do not write bogus reflog entry out
31
- (this branch is used by jc/checkout-reflog-fix.)
28
+* jc/pack-order-tweak (2011-07-08) 2 commits
29
+ - pack-objects: optimize "recency order"
30
+ - core: log offset pack data accesses happened
31
33
-* js/ref-namespaces (2011-07-06) 4 commits
34
- - ref namespaces: documentation
35
- - ref namespaces: Support remote repositories via upload-pack and receive-pack
36
- - ref namespaces: infrastructure
37
- - Fix prefix handling in ref iteration functions
32
+* jk/generation-numbers (2011-07-11) 6 commits
33
+ - limit "contains" traversals based on commit generation
34
+ - pretty: support %G to show the generation number of a commit
35
+ - commit: add commit_generation function
36
+ - add object-cache infrastructure
37
+ - decorate: allow storing values instead of pointers
38
+ + tag: speed up --contains calculation
39
+ (this branch is tangled with jk/tag-contains-ab.)
40
39
-* mz/doc-synopsis-verse (2011-07-06) 1 commit
40
- - Documentation: use [verse] for SYNOPSIS sections
41
+Getting rerolled.
42
42
-* rc/histogram-diff (2011-07-06) 4 commits
43
- - t4033-diff-patience: factor out tests
44
- - xdiff/xpatience: factor out fall-back-diff function
45
- - xdiff/xprepare: refactor abort cleanups
46
- - xdiff/xprepare: use memset()
43
+* js/maint-add-path-stat-pwd (2011-07-11) 1 commit
44
+ - get_pwd_cwd(): Do not trust st_dev/st_ino blindly
45
+
46
+Will merge to "next".
47
+
48
+* ms/help-unknown (2011-07-08) 1 commit
49
+ - help_unknown_cmd: do not propose an "unknown" cmd
50
+
51
+Will merge to "next".
52
+
53
+* mz/doc-rebase-abort (2011-07-11) 1 commit
54
+ - git-rebase.txt: clarify that --abort checks out <branch>
55
+
56
+Will merge to "next".
57
58
--------------------------------------------------
59
[Graduated to "master"]
60
51
-* ab/i18n-scripts (2011-05-21) 48 commits
52
- (merged to 'next' on 2011-06-29 at 61f4472)
53
- + i18n: git-bisect bisect_next_check "You need to" message
54
- + i18n: git-bisect [Y/n] messages
55
- + i18n: git-bisect bisect_replay + $1 messages
56
- + i18n: git-bisect bisect_reset + $1 messages
57
- + i18n: git-bisect bisect_run + $@ messages
58
- + i18n: git-bisect die + eval_gettext messages
59
- + i18n: git-bisect die + gettext messages
60
- + i18n: git-bisect echo + eval_gettext message
61
- + i18n: git-bisect echo + gettext messages
62
- + i18n: git-bisect gettext + echo message
63
- + i18n: git-bisect add git-sh-i18n
64
- + i18n: git-stash drop_stash say/die messages
65
- + i18n: git-stash "unknown option" message
66
- + i18n: git-stash die + eval_gettext $1 messages
67
- + i18n: git-stash die + eval_gettext $* messages
68
- + i18n: git-stash die + eval_gettext messages
69
- + i18n: git-stash die + gettext messages
70
- + i18n: git-stash say + gettext messages
71
- + i18n: git-stash echo + gettext message
72
- + i18n: git-stash add git-sh-i18n
73
- + i18n: git-submodule "blob" and "submodule" messages
74
- + i18n: git-submodule "path not initialized" message
75
- + i18n: git-submodule "[...] path is ignored" message
76
- + i18n: git-submodule "Entering [...]" message
77
- + i18n: git-submodule $errmsg messages
78
- + i18n: git-submodule "Submodule change[...]" messages
79
- + i18n: git-submodule "cached cannot be used" message
80
- + i18n: git-submodule $update_module say + die messages
81
- + i18n: git-submodule die + eval_gettext messages
82
- + i18n: git-submodule say + eval_gettext messages
83
- + i18n: git-submodule echo + eval_gettext messages
84
- + i18n: git-submodule add git-sh-i18n
85
- + i18n: git-pull eval_gettext + warning message
86
- + i18n: git-pull eval_gettext + die message
87
- + i18n: git-pull die messages
88
- + i18n: git-pull add git-sh-i18n
89
- + i18n: git-am printf(1) message to eval_gettext
90
- + i18n: git-am core say messages
91
- + i18n: git-am "Falling back" say message
92
- + i18n: git-am "Apply?" message
93
- + i18n: git-am clean_abort messages
94
- + i18n: git-am cannot_fallback messages
95
- + i18n: git-am die messages
96
- + i18n: git-am gettext + gettext to stderr message
97
- + i18n: git-am eval_gettext messages
98
- + i18n: git-am multi-line getttext $msg; echo
99
- + i18n: git-am one-line gettext $msg; echo
100
- + i18n: git-am add git-sh-i18n
101
-
102
-* da/git-prefix-everywhere (2011-06-02) 4 commits
103
- (merged to 'next' on 2011-06-29 at 4ed5461)
104
- + t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
105
- + git-mergetool--lib: Make vimdiff retain the current directory
106
- + git: Remove handling for GIT_PREFIX
107
- + setup: Provide GIT_PREFIX to built-ins
108
-
109
-* jc/streaming (2011-05-26) 14 commits
110
- (merged to 'next' on 2011-06-29 at 55ac692)
111
- + sha1_file: use the correct type (ssize_t, not size_t) for read-style function
112
- + streaming: read loose objects incrementally
113
- + sha1_file.c: expose helpers to read loose objects
114
- + streaming: read non-delta incrementally from a pack
115
- + streaming_write_entry(): support files with holes
116
- + convert: CRLF_INPUT is a no-op in the output codepath
117
- + streaming_write_entry(): use streaming API in write_entry()
118
- + streaming: a new API to read from the object store
119
- + write_entry(): separate two helper functions out
120
- + unpack_object_header(): make it public
121
- + sha1_object_info_extended(): hint about objects in delta-base cache
122
- + sha1_object_info_extended(): expose a bit more info
123
- + packed_object_info_detail(): do not return a string
124
- + Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
125
- (this branch is used by jc/streaming-filter.)
126
-
127
-* jc/streaming-filter (2011-05-26) 8 commits
128
- (merged to 'next' on 2011-06-29 at 9901923)
129
- + t0021: test application of both crlf and ident
130
- + t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
131
- + streaming: filter cascading
132
- + streaming filter: ident filter
133
- + Add LF-to-CRLF streaming conversion
134
- + stream filter: add "no more input" to the filters
135
- + Add streaming filter API
136
- + convert.h: move declarations for conversion from cache.h
137
- (this branch uses jc/streaming.)
138
-
139
-* jn/gitweb-js-blame (2011-05-27) 3 commits
140
- (merged to 'next' on 2011-06-29 at cce347d)
141
- + gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
142
- + gitweb.js: No need for loop in blame_incremental's handleResponse()
143
- + gitweb.js: No need for inProgress in blame_incremental.js
61
+* an/shallow-doc (2011-06-08) 2 commits
62
+ (merged to 'next' on 2011-07-01 at 6ba80ef)
63
+ + Document the underlying protocol used by shallow repositories and --depth commands.
64
+ + Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
65
+
66
+* aw/rebase-i-p (2011-06-19) 1 commit
67
+ (merged to 'next' on 2011-07-01 at df3f3d8)
68
+ + rebase -i -p: include non-first-parent commits in todo list
69
+
70
+* bc/submodule-foreach-stdin-fix-1.7.4 (2011-06-29) 2 commits
71
+ (merged to 'next' on 2011-07-01 at 4651925)
72
+ + git-submodule.sh: preserve stdin for the command spawned by foreach
73
+ + t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
74
+
75
+* fg/submodule-keep-updating (2011-06-13) 3 commits
76
+ (merged to 'next' on 2011-07-01 at 227827c)
77
+ + git-submodule.sh: clarify the "should we die now" logic
78
+ + submodule update: continue when a checkout fails
79
+ + git-sh-setup: add die_with_status
80
+
81
+* fk/relink-upon-ldflags-update (2011-06-22) 1 commit
82
+ (merged to 'next' on 2011-07-01 at 69b57d0)
83
+ + Makefile: Track changes to LDFLAGS and relink when necessary
84
+
85
+* jc/legacy-loose-object (2011-06-08) 1 commit
86
+ (merged to 'next' on 2011-07-01 at 5561971)
87
+ + sha1_file.c: "legacy" is really the current format
88
+
89
+* jc/maint-cygwin-trust-executable-bit-default (2011-06-20) 1 commit
90
+ (merged to 'next' on 2011-07-01 at d85aa04)
91
+ + cygwin: trust executable bit by default
92
+
93
+Fix for an ancient regression.
94
+
95
+* jc/no-gitweb-test-without-cgi-etc (2011-06-15) 1 commit
96
+ (merged to 'next' on 2011-07-01 at 1db3fa4)
97
+ + t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
98
+
99
+* jl/maint-fetch-recursive-fix (2011-06-20) 1 commit
100
+ (merged to 'next' on 2011-07-01 at 476eee4)
101
+ + fetch: Also fetch submodules in subdirectories in on-demand mode
102
+
103
+* jn/doc-dashdash (2011-06-29) 2 commits
104
+ (merged to 'next' on 2011-07-01 at 5d51929)
105
+ + Documentation/i18n: quote double-dash for AsciiDoc
106
+ + Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
107
+ (this branch uses jn/maint-doc-dashdash.)
108
+
109
+* jn/maint-doc-dashdash (2011-06-29) 1 commit
110
+ (merged to 'next' on 2011-07-01 at 55ab98d)
111
+ + Documentation: quote double-dash for AsciiDoc
112
+ (this branch is used by jn/doc-dashdash.)
113
+
114
+Will merge to "maint" later.
115
+
116
+* js/rebase-typo-branch-squelch-usage (2011-06-29) 1 commit
117
+ (merged to 'next' on 2011-07-01 at b5b4c03)
118
+ + rebase: do not print lots of usage hints after an obvious error message
119
+
120
+* ln/gitweb-mime-types-split-at-blank (2011-06-15) 1 commit
121
+ (merged to 'next' on 2011-07-01 at 765aa1e)
122
+ + gitweb: allow space as delimiter in mime.types
123
+
124
+* md/interix-update (2011-06-15) 1 commit
125
+ (merged to 'next' on 2011-07-01 at 0bc327d)
126
+ + Update the Interix default build configuration.
127
+
128
+* nk/ref-doc (2011-06-23) 7 commits
129
+ (merged to 'next' on 2011-07-01 at 9ff278d)
130
+ + glossary: clarify description of HEAD
131
+ + glossary: update description of head and ref
132
+ + glossary: update description of "tag"
133
+ + git.txt: de-emphasize the implementation detail of a ref
134
+ + check-ref-format doc: de-emphasize the implementation detail of a ref
135
+ + git-remote.txt: avoid sounding as if loose refs are the only ones in the world
136
+ + git-remote.txt: fix wrong remote refspec
137
+
138
+* rj/config-cygwin (2011-06-16) 3 commits
139
+ (merged to 'next' on 2011-07-01 at 6da4aa5)
140
+ + config.c: Make git_config() work correctly when called recursively
141
+ + t1301-*.sh: Fix the 'forced modes' test on cygwin
142
+ + help.c: Fix detection of custom merge strategy on cygwin
143
144
--------------------------------------------------
145
[Stalled]
@@ -158,7 +157,6 @@ Perhaps needs an updated commit log message?
157
- Update technical docs to reflect side-band-64k capability in receive-pack
158
159
Would need another round to separate per-pack and per-session limits.
161
-Not urgent. Will not merge before 1.7.6.
160
161
* sr/transport-helper-fix (2011-06-19) 20 commits
162
- transport-helper: implement marks location as capability
@@ -191,83 +189,91 @@ reroll.
189
- mergetool: Add tests for filename with whitespace
190
191
I think this is a good idea, but it probably needs a re-roll.
192
+Cf. $gmane/176254, 176255, 166256
193
194
--------------------------------------------------
195
[Cooking]
196
198
-* rr/revert-cherry-pick-continue (2011-07-06) 14 commits
199
- - revert: Change insn sheet format
200
- - revert: Introduce --continue to continue the operation
201
- - revert: Introduce --reset to cleanup sequencer data
202
- - revert: Introduce a layer of indirection over pick_commits
203
- - revert: Persist data for continuation
204
- - revert: Don't create invalid replay_opts in parse_args
205
- - revert: Separate cmdline parsing from functional code
206
- - revert: Introduce struct to keep command-line options
207
- - revert: Eliminate global "commit" variable
208
- - revert: Propagate errors upwards from do_pick_commit
209
- - revert: Rename no_replay to record_origin
210
- - revert: Don't check lone argument in get_encoding
211
- - revert: Inline add_message_to_msg function
212
- - advice: Introduce error_resolve_conflict
197
+* jc/maint-mergetool-read-fix (2011-07-01) 1 commit
198
+ - mergetool: check return value from read
199
214
-* bc/submodule-foreach-stdin-fix-1.7.4 (2011-06-29) 2 commits
215
- (merged to 'next' on 2011-07-01 at 4651925)
216
- + git-submodule.sh: preserve stdin for the command spawned by foreach
217
- + t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
200
+Will merge to "next".
201
219
-Will merge to "master".
202
+* nk/branch-v-abbrev (2011-07-01) 1 commit
203
+ - branch -v: honor core.abbrev
204
221
-* dc/stash-con-untracked (2011-06-26) 1 commit
222
- - stash: Add --include-untracked option to stash and remove all untracked files
205
+Perhaps needs an updated commit log message?
206
+
207
+* jc/checkout-reflog-fix (2011-07-06) 3 commits
208
+ - Merge commit 'v1.7.6' into jc/checkout-reflog-fix
209
+ - Merge commit 'v1.7.0' into jc/checkout-reflog-fix
210
+ - Merge commit 'v1.6.0' into jc/checkout-reflog-fix
211
+ (this branch uses jc/maint-checkout-reflog-fix.)
212
213
Will merge to "next".
214
226
-* jn/doc-dashdash (2011-06-29) 2 commits
227
- (merged to 'next' on 2011-07-01 at 5d51929)
228
- + Documentation/i18n: quote double-dash for AsciiDoc
229
- + Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
230
- (this branch uses jn/maint-doc-dashdash.)
215
+* jc/maint-checkout-reflog-fix (2011-07-06) 1 commit
216
+ - checkout: do not write bogus reflog entry out
217
+ (this branch is used by jc/checkout-reflog-fix.)
218
232
-Will merge to "master".
219
+* js/ref-namespaces (2011-07-11) 4 commits
220
+ - ref namespaces: documentation
221
+ - ref namespaces: Support remote repositories via upload-pack and receive-pack
222
+ - ref namespaces: infrastructure
223
+ - Fix prefix handling in ref iteration functions
224
234
-* jn/maint-doc-dashdash (2011-06-29) 1 commit
235
- (merged to 'next' on 2011-07-01 at 55ab98d)
236
- + Documentation: quote double-dash for AsciiDoc
237
- (this branch is used by jn/doc-dashdash.)
225
+Would be nice to have some tests before merging to "next", no?
226
239
-Will merge to "master" as part of jn/doc-dashdash and later to "maint".
227
+* mz/doc-synopsis-verse (2011-07-06) 1 commit
228
+ - Documentation: use [verse] for SYNOPSIS sections
229
241
-* js/rebase-typo-branch-squelch-usage (2011-06-29) 1 commit
242
- (merged to 'next' on 2011-07-01 at b5b4c03)
243
- + rebase: do not print lots of usage hints after an obvious error message
230
+Will merge to "next".
231
245
-Will merge to "master".
232
+* rc/histogram-diff (2011-07-12) 7 commits
233
+ - xdiff/xprepare: use a smaller sample size for histogram diff
234
+ - xdiff/xprepare: skip classification
235
+ - teach --histogram to diff
236
+ - t4033-diff-patience: factor out tests
237
+ - xdiff/xpatience: factor out fall-back-diff function
238
+ - xdiff/xprepare: refactor abort cleanups
239
+ - xdiff/xprepare: use memset()
240
247
-* nk/ref-doc (2011-06-23) 7 commits
248
- (merged to 'next' on 2011-07-01 at 9ff278d)
249
- + glossary: clarify description of HEAD
250
- + glossary: update description of head and ref
251
- + glossary: update description of "tag"
252
- + git.txt: de-emphasize the implementation detail of a ref
253
- + check-ref-format doc: de-emphasize the implementation detail of a ref
254
- + git-remote.txt: avoid sounding as if loose refs are the only ones in the world
255
- + git-remote.txt: fix wrong remote refspec
241
+* rr/revert-cherry-pick-continue (2011-07-11) 17 commits
242
+ - revert: Introduce --continue to continue the operation
243
+ - revert: Introduce --reset to remove sequencer state
244
+ - revert: Remove sequencer state when no commits are pending
245
+ - reset: Make hard reset remove the sequencer state
246
+ - revert: Introduce a layer of indirection over pick_commits
247
+ - revert: Save command-line options for continuing operation
248
+ - revert: Save data for continuing after conflict resolution
249
+ - sequencer: Announce sequencer state location
250
+ - revert: Don't create invalid replay_opts in parse_args
251
+ - revert: Separate cmdline parsing from functional code
252
+ - revert: Introduce struct to keep command-line options
253
+ - revert: Eliminate global "commit" variable
254
+ - revert: Propogate errors upwards from do_pick_commit
255
+ - revert: Rename no_replay to record_origin
256
+ - revert: Don't check lone argument in get_encoding
257
+ - revert: Inline add_message_to_msg function
258
+ - advice: Introduce error_resolve_conflict
259
257
-Will merge to "master".
260
+* dc/stash-con-untracked (2011-06-26) 1 commit
261
+ (merged to 'next' on 2011-07-13 at 9ed0d1d)
262
+ + stash: Add --include-untracked option to stash and remove all untracked files
263
264
* jc/submodule-sync-no-auto-vivify (2011-06-26) 2 commits
265
(merged to 'next' on 2011-07-05 at b207ba3)
266
+ submodule add: always initialize .git/config entry
267
+ submodule sync: do not auto-vivify uninteresting submodule
268
264
-* jn/gitweb-search (2011-06-22) 4 commits
265
- - gitweb: Make git_search_* subroutines render whole pages
266
- - gitweb: Clean up code in git_search_* subroutines
267
- - gitweb: Split body of git_search into subroutines
268
- - gitweb: Check permissions first in git_search
269
+Will merge to "master".
270
270
-Will merge to "next".
271
+* jn/gitweb-search (2011-06-22) 4 commits
272
+ (merged to 'next' on 2011-07-13 at 455acdd)
273
+ + gitweb: Make git_search_* subroutines render whole pages
274
+ + gitweb: Clean up code in git_search_* subroutines
275
+ + gitweb: Split body of git_search into subroutines
276
+ + gitweb: Check permissions first in git_search
277
278
* ak/gcc46-profile-feedback (2011-06-20) 3 commits
279
(merged to 'next' on 2011-07-01 at 81bc0a7)
@@ -275,27 +281,12 @@ Will merge to "next".
281
+ Add profile feedback build to git
282
+ Add option to disable NORETURN
283
278
-* jc/maint-cygwin-trust-executable-bit-default (2011-06-20) 1 commit
279
- (merged to 'next' on 2011-07-01 at d85aa04)
280
- + cygwin: trust executable bit by default
281
-
282
-Fix for an ancient regression.
284
Will merge to "master".
285
286
* jk/tag-list-multiple-patterns (2011-06-20) 1 commit
287
(merged to 'next' on 2011-07-05 at 8db1bf0)
288
+ tag: accept multiple patterns for --list
289
289
-* jl/maint-fetch-recursive-fix (2011-06-20) 1 commit
290
- (merged to 'next' on 2011-07-01 at 476eee4)
291
- + fetch: Also fetch submodules in subdirectories in on-demand mode
292
-
293
-Will merge to "master".
294
-
295
-* fk/relink-upon-ldflags-update (2011-06-22) 1 commit
296
- (merged to 'next' on 2011-07-01 at 69b57d0)
297
- + Makefile: Track changes to LDFLAGS and relink when necessary
298
-
290
Will merge to "master".
291
292
* jk/maint-config-param (2011-06-22) 6 commits
@@ -308,17 +299,22 @@ Will merge to "master".
299
+ strbuf_split: add a max parameter
300
(this branch is used by jk/clone-cmdline-config.)
301
311
-Separated earlier parts of jk/clone-cmdline-config for maint.
302
+Will merge to "master".
303
+
304
+* jk/clone-cmdline-config (2011-06-22) 4 commits
305
+ (merged to 'next' on 2011-07-05 at a022613)
306
+ + clone: accept config options on the command line
307
+ + config: make git_config_parse_parameter a public function
308
+ + remote: use new OPT_STRING_LIST
309
+ + parse-options: add OPT_STRING_LIST helper
310
+ (this branch uses jk/maint-config-param.)
311
+
312
+Will merge to "master".
313
314
* jn/gitweb-split-header-html (2011-06-22) 1 commit
315
(merged to 'next' on 2011-07-05 at c60d9dc)
316
+ gitweb: Refactor git_header_html
317
317
-* aw/rebase-i-p (2011-06-19) 1 commit
318
- (merged to 'next' on 2011-07-01 at df3f3d8)
319
- + rebase -i -p: include non-first-parent commits in todo list
320
-
321
-Rerolled with a minor tweak.
318
Will merge to "master".
319
320
* en/merge-recursive (2011-06-13) 49 commits
@@ -374,43 +370,11 @@ Will merge to "master".
370
371
Haven't looked at the whole series yet.
372
377
-* fg/submodule-keep-updating (2011-06-13) 3 commits
378
- (merged to 'next' on 2011-07-01 at 227827c)
379
- + git-submodule.sh: clarify the "should we die now" logic
380
- + submodule update: continue when a checkout fails
381
- + git-sh-setup: add die_with_status
382
-
383
-Will merge to "master".
384
-
385
-* jc/no-gitweb-test-without-cgi-etc (2011-06-15) 1 commit
386
- (merged to 'next' on 2011-07-01 at 1db3fa4)
387
- + t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
388
-
389
-Will merge to "master".
390
-
373
* jn/mime-type-with-params (2011-06-30) 2 commits
374
(merged to 'next' on 2011-07-05 at 7caaf3b)
375
+ gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
376
+ gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
377
396
-* ln/gitweb-mime-types-split-at-blank (2011-06-15) 1 commit
397
- (merged to 'next' on 2011-07-01 at 765aa1e)
398
- + gitweb: allow space as delimiter in mime.types
399
-
400
-Will merge to "master".
401
-
402
-* md/interix-update (2011-06-15) 1 commit
403
- (merged to 'next' on 2011-07-01 at 0bc327d)
404
- + Update the Interix default build configuration.
405
-
406
-Will merge to "master".
407
-
408
-* rj/config-cygwin (2011-06-16) 3 commits
409
- (merged to 'next' on 2011-07-01 at 6da4aa5)
410
- + config.c: Make git_config() work correctly when called recursively
411
- + t1301-*.sh: Fix the 'forced modes' test on cygwin
412
- + help.c: Fix detection of custom merge strategy on cygwin
413
-
378
Will merge to "master".
379
380
* jk/archive-tar-filter (2011-06-22) 9 commits
@@ -425,7 +389,7 @@ Will merge to "master".
389
+ archive-tar: don't reload default config options
390
+ archive: reorder option parsing and config reading
391
428
-Rerolled.
392
+Will merge to "master".
393
394
* jc/index-pack (2011-06-05) 9 commits
395
(merged to 'next' on 2011-07-05 at 5062ba9)
@@ -442,17 +406,6 @@ Rerolled.
406
Killed "verify-pack" ;-) The next will be to update fsck, which would be a
407
bigger task.
408
445
-* an/shallow-doc (2011-06-08) 2 commits
446
- (merged to 'next' on 2011-07-01 at 6ba80ef)
447
- + Document the underlying protocol used by shallow repositories and --depth commands.
448
- + Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
449
-
450
-Will merge to "master".
451
-
452
-* jc/legacy-loose-object (2011-06-08) 1 commit
453
- (merged to 'next' on 2011-07-01 at 5561971)
454
- + sha1_file.c: "legacy" is really the current format
455
-
409
Will merge to "master".
410
411
* jc/zlib-wrap (2011-06-10) 7 commits
@@ -465,19 +418,10 @@ Will merge to "master".
418
+ zlib: wrap remaining calls to direct inflate/inflateEnd
419
+ zlib wrapper: refactor error message formatter
420
468
-This replaces the earlier attempt to deal with the mismatch between our
469
-expectation and what zlib API actually offers piecemeal.
421
+We used to use zlib incorrectly and botched inflating/deflating data
422
+that is more than 4GB long on platforms with 64-bit ulong.
423
471
-* jk/clone-cmdline-config (2011-06-22) 4 commits
472
- (merged to 'next' on 2011-07-05 at a022613)
473
- + clone: accept config options on the command line
474
- + config: make git_config_parse_parameter a public function
475
- + remote: use new OPT_STRING_LIST
476
- + parse-options: add OPT_STRING_LIST helper
477
- (this branch uses jk/maint-config-param.)
478
-
479
-Separated the earlier parts out to make it mergeable to the maintenance
480
-track.
424
+Will merge to "master".
425
426
* jk/tag-contains-ab (2011-06-30) 4 commits
427
- git skew: a tool to find how big a clock skew exists in the history
@@ -485,6 +429,10 @@ track.
429
+ default core.clockskew variable to one day
430
+ limit "contains" traversals based on commit timestamp
431
+ tag: speed up --contains calculation
432
+ (this branch is tangled with jk/generation-numbers.)
433
+
434
+Will revert the two commits from "next" once metadata-cache series gets
435
+more stable.
436
437
* jk/clone-detached (2011-06-07) 4 commits
438
- clone: always fetch remote HEAD
@@ -492,13 +440,11 @@ track.
440
- consider only branches in guess_remote_head
441
- t: add tests for cloning remotes with detached HEAD
442
495
-Somewhat involved bugfix.
496
-Will merge to "next".
443
+Somewhat involved bugfix. Seems to expose breakage in t5800 without the
444
+stalled "transport-helper-fix" series.
445
446
* jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits
499
- - submodule add: clean up duplicated code
500
- - submodule add: allow relative repository path even when no url is set
501
- - submodule add: test failure when url is not configured in superproject
502
-
503
-Will merge to "next".
504
-
447
+ (merged to 'next' on 2011-07-13 at f989abb)
448
+ + submodule add: clean up duplicated code
449
+ + submodule add: allow relative repository path even when no url is set
450
+ + submodule add: test failure when url is not configured in superproject