What's cooking (2011/07 #03)
Junio C Hamano committed
Jul 20, 2011 at 15:58 UTC
bb05e6a37137577cdb77d03bb37bbdf488938a7c
1 file changed
+204
-275
whats-cooking.txt
+204
-275
@@ -1,145 +1,134 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2011, #02; Wed, 13)
3
-X-master-at: 55272570dbe1c3f2a6f2f142c4bfe806665cd111
4
-X-next-at: 867dc3783dfcad0e8c9bdd1c8d299d5a82f5babc
2
+Subject: What's cooking in git.git (Jul 2011, #03; Wed, 20)
3
+X-master-at: d79bcd68056250d7c03bf9b12728ee2fd85a0ab3
4
+X-next-at: e1ef4147bce8b10d938f988e64e2adfef7cb94eb
5
6
-What's cooking in git.git (Jul 2011, #02; Wed, 13)
6
+What's cooking in git.git (Jul 2011, #03; Wed, 20)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
--------------------------------------------------
13
-[New Topics]
14
-
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
-* 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
13
+[Graduated to "master"]
14
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
15
+* ak/gcc46-profile-feedback (2011-06-20) 3 commits
16
+ (merged to 'next' on 2011-07-01 at 81bc0a7)
17
+ + Add explanation of the profile feedback build to the README
18
+ + Add profile feedback build to git
19
+ + Add option to disable NORETURN
20
26
-Needs squashing these into one.
21
+* jc/index-pack (2011-06-05) 9 commits
22
+ (merged to 'next' on 2011-07-05 at 5062ba9)
23
+ + verify-pack: use index-pack --verify
24
+ + index-pack: show histogram when emulating "verify-pack -v"
25
+ + index-pack: start learning to emulate "verify-pack -v"
26
+ + index-pack: a miniscule refactor
27
+ + index-pack --verify: read anomalous offsets from v2 idx file
28
+ + write_idx_file: need_large_offset() helper function
29
+ + index-pack: --verify
30
+ + write_idx_file: introduce a struct to hold idx customization options
31
+ + index-pack: group the delta-base array entries also by type
32
28
-* jc/pack-order-tweak (2011-07-08) 2 commits
29
- - pack-objects: optimize "recency order"
30
- - core: log offset pack data accesses happened
33
+* jc/submodule-sync-no-auto-vivify (2011-06-26) 2 commits
34
+ (merged to 'next' on 2011-07-05 at b207ba3)
35
+ + submodule add: always initialize .git/config entry
36
+ + submodule sync: do not auto-vivify uninteresting submodule
37
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.)
38
+* jc/zlib-wrap (2011-06-10) 7 commits
39
+ (merged to 'next' on 2011-07-05 at 77bcbdc)
40
+ + zlib: allow feeding more than 4GB in one go
41
+ + zlib: zlib can only process 4GB at a time
42
+ + zlib: wrap deflateBound() too
43
+ + zlib: wrap deflate side of the API
44
+ + zlib: wrap inflateInit2 used to accept only for gzip format
45
+ + zlib: wrap remaining calls to direct inflate/inflateEnd
46
+ + zlib wrapper: refactor error message formatter
47
41
-Getting rerolled.
48
+We used to use zlib incorrectly and botched inflating/deflating data
49
+that is more than 4GB long on platforms with 64-bit ulong.
50
43
-* js/maint-add-path-stat-pwd (2011-07-11) 1 commit
44
- - get_pwd_cwd(): Do not trust st_dev/st_ino blindly
51
+* jk/archive-tar-filter (2011-06-22) 9 commits
52
+ (merged to 'next' on 2011-07-05 at add3e7f)
53
+ + upload-archive: allow user to turn off filters
54
+ + archive: provide builtin .tar.gz filter
55
+ + archive: implement configurable tar filters
56
+ + archive: refactor file extension format-guessing
57
+ + archive: move file extension format-guessing lower
58
+ + archive: pass archiver struct to write_archive callback
59
+ + archive: refactor list of archive formats
60
+ + archive-tar: don't reload default config options
61
+ + archive: reorder option parsing and config reading
62
46
-Will merge to "next".
63
+* jk/clone-cmdline-config (2011-06-22) 4 commits
64
+ (merged to 'next' on 2011-07-05 at a022613)
65
+ + clone: accept config options on the command line
66
+ + config: make git_config_parse_parameter a public function
67
+ + remote: use new OPT_STRING_LIST
68
+ + parse-options: add OPT_STRING_LIST helper
69
+ (this branch uses jk/maint-config-param.)
70
48
-* ms/help-unknown (2011-07-08) 1 commit
49
- - help_unknown_cmd: do not propose an "unknown" cmd
71
+* jk/maint-config-param (2011-06-22) 6 commits
72
+ (merged to 'next' on 2011-07-05 at 2dce181)
73
+ + config: use strbuf_split_str instead of a temporary strbuf
74
+ + strbuf: allow strbuf_split to work on non-strbufs
75
+ + config: avoid segfault when parsing command-line config
76
+ + config: die on error in command-line config
77
+ + fix "git -c" parsing of values with equals signs
78
+ + strbuf_split: add a max parameter
79
+ (this branch is used by jk/clone-cmdline-config.)
80
51
-Will merge to "next".
81
+* jk/tag-list-multiple-patterns (2011-06-20) 1 commit
82
+ (merged to 'next' on 2011-07-05 at 8db1bf0)
83
+ + tag: accept multiple patterns for --list
84
53
-* mz/doc-rebase-abort (2011-07-11) 1 commit
54
- - git-rebase.txt: clarify that --abort checks out <branch>
85
+* jn/gitweb-split-header-html (2011-06-22) 1 commit
86
+ (merged to 'next' on 2011-07-05 at c60d9dc)
87
+ + gitweb: Refactor git_header_html
88
56
-Will merge to "next".
89
+* jn/mime-type-with-params (2011-06-30) 2 commits
90
+ (merged to 'next' on 2011-07-05 at 7caaf3b)
91
+ + gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
92
+ + gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
93
94
--------------------------------------------------
59
-[Graduated to "master"]
95
+[New Topics]
96
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
97
+* jc/maint-reset-unmerged-path (2011-07-13) 1 commit
98
+ (merged to 'next' on 2011-07-19 at bbc2d54)
99
+ + reset [<commit>] paths...: do not mishandle unmerged paths
100
+ (this branch is used by jc/diff-index-refactor.)
101
+
102
+* jc/diff-index-refactor (2011-07-13) 2 commits
103
+ - diff-lib: refactor run_diff_index() and do_diff_cache()
104
+ - diff-lib: simplify do_diff_cache()
105
+ (this branch uses jc/maint-reset-unmerged-path.)
106
+
107
+* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
108
+ - t5800: point out that deleting branches does not work
109
+ - t5800: document inability to push new branch with old content
110
+ (this branch uses sr/transport-helper-fix.)
111
+
112
+* vi/make-test-vector-less-specific (2011-07-19) 1 commit
113
+ - tests: cleanup binary test vector files
114
+
115
+* jk/http-auth-keyring (2011-07-20) 13 commits
116
+ - credentials: add "getpass" helper
117
+ - credentials: add "store" helper
118
+ - credentials: add "cache" helper
119
+ - docs: end-user documentation for the credential subsystem
120
+ - http: use hostname in credential description
121
+ - allow the user to configure credential helpers
122
+ - look for credentials in config before prompting
123
+ - http: use credential API to get passwords
124
+ - introduce credentials API
125
+ - http: retry authentication failures for all http requests
126
+ - remote-curl: don't retry auth failures with dumb protocol
127
+ - improve httpd auth tests
128
+ - url: decode buffers that are not NUL-terminated
129
+
130
+* tc/minix (2011-07-20) 1 commit
131
+ - Makefile: add Minix configuration options.
132
133
--------------------------------------------------
134
[Stalled]
@@ -158,32 +147,6 @@ Will merge to "maint" later.
147
148
Would need another round to separate per-pack and per-session limits.
149
161
-* sr/transport-helper-fix (2011-06-19) 20 commits
162
- - transport-helper: implement marks location as capability
163
- - transport-helper: Use capname for gitdir capability too
164
- - transport-helper: export is no longer always the last command
165
- - transport-helper: change import semantics
166
- - transport-helper: update ref status after push with export
167
- - transport-helper: use the new done feature where possible
168
- - transport-helper: check status code of finish_command
169
- - transport-helper: factor out push_update_refs_status
170
- - fast-export: support done feature
171
- - fast-import: introduce 'done' command
172
- - git-remote-testgit: fix error handling
173
- - git-remote-testgit: only push for non-local repositories
174
- - remote-curl: accept empty line as terminator
175
- - git_remote_helpers: push all refs during a non-local export
176
- - transport-helper: don't feed bogus refs to export push
177
- - teach remote-testgit to import non-HEAD refs
178
- - t5800: document some non-functional parts of remote helpers
179
- - t5800: use skip_all instead of prereq
180
- - t5800: factor out some ref tests
181
- - transport-helper: fix minor leak in push_refs_with_export
182
-
183
-At least Patch 10/20 (git-remote-testgit: fix error handling) and Patch
184
-15/20 (transport-helper: use the new done feature where possible) need a
185
-reroll.
186
-
150
* jm/mergetool-pathspec (2011-06-22) 2 commits
151
- mergetool: Don't assume paths are unmerged
152
- mergetool: Add tests for filename with whitespace
@@ -194,10 +157,75 @@ Cf. $gmane/176254, 176255, 166256
157
--------------------------------------------------
158
[Cooking]
159
197
-* jc/maint-mergetool-read-fix (2011-07-01) 1 commit
198
- - mergetool: check return value from read
160
+* sr/transport-helper-fix (2011-07-19) 21 commits
161
+ (merged to 'next' on 2011-07-19 at e1ef414)
162
+ + transport-helper: die early on encountering deleted refs
163
+ + transport-helper: implement marks location as capability
164
+ + transport-helper: Use capname for refspec capability too
165
+ + transport-helper: change import semantics
166
+ + transport-helper: update ref status after push with export
167
+ + transport-helper: use the new done feature where possible
168
+ + transport-helper: check status code of finish_command
169
+ + transport-helper: factor out push_update_refs_status
170
+ + fast-export: support done feature
171
+ + fast-import: introduce 'done' command
172
+ + git-remote-testgit: fix error handling
173
+ + git-remote-testgit: only push for non-local repositories
174
+ + remote-curl: accept empty line as terminator
175
+ + remote-helpers: export GIT_DIR variable to helpers
176
+ + git_remote_helpers: push all refs during a non-local export
177
+ + transport-helper: don't feed bogus refs to export push
178
+ + git-remote-testgit: import non-HEAD refs
179
+ + t5800: document some non-functional parts of remote helpers
180
+ + t5800: use skip_all instead of prereq
181
+ + t5800: factor out some ref tests
182
+ + transport-helper: fix minor leak in push_refs_with_export
183
+ (this branch is used by sr/transport-helper-fix-rfc.)
184
+
185
+* bw/log-all-ref-updates-doc (2011-07-12) 1 commit
186
+ (merged to 'next' on 2011-07-14 at 31b80a8)
187
+ + Documentation: clearly specify what refs are honored by core.logAllRefUpdates
188
+
189
+* di/fast-import-doc (2011-07-13) 2 commits
190
+ - doc/fast-import: document feature import-marks-if-exists
191
+ - doc/fast-import: clarify notemodify command
192
+
193
+Comments from fast-import folks?
194
+
195
+* dz/connect-error-report (2011-07-14) 1 commit
196
+ (merged to 'next' on 2011-07-14 at bf1c775)
197
+ + Do not log unless all connect() attempts fail
198
+
199
+* jc/pack-order-tweak (2011-07-08) 2 commits
200
+ - pack-objects: optimize "recency order"
201
+ - core: log offset pack data accesses happened
202
+
203
+* jk/generation-numbers (2011-07-14) 8 commits
204
+ - limit "contains" traversals based on commit generation
205
+ - check commit generation cache validity against grafts
206
+ - pretty: support %G to show the generation number of a commit
207
+ - commit: add commit_generation function
208
+ - add metadata-cache infrastructure
209
+ - decorate: allow storing values instead of pointers
210
+ - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
211
+ + tag: speed up --contains calculation
212
+ (this branch is tangled with jk/tag-contains-ab.)
213
+
214
+* js/maint-add-path-stat-pwd (2011-07-11) 1 commit
215
+ (merged to 'next' on 2011-07-14 at c6fef9d)
216
+ + get_pwd_cwd(): Do not trust st_dev/st_ino blindly
217
+
218
+* ms/help-unknown (2011-07-08) 1 commit
219
+ (merged to 'next' on 2011-07-14 at d7976b4)
220
+ + help_unknown_cmd: do not propose an "unknown" cmd
221
+
222
+* mz/doc-rebase-abort (2011-07-13) 1 commit
223
+ (merged to 'next' on 2011-07-14 at a1a612c)
224
+ + rebase: clarify "restore the original branch"
225
200
-Will merge to "next".
226
+* jc/maint-mergetool-read-fix (2011-07-01) 1 commit
227
+ (merged to 'next' on 2011-07-14 at 2056a67)
228
+ + mergetool: check return value from read
229
230
* nk/branch-v-abbrev (2011-07-01) 1 commit
231
- branch -v: honor core.abbrev
@@ -205,29 +233,27 @@ Will merge to "next".
233
Perhaps needs an updated commit log message?
234
235
* 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
236
+ (merged to 'next' on 2011-07-14 at 5982cdd)
237
+ + Merge commit 'v1.7.6' into jc/checkout-reflog-fix
238
+ + Merge commit 'v1.7.0' into jc/checkout-reflog-fix
239
+ + Merge commit 'v1.6.0' into jc/checkout-reflog-fix
240
(this branch uses jc/maint-checkout-reflog-fix.)
241
213
-Will merge to "next".
214
-
242
* jc/maint-checkout-reflog-fix (2011-07-06) 1 commit
216
- - checkout: do not write bogus reflog entry out
243
+ + checkout: do not write bogus reflog entry out
244
(this branch is used by jc/checkout-reflog-fix.)
245
219
-* js/ref-namespaces (2011-07-11) 4 commits
246
+* js/ref-namespaces (2011-07-14) 6 commits
247
+ - t5509: (fixup) partial readability fix
248
+ - ref namespaces: tests
249
- ref namespaces: documentation
250
- ref namespaces: Support remote repositories via upload-pack and receive-pack
251
- ref namespaces: infrastructure
252
- Fix prefix handling in ref iteration functions
253
225
-Would be nice to have some tests before merging to "next", no?
226
-
254
* mz/doc-synopsis-verse (2011-07-06) 1 commit
228
- - Documentation: use [verse] for SYNOPSIS sections
229
-
230
-Will merge to "next".
255
+ (merged to 'next' on 2011-07-14 at 34d45e2)
256
+ + Documentation: use [verse] for SYNOPSIS sections
257
258
* rc/histogram-diff (2011-07-12) 7 commits
259
- xdiff/xprepare: use a smaller sample size for histogram diff
@@ -238,15 +264,15 @@ Will merge to "next".
264
- xdiff/xprepare: refactor abort cleanups
265
- xdiff/xprepare: use memset()
266
241
-* rr/revert-cherry-pick-continue (2011-07-11) 17 commits
267
+* rr/revert-cherry-pick-continue (2011-07-19) 18 commits
268
- revert: Introduce --continue to continue the operation
243
- - revert: Introduce --reset to remove sequencer state
269
+ - revert: Don't implictly stomp pending sequencer operation
270
- 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
271
+ - reset: Make reset remove the sequencer state
272
+ - revert: Introduce --reset to remove sequencer state
273
+ - revert: Make pick_commits functionally act on a commit list
274
- revert: Save command-line options for continuing operation
275
- revert: Save data for continuing after conflict resolution
249
- - sequencer: Announce sequencer state location
276
- revert: Don't create invalid replay_opts in parse_args
277
- revert: Separate cmdline parsing from functional code
278
- revert: Introduce struct to keep command-line options
@@ -254,20 +280,16 @@ Will merge to "next".
280
- revert: Propogate errors upwards from do_pick_commit
281
- revert: Rename no_replay to record_origin
282
- revert: Don't check lone argument in get_encoding
257
- - revert: Inline add_message_to_msg function
283
+ - revert: Simplify and inline add_message_to_msg
284
+ - config: Introduce functions to write non-standard file
285
- advice: Introduce error_resolve_conflict
286
287
+Getting very close, I would think...
288
+
289
* dc/stash-con-untracked (2011-06-26) 1 commit
290
(merged to 'next' on 2011-07-13 at 9ed0d1d)
291
+ stash: Add --include-untracked option to stash and remove all untracked files
292
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
-
269
-Will merge to "master".
270
-
293
* jn/gitweb-search (2011-06-22) 4 commits
294
(merged to 'next' on 2011-07-13 at 455acdd)
295
+ gitweb: Make git_search_* subroutines render whole pages
@@ -275,49 +297,8 @@ Will merge to "master".
297
+ gitweb: Split body of git_search into subroutines
298
+ gitweb: Check permissions first in git_search
299
278
-* ak/gcc46-profile-feedback (2011-06-20) 3 commits
279
- (merged to 'next' on 2011-07-01 at 81bc0a7)
280
- + Add explanation of the profile feedback build to the README
281
- + Add profile feedback build to git
282
- + Add option to disable NORETURN
283
-
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
-
290
-Will merge to "master".
291
-
292
-* jk/maint-config-param (2011-06-22) 6 commits
293
- (merged to 'next' on 2011-07-05 at 2dce181)
294
- + config: use strbuf_split_str instead of a temporary strbuf
295
- + strbuf: allow strbuf_split to work on non-strbufs
296
- + config: avoid segfault when parsing command-line config
297
- + config: die on error in command-line config
298
- + fix "git -c" parsing of values with equals signs
299
- + strbuf_split: add a max parameter
300
- (this branch is used by jk/clone-cmdline-config.)
301
-
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
-
318
-Will merge to "master".
319
-
320
-* en/merge-recursive (2011-06-13) 49 commits
300
+* en/merge-recursive (2011-07-14) 50 commits
301
+ - fixup! Do not assume that qsort is stable
302
- t3030: fix accidental success in symlink rename
303
- merge-recursive: Fix working copy handling for rename/rename/add/add
304
- merge-recursive: add handling for rename/rename/add-dest/add-dest
@@ -368,71 +349,19 @@ Will merge to "master".
349
- t6042: Add failing testcase for rename/modify/add-source conflict
350
- t6042: Add a testcase where git deletes an untracked file
351
371
-Haven't looked at the whole series yet.
372
-
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
-
378
-Will merge to "master".
379
-
380
-* jk/archive-tar-filter (2011-06-22) 9 commits
381
- (merged to 'next' on 2011-07-05 at add3e7f)
382
- + upload-archive: allow user to turn off filters
383
- + archive: provide builtin .tar.gz filter
384
- + archive: implement configurable tar filters
385
- + archive: refactor file extension format-guessing
386
- + archive: move file extension format-guessing lower
387
- + archive: pass archiver struct to write_archive callback
388
- + archive: refactor list of archive formats
389
- + archive-tar: don't reload default config options
390
- + archive: reorder option parsing and config reading
391
-
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)
396
- + verify-pack: use index-pack --verify
397
- + index-pack: show histogram when emulating "verify-pack -v"
398
- + index-pack: start learning to emulate "verify-pack -v"
399
- + index-pack: a miniscule refactor
400
- + index-pack --verify: read anomalous offsets from v2 idx file
401
- + write_idx_file: need_large_offset() helper function
402
- + index-pack: --verify
403
- + write_idx_file: introduce a struct to hold idx customization options
404
- + index-pack: group the delta-base array entries also by type
405
-
406
-Killed "verify-pack" ;-) The next will be to update fsck, which would be a
407
-bigger task.
408
-
409
-Will merge to "master".
410
-
411
-* jc/zlib-wrap (2011-06-10) 7 commits
412
- (merged to 'next' on 2011-07-05 at 77bcbdc)
413
- + zlib: allow feeding more than 4GB in one go
414
- + zlib: zlib can only process 4GB at a time
415
- + zlib: wrap deflateBound() too
416
- + zlib: wrap deflate side of the API
417
- + zlib: wrap inflateInit2 used to accept only for gzip format
418
- + zlib: wrap remaining calls to direct inflate/inflateEnd
419
- + zlib wrapper: refactor error message formatter
420
-
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
-
424
-Will merge to "master".
352
+Looked at up to 29/48; looks basically sound.
353
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
354
+* jk/tag-contains-ab (2011-07-14) 5 commits
355
+ (merged to 'next' on 2011-07-14 at 002a9d7)
356
+ + Revert clock-skew based attempt to optimize tag --contains traversal
357
+ + git skew: a tool to find how big a clock skew exists in the history
358
(merged to 'next' on 2011-07-05 at f9cf575)
359
+ default core.clockskew variable to one day
360
+ limit "contains" traversals based on commit timestamp
361
+ tag: speed up --contains calculation
362
(this branch is tangled with jk/generation-numbers.)
363
434
-Will revert the two commits from "next" once metadata-cache series gets
435
-more stable.
364
+Reverted the commits near the tip.
365
366
* jk/clone-detached (2011-06-07) 4 commits
367
- clone: always fetch remote HEAD