What's cooking (2011/07 #01)
Junio C Hamano committed
Jul 6, 2011 at 17:08 UTC
ebfa00b8a8a6f5d37aaaec7a5a94b795b4fa35e8
1 file changed
+289
-352
whats-cooking.txt
+289
-352
@@ -1,147 +1,146 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2011, #05; Thu, 30)
3
-X-master-at: 033c2dc4364042b9e6dbd44e82e1974f78a72567
4
-X-next-at: 9901923cf0994582592a34128a466c58735621fd
2
+Subject: What's cooking in git.git (Jul 2011, #01; Wed, 6)
3
+X-master-at: cf13f6ca40529a33b66c5e1e7cc69947974b3648
4
+X-next-at: 02b4229c523b5c12ecb6c426ad6edd106405518c
5
6
-What's cooking in git.git (Jun 2011, #05; Thu, 30)
6
+What's cooking in git.git (Jul 2011, #01; Wed, 6)
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
-Now that 1.7.6 is out, 'next' has been rewound and rebuilt to make its
13
-history appear a bit cleaner.
14
-
15
-Also I updated the order of topics in 'pu' to have the ones that are
16
-scheduled for 'next' early in the sequence (and fixes and documentation
17
-updates come earlier than new features), and pushing the stalled ones down
18
-to the very end.
19
-
20
-The tip of 'pu' is broken with respect to t7610 as of today.
21
-
12
--------------------------------------------------
13
[New Topics]
14
25
-* bc/submodule-foreach-stdin-fix-1.7.4 (2011-06-29) 2 commits
26
- - git-submodule.sh: preserve stdin for the command spawned by foreach
27
- - t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
15
+* jc/maint-mergetool-read-fix (2011-07-01) 1 commit
16
+ - mergetool: check return value from read
17
29
-Will merge to 'next'.
18
+* nk/branch-v-abbrev (2011-07-01) 1 commit
19
+ - branch -v: honor core.abbrev
20
31
-* dc/stash-con-untracked (2011-06-26) 1 commit
32
- - stash: Add --include-untracked option to stash and remove all untracked files
33
-
34
-* jn/doc-dashdash (2011-06-29) 2 commits
35
- - Documentation/i18n: quote double-dash for AsciiDoc
36
- - Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
37
- (this branch uses jn/maint-doc-dashdash.)
21
+Perhaps needs an updated commit log message?
22
39
-Will merge to 'next'.
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.)
28
41
-* jn/maint-doc-dashdash (2011-06-29) 1 commit
42
- - Documentation: quote double-dash for AsciiDoc
43
- (this branch is used by jn/doc-dashdash.)
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.)
32
45
-Will merge to 'next'.
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
38
47
-* js/rebase-typo-branch-squelch-usage (2011-06-29) 1 commit
48
- - rebase: do not print lots of usage hints after an obvious error message
39
+* mz/doc-synopsis-verse (2011-07-06) 1 commit
40
+ - Documentation: use [verse] for SYNOPSIS sections
41
50
-Will merge to 'next'.
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()
47
52
-* nk/ref-doc (2011-06-23) 7 commits
53
- - glossary: clarify description of HEAD
54
- - glossary: update description of head and ref
55
- - glossary: update description of "tag"
56
- - git.txt: de-emphasize the implementation detail of a ref
57
- - check-ref-format doc: de-emphasize the implementation detail of a ref
58
- - git-remote.txt: avoid sounding as if loose refs are the only ones in the world
59
- - git-remote.txt: fix wrong remote refspec
48
+--------------------------------------------------
49
+[Graduated to "master"]
50
61
-Will merge to 'next'.
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
63
-* jc/submodule-sync-no-auto-vivify (2011-06-26) 2 commits
64
- - submodule add: always initialize .git/config entry
65
- - submodule sync: do not auto-vivify uninteresting submodule
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
67
-* jn/gitweb-search (2011-06-22) 4 commits
68
- - gitweb: Make git_search_* subroutines render whole pages
69
- - gitweb: Clean up code in git_search_* subroutines
70
- - gitweb: Split body of git_search into subroutines
71
- - gitweb: Check permissions first in git_search
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
73
---------------------------------------------------
74
-[Graduated to "master"]
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
76
-* db/http-cookies (2011-06-03) 1 commit
77
- (merged to 'next' on 2011-06-06 at 90d736a)
78
- + http: pass http.cookiefile using CURLOPT_COOKIEFILE
79
-
80
-* ef/maint-win-verify-path (2011-06-08) 5 commits
81
- - verify_dotfile(): do not assume '/' is the path seperator
82
- (merged to 'next' on 2011-06-07 at b418e05)
83
- + verify_path(): simplify check at the directory boundary
84
- (merged to 'next' on 2011-06-01 at f316f68)
85
- + verify_path: consider dos drive prefix
86
- + real_path: do not assume '/' is the path seperator
87
- + A Windows path starting with a backslash is absolute
88
-
89
-* jc/advice-about-to-lose-commit (2011-05-24) 1 commit
90
- (merged to 'next' on 2011-05-30 at 42385cc)
91
- + checkout: make advice when reattaching the HEAD less loud
92
-
93
-* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
94
- (merged to 'next' on 2011-06-01 at 79d868a)
95
- + diff-index --quiet: learn the "stop feeding the backend early" logic
96
- + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
97
-
98
-* jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
99
- (merged to 'next' on 2011-06-06 at 6a59bb7)
100
- + checkout -b <name>: correctly detect existing branch
101
-
102
-* jk/combine-diff-binary-etc (2011-05-24) 5 commits
103
- (merged to 'next' on 2011-05-24 at 07cf180)
104
- + combine-diff: respect textconv attributes
105
- + refactor get_textconv to not require diff_filespec
106
- + combine-diff: handle binary files as binary
107
- + combine-diff: calculate mode_differs earlier
108
- + combine-diff: split header printing into its own function
109
-
110
-* jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
111
- (merged to 'next' on 2011-06-02 at 8626cc6)
112
- + git status --ignored: tests and docs
113
- + status: fix bug with missing --ignore files
114
-
115
-* jk/transport-helper-fix (2011-06-07) 8 commits
116
- . git_remote_helpers: push all refs during a non-local export
117
- . transport-helper: don't feed bogus refs to export push
118
- . teach remote-testgit to import multiple refs
119
- . teach remote-testgit to import non-HEAD refs
120
- . t5800: document some non-functional parts of remote helpers
121
- . t5800: factor out some ref tests
122
- . git-remote-testgit: exit gracefully after push
123
- . transport-helper: fix minor leak in push_refs_with_export
124
-
125
-sr/transport-helper-fix is a superset of this.
126
-
127
-* js/i18n-windows (2011-06-06) 3 commits
128
- (merged to 'next' on 2011-06-06 at d8c4ba3)
129
- + Windows: teach getenv to do a case-sensitive search
130
- + mingw.c: move definition of mingw_getenv down
131
- + sh-i18n--envsubst: do not crash when no arguments are given
132
-
133
-* mg/diff-stat-count (2011-05-27) 4 commits
134
- (merged to 'next' on 2011-06-01 at 5cdb776)
135
- + diff --stat-count: finishing touches
136
- + diff-options.txt: describe --stat-{width,name-width,count}
137
- + diff: introduce --stat-lines to limit the stat lines
138
- + diff.c: omit hidden entries from namelen calculation with --stat
139
-
140
-* rs/grep-color (2011-06-05) 3 commits
141
- (merged to 'next' on 2011-06-06 at fd6bae1)
142
- + grep: add --heading
143
- + grep: add --break
144
- + grep: fix coloring of hunk marks between files
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
144
145
--------------------------------------------------
146
[Stalled]
@@ -196,73 +195,131 @@ I think this is a good idea, but it probably needs a re-roll.
195
--------------------------------------------------
196
[Cooking]
197
199
-* ak/gcc46-profile-feedback (2011-06-20) 3 commits
200
- - Add explanation of the profile feedback build to the README
201
- - Add profile feedback build to git
202
- - Add option to disable NORETURN
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
213
+
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
218
+
219
+Will merge to "master".
220
+
221
+* dc/stash-con-untracked (2011-06-26) 1 commit
222
+ - stash: Add --include-untracked option to stash and remove all untracked files
223
+
224
+Will merge to "next".
225
+
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.)
231
+
232
+Will merge to "master".
233
+
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.)
238
+
239
+Will merge to "master" as part of jn/doc-dashdash and later to "maint".
240
204
-Will merge to 'next'.
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
244
+
245
+Will merge to "master".
246
+
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
256
+
257
+Will merge to "master".
258
+
259
+* jc/submodule-sync-no-auto-vivify (2011-06-26) 2 commits
260
+ (merged to 'next' on 2011-07-05 at b207ba3)
261
+ + submodule add: always initialize .git/config entry
262
+ + submodule sync: do not auto-vivify uninteresting submodule
263
+
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
+
270
+Will merge to "next".
271
+
272
+* ak/gcc46-profile-feedback (2011-06-20) 3 commits
273
+ (merged to 'next' on 2011-07-01 at 81bc0a7)
274
+ + Add explanation of the profile feedback build to the README
275
+ + Add profile feedback build to git
276
+ + Add option to disable NORETURN
277
278
* jc/maint-cygwin-trust-executable-bit-default (2011-06-20) 1 commit
207
- - cygwin: trust executable bit by default
279
+ (merged to 'next' on 2011-07-01 at d85aa04)
280
+ + cygwin: trust executable bit by default
281
282
Fix for an ancient regression.
210
-Will merge to 'next'.
283
+Will merge to "master".
284
285
* jk/tag-list-multiple-patterns (2011-06-20) 1 commit
213
- - tag: accept multiple patterns for --list
214
-
215
-Will merge to 'next' later.
286
+ (merged to 'next' on 2011-07-05 at 8db1bf0)
287
+ + tag: accept multiple patterns for --list
288
289
* jl/maint-fetch-recursive-fix (2011-06-20) 1 commit
218
- - fetch: Also fetch submodules in subdirectories in on-demand mode
290
+ (merged to 'next' on 2011-07-01 at 476eee4)
291
+ + fetch: Also fetch submodules in subdirectories in on-demand mode
292
220
-Will merge to 'next'.
221
-
222
-* rr/revert-cherry-pick-continue (2011-06-21) 13 commits
223
- - revert: Introduce --continue to continue the operation
224
- - revert: Introduce skip-all to cleanup sequencer data
225
- - revert: Introduce a layer of indirection over pick_commits
226
- - revert: Persist data for continuation
227
- - revert: Catch incompatible command-line options early
228
- - revert: Separate cmdline parsing from functional code
229
- - revert: Introduce struct to keep command-line options
230
- - revert: Rename no_replay to record_origin
231
- - revert: Eliminate global "commit" variable
232
- - revert: Propogate errors upwards from do_pick_commit
233
- - revert: Don't check lone argument in get_encoding
234
- - revert: Factor out add_message_to_msg function
235
- - advice: Introduce error_resolve_conflict
236
-
237
-Under discussion, just queued here so that it is not lost.
293
+Will merge to "master".
294
295
* fk/relink-upon-ldflags-update (2011-06-22) 1 commit
240
- - Makefile: Track changes to LDFLAGS and relink when necessary
296
+ (merged to 'next' on 2011-07-01 at 69b57d0)
297
+ + Makefile: Track changes to LDFLAGS and relink when necessary
298
242
-Will merge to 'next'.
299
+Will merge to "master".
300
301
* jk/maint-config-param (2011-06-22) 6 commits
245
- - config: use strbuf_split_str instead of a temporary strbuf
246
- - strbuf: allow strbuf_split to work on non-strbufs
247
- - config: avoid segfault when parsing command-line config
248
- - config: die on error in command-line config
249
- - fix "git -c" parsing of values with equals signs
250
- - strbuf_split: add a max parameter
302
+ (merged to 'next' on 2011-07-05 at 2dce181)
303
+ + config: use strbuf_split_str instead of a temporary strbuf
304
+ + strbuf: allow strbuf_split to work on non-strbufs
305
+ + config: avoid segfault when parsing command-line config
306
+ + config: die on error in command-line config
307
+ + fix "git -c" parsing of values with equals signs
308
+ + strbuf_split: add a max parameter
309
(this branch is used by jk/clone-cmdline-config.)
310
311
Separated earlier parts of jk/clone-cmdline-config for maint.
254
-Will merge to 'next' later.
312
313
* jn/gitweb-split-header-html (2011-06-22) 1 commit
257
- - gitweb: Refactor git_header_html
258
-
259
-Will merge to 'next' later.
314
+ (merged to 'next' on 2011-07-05 at c60d9dc)
315
+ + gitweb: Refactor git_header_html
316
317
* aw/rebase-i-p (2011-06-19) 1 commit
262
- - rebase -i -p: include non-first-parent commits in todo list
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.
265
-Will merge to 'next'.
322
+Will merge to "master".
323
324
* en/merge-recursive (2011-06-13) 49 commits
325
- t3030: fix accidental success in symlink rename
@@ -318,114 +375,116 @@ Will merge to 'next'.
375
Haven't looked at the whole series yet.
376
377
* fg/submodule-keep-updating (2011-06-13) 3 commits
321
- - git-submodule.sh: clarify the "should we die now" logic
322
- - submodule update: continue when a checkout fails
323
- - git-sh-setup: add die_with_status
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
325
-Will merge to 'next'.
383
+Will merge to "master".
384
385
* jc/no-gitweb-test-without-cgi-etc (2011-06-15) 1 commit
328
- - t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
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
330
-Will merge to 'next'.
389
+Will merge to "master".
390
391
* jn/mime-type-with-params (2011-06-30) 2 commits
333
- - gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
334
- - gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
335
-
336
-Will merge to 'next' later.
392
+ (merged to 'next' on 2011-07-05 at 7caaf3b)
393
+ + gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
394
+ + gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
395
396
* ln/gitweb-mime-types-split-at-blank (2011-06-15) 1 commit
339
- - gitweb: allow space as delimiter in mime.types
397
+ (merged to 'next' on 2011-07-01 at 765aa1e)
398
+ + gitweb: allow space as delimiter in mime.types
399
341
-Will merge to 'next'.
400
+Will merge to "master".
401
402
* md/interix-update (2011-06-15) 1 commit
344
- - Update the Interix default build configuration.
403
+ (merged to 'next' on 2011-07-01 at 0bc327d)
404
+ + Update the Interix default build configuration.
405
346
-Will merge to 'next'.
406
+Will merge to "master".
407
408
* rj/config-cygwin (2011-06-16) 3 commits
349
- - config.c: Make git_config() work correctly when called recursively
350
- - t1301-*.sh: Fix the 'forced modes' test on cygwin
351
- - help.c: Fix detection of custom merge strategy on cygwin
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
353
-Will merge to 'next'.
414
+Will merge to "master".
415
416
* jk/archive-tar-filter (2011-06-22) 9 commits
356
- - upload-archive: allow user to turn off filters
357
- - archive: provide builtin .tar.gz filter
358
- - archive: implement configurable tar filters
359
- - archive: refactor file extension format-guessing
360
- - archive: move file extension format-guessing lower
361
- - archive: pass archiver struct to write_archive callback
362
- - archive: refactor list of archive formats
363
- - archive-tar: don't reload default config options
364
- - archive: reorder option parsing and config reading
417
+ (merged to 'next' on 2011-07-05 at add3e7f)
418
+ + upload-archive: allow user to turn off filters
419
+ + archive: provide builtin .tar.gz filter
420
+ + archive: implement configurable tar filters
421
+ + archive: refactor file extension format-guessing
422
+ + archive: move file extension format-guessing lower
423
+ + archive: pass archiver struct to write_archive callback
424
+ + archive: refactor list of archive formats
425
+ + archive-tar: don't reload default config options
426
+ + archive: reorder option parsing and config reading
427
428
Rerolled.
367
-Will merge to 'next' later.
429
430
* jc/index-pack (2011-06-05) 9 commits
370
- - verify-pack: use index-pack --verify
371
- - index-pack: show histogram when emulating "verify-pack -v"
372
- - index-pack: start learning to emulate "verify-pack -v"
373
- - index-pack: a miniscule refactor
374
- - index-pack --verify: read anomalous offsets from v2 idx file
375
- - write_idx_file: need_large_offset() helper function
376
- - index-pack: --verify
377
- - write_idx_file: introduce a struct to hold idx customization options
378
- - index-pack: group the delta-base array entries also by type
431
+ (merged to 'next' on 2011-07-05 at 5062ba9)
432
+ + verify-pack: use index-pack --verify
433
+ + index-pack: show histogram when emulating "verify-pack -v"
434
+ + index-pack: start learning to emulate "verify-pack -v"
435
+ + index-pack: a miniscule refactor
436
+ + index-pack --verify: read anomalous offsets from v2 idx file
437
+ + write_idx_file: need_large_offset() helper function
438
+ + index-pack: --verify
439
+ + write_idx_file: introduce a struct to hold idx customization options
440
+ + index-pack: group the delta-base array entries also by type
441
442
Killed "verify-pack" ;-) The next will be to update fsck, which would be a
443
bigger task.
444
383
-Will merge to 'next' later.
384
-
445
* an/shallow-doc (2011-06-08) 2 commits
386
- - Document the underlying protocol used by shallow repositories and --depth commands.
387
- - Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
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
389
-Will merge to 'next'.
450
+Will merge to "master".
451
452
* jc/legacy-loose-object (2011-06-08) 1 commit
392
- - sha1_file.c: "legacy" is really the current format
453
+ (merged to 'next' on 2011-07-01 at 5561971)
454
+ + sha1_file.c: "legacy" is really the current format
455
394
-Will merge to 'next'.
456
+Will merge to "master".
457
458
* jc/zlib-wrap (2011-06-10) 7 commits
397
- - zlib: allow feeding more than 4GB in one go
398
- - zlib: zlib can only process 4GB at a time
399
- - zlib: wrap deflateBound() too
400
- - zlib: wrap deflate side of the API
401
- - zlib: wrap inflateInit2 used to accept only for gzip format
402
- - zlib: wrap remaining calls to direct inflate/inflateEnd
403
- - zlib wrapper: refactor error message formatter
459
+ (merged to 'next' on 2011-07-05 at 77bcbdc)
460
+ + zlib: allow feeding more than 4GB in one go
461
+ + zlib: zlib can only process 4GB at a time
462
+ + zlib: wrap deflateBound() too
463
+ + zlib: wrap deflate side of the API
464
+ + zlib: wrap inflateInit2 used to accept only for gzip format
465
+ + zlib: wrap remaining calls to direct inflate/inflateEnd
466
+ + zlib wrapper: refactor error message formatter
467
468
This replaces the earlier attempt to deal with the mismatch between our
469
expectation and what zlib API actually offers piecemeal.
470
408
-Will merge to 'next' later.
409
-
471
* jk/clone-cmdline-config (2011-06-22) 4 commits
411
- - clone: accept config options on the command line
412
- - config: make git_config_parse_parameter a public function
413
- - remote: use new OPT_STRING_LIST
414
- - parse-options: add OPT_STRING_LIST helper
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.
481
420
-Will merge to 'next' later.
421
-
482
* jk/tag-contains-ab (2011-06-30) 4 commits
483
- git skew: a tool to find how big a clock skew exists in the history
424
- - default core.clockskew variable to one day
425
- - limit "contains" traversals based on commit timestamp
426
- - tag: speed up --contains calculation
427
-
428
-Will merge to 'next' later (at least the first three).
484
+ (merged to 'next' on 2011-07-05 at f9cf575)
485
+ + default core.clockskew variable to one day
486
+ + limit "contains" traversals based on commit timestamp
487
+ + tag: speed up --contains calculation
488
489
* jk/clone-detached (2011-06-07) 4 commits
490
- clone: always fetch remote HEAD
@@ -434,134 +493,12 @@ Will merge to 'next' later (at least the first three).
493
- t: add tests for cloning remotes with detached HEAD
494
495
Somewhat involved bugfix.
437
-Seems to break 5800 when used with submodule-sync-no-auto-vivify fix.
496
+Will merge to "next".
497
498
* 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
444
-When merged to pu, it seems to break 7610.
445
-
446
-* jn/gitweb-js-blame (2011-05-27) 3 commits
447
- (merged to 'next' on 2011-06-29 at cce347d)
448
- + gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
449
- + gitweb.js: No need for loop in blame_incremental's handleResponse()
450
- + gitweb.js: No need for inProgress in blame_incremental.js
451
-
452
-Originally merged to 'next' on 2011-06-01.
453
-Will merge to 'master'.
454
-
455
-* da/git-prefix-everywhere (2011-06-02) 4 commits
456
- (merged to 'next' on 2011-06-29 at 4ed5461)
457
- + t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
458
- + git-mergetool--lib: Make vimdiff retain the current directory
459
- + git: Remove handling for GIT_PREFIX
460
- + setup: Provide GIT_PREFIX to built-ins
461
-
462
-Originally merged to 'next' on 2011-06-02.
463
-Will merge to 'master'.
464
-
465
-* jc/streaming-filter (2011-05-26) 8 commits
466
- (merged to 'next' on 2011-06-29 at 9901923)
467
- + t0021: test application of both crlf and ident
468
- + t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
469
- + streaming: filter cascading
470
- + streaming filter: ident filter
471
- + Add LF-to-CRLF streaming conversion
472
- + stream filter: add "no more input" to the filters
473
- + Add streaming filter API
474
- + convert.h: move declarations for conversion from cache.h
475
- (this branch uses jc/streaming.)
476
-
477
-Trivial lf-to-crlf and ident conversions can be performed without reading
478
-everything in-core first.
479
-
480
-Originally merged to 'next' on 2011-06-06.
481
-Will merge to 'master'.
482
-
483
-* jc/streaming (2011-05-26) 14 commits
484
- (merged to 'next' on 2011-06-29 at 55ac692)
485
- + sha1_file: use the correct type (ssize_t, not size_t) for read-style function
486
- + streaming: read loose objects incrementally
487
- + sha1_file.c: expose helpers to read loose objects
488
- + streaming: read non-delta incrementally from a pack
489
- + streaming_write_entry(): support files with holes
490
- + convert: CRLF_INPUT is a no-op in the output codepath
491
- + streaming_write_entry(): use streaming API in write_entry()
492
- + streaming: a new API to read from the object store
493
- + write_entry(): separate two helper functions out
494
- + unpack_object_header(): make it public
495
- + sha1_object_info_extended(): hint about objects in delta-base cache
496
- + sha1_object_info_extended(): expose a bit more info
497
- + packed_object_info_detail(): do not return a string
498
- + Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
499
- (this branch is used by jc/streaming-filter.)
500
-
501
-Originally merged to 'next' on 2011-05-26.
502
-Will merge to 'master'.
503
-
504
-* ab/i18n-scripts (2011-05-21) 48 commits
505
- (merged to 'next' on 2011-06-29 at 61f4472)
506
- + i18n: git-bisect bisect_next_check "You need to" message
507
- + i18n: git-bisect [Y/n] messages
508
- + i18n: git-bisect bisect_replay + $1 messages
509
- + i18n: git-bisect bisect_reset + $1 messages
510
- + i18n: git-bisect bisect_run + $@ messages
511
- + i18n: git-bisect die + eval_gettext messages
512
- + i18n: git-bisect die + gettext messages
513
- + i18n: git-bisect echo + eval_gettext message
514
- + i18n: git-bisect echo + gettext messages
515
- + i18n: git-bisect gettext + echo message
516
- + i18n: git-bisect add git-sh-i18n
517
- + i18n: git-stash drop_stash say/die messages
518
- + i18n: git-stash "unknown option" message
519
- + i18n: git-stash die + eval_gettext $1 messages
520
- + i18n: git-stash die + eval_gettext $* messages
521
- + i18n: git-stash die + eval_gettext messages
522
- + i18n: git-stash die + gettext messages
523
- + i18n: git-stash say + gettext messages
524
- + i18n: git-stash echo + gettext message
525
- + i18n: git-stash add git-sh-i18n
526
- + i18n: git-submodule "blob" and "submodule" messages
527
- + i18n: git-submodule "path not initialized" message
528
- + i18n: git-submodule "[...] path is ignored" message
529
- + i18n: git-submodule "Entering [...]" message
530
- + i18n: git-submodule $errmsg messages
531
- + i18n: git-submodule "Submodule change[...]" messages
532
- + i18n: git-submodule "cached cannot be used" message
533
- + i18n: git-submodule $update_module say + die messages
534
- + i18n: git-submodule die + eval_gettext messages
535
- + i18n: git-submodule say + eval_gettext messages
536
- + i18n: git-submodule echo + eval_gettext messages
537
- + i18n: git-submodule add git-sh-i18n
538
- + i18n: git-pull eval_gettext + warning message
539
- + i18n: git-pull eval_gettext + die message
540
- + i18n: git-pull die messages
541
- + i18n: git-pull add git-sh-i18n
542
- + i18n: git-am printf(1) message to eval_gettext
543
- + i18n: git-am core say messages
544
- + i18n: git-am "Falling back" say message
545
- + i18n: git-am "Apply?" message
546
- + i18n: git-am clean_abort messages
547
- + i18n: git-am cannot_fallback messages
548
- + i18n: git-am die messages
549
- + i18n: git-am gettext + gettext to stderr message
550
- + i18n: git-am eval_gettext messages
551
- + i18n: git-am multi-line getttext $msg; echo
552
- + i18n: git-am one-line gettext $msg; echo
553
- + i18n: git-am add git-sh-i18n
554
-
555
-Originally merged to 'next' on 2011-05-23.
556
-Will merge to 'master'.
557
-
558
---------------------------------------------------
559
-[Discarded]
560
-
561
-* js/ref-namespaces (2011-06-07) 4 commits
562
- . ref namespaces: documentation
563
- . ref namespaces: support remote repositories via upload-pack and receive-pack
564
- . ref namespaces: infrastructure
565
- . Fix prefix handling in ref iteration functions
503
+Will merge to "next".
504
567
-Fairly involved feature enhancement, and breaks tests when merged to 'pu'.