What's cooking (2012/04 #11)
Junio C Hamano committed
Apr 29, 2012 at 18:31 UTC
d1b3a6c23aeed5bd66bded1e270bc8388430c008
1 file changed
+205
-283
whats-cooking.txt
+205
-283
@@ -1,18 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #10; Thu, 26)
3
-X-master-at: 010b260e6f23b8964ef53b989e1c1baa8973edbe
4
-X-next-at: 9919198d495ad46119f57aec159ea212bd584242
2
+Subject: What's cooking in git.git (Apr 2012, #11; Sun, 29)
3
+X-master-at: 10d4332e007132a38dc61f03c760d355da5cd550
4
+X-next-at: ed71f9c8badf2d237c862b15ea4145e0ecd96004
5
6
-What's cooking in git.git (Apr 2012, #10; Thu, 26)
6
+What's cooking in git.git (Apr 2012, #11; Sun, 29)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-The fifth batch of topics in this cycle is now in 'master'. I also
13
-merged accumulated fixes that have been in 'master' since v1.7.10 to
14
-'maint', so that we can issue the first maintenance release sometime
15
-next week.
12
+The sixth and seventh batch of topics in this cycle is now in 'master'. I
13
+also merged accumulated fixes that have been in 'master' since v1.7.10 to
14
+'maint', so that we can issue the first maintenance release sometime next
15
+week.
16
17
You can find the changes described here in the integration branches of the
18
repositories listed at
@@ -22,159 +22,78 @@ repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
25
-* cc/fix-missing-va-end-in-revert (2012-04-21) 1 commit
26
- (merged to 'next' on 2012-04-23 at b90eb70)
27
- + revert: add missing va_end
28
-
29
-* fc/completion-tests (2012-04-21) 7 commits
30
- (merged to 'next' on 2012-04-23 at 9b42326)
31
- + completion: fix completion after 'git --option <TAB>'
32
- + completion: avoid trailing space for --exec-path
33
- + completion: add missing general options
34
- + completion: simplify by using $prev
35
- + completion: simplify __gitcomp_1
36
- + tests: add tests for the __gitcomp() completion helper function
37
- + tests: add initial bash completion tests
38
-
39
-* hv/submodule-recurse-push (2012-03-30) 3 commits
40
- (merged to 'next' on 2012-04-20 at fe99e3d)
41
- + push: teach --recurse-submodules the on-demand option
42
- + Refactor submodule push check to use string list instead of integer
43
- + Teach revision walking machinery to walk multiple times sequencially
44
-
45
-"git push --recurse-submodules" learns to optionally look into the
46
-histories of submodules bound to the superproject and push them out.
47
-
48
-* it/fetch-pack-many-refs (2012-04-10) 4 commits
49
- (merged to 'next' on 2012-04-20 at e2126d7)
50
- + remote-curl: main test case for the OS command line overflow
51
- + fetch-pack: test cases for the new --stdin option
52
- + remote-curl: send the refs to fetch-pack on stdin
53
- + fetch-pack: new --stdin option to read refs from stdin
54
-
55
-When "git fetch" encounters repositories with too many references, the
56
-command line of "fetch-pack" that is run by a helper e.g. remote-curl,
57
-may fail to hold all of them. Now such an internal invocation can feed
58
-the references through the standard input of "fetch-pack".
59
-
60
-* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
61
- (merged to 'next' on 2012-04-20 at 638ed9f)
62
- + diff: avoid stack-buffer-read-overrun for very long name
63
-
64
-* mb/fetch-call-a-non-branch-a-ref (2012-04-17) 2 commits
65
- (merged to 'next' on 2012-04-20 at df2c57e)
66
- + fetch: describe new refs based on where it came from
67
- + fetch: Give remote_ref to update_local_ref() as well
68
-
69
-* mh/ref-api (2012-04-10) 13 commits
70
- (merged to 'next' on 2012-04-20 at 94e9384)
71
- + do_for_each_ref(): only iterate over the subtree that was requested
72
- + refs: store references hierarchically
73
- + sort_ref_dir(): simplify logic
74
- + refs.c: rename ref_array -> ref_dir
75
- + struct ref_entry: nest the value part in a union
76
- + check_refname_component(): return 0 for zero-length components
77
- + free_ref_entry(): new function
78
- + names_conflict(): simplify implementation
79
- + repack_without_ref(): reimplement using do_for_each_ref_in_array()
80
- + do_for_each_ref_in_arrays(): new function
81
- + do_for_each_ref_in_array(): new function
82
- + refs: manage current_ref within do_one_ref()
83
- + refs.c: reorder definitions more logically
84
-
85
-* mk/gitweb-diff-hl (2012-04-11) 8 commits
86
- (merged to 'next' on 2012-04-20 at 54179a2)
87
- + gitweb: Refinement highlightning in combined diffs
88
- + gitweb: Highlight interesting parts of diff
89
- + gitweb: Push formatting diff lines to print_diff_chunk()
90
- + gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
91
- + gitweb: Extract print_sidebyside_diff_lines()
92
- + gitweb: Pass esc_html_hl_regions() options to esc_html()
93
- + gitweb: esc_html_hl_regions(): Don't create empty <span> elements
94
- + gitweb: Use descriptive names in esc_html_hl_regions()
95
-
96
-"gitweb" learns to highlight the patch it outputs even more.
97
-
98
-* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
99
- (merged to 'next' on 2012-04-20 at c299a63)
100
- + fast-import: tighten parsing of datarefs
101
-
102
-The parser in "fast-import" did not diagnose ":9" style references
103
-that is not followed by required SP/LF as an error.
104
-
105
-* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
106
- (merged to 'next' on 2012-04-23 at 3692fec)
107
- + stash: use eval_gettextln correctly
108
-
109
-* zj/upstream-error-message (2012-04-15) 5 commits
110
- (merged to 'next' on 2012-04-20 at 1ed9682)
111
- + i18n: mark @{upstream} error messages for translation
112
- + Be more specific if upstream branch is not tracked
113
- + Provide better message for barnhc_wiht_tpyo@{u}
114
- + Provide branch name in error message when using @{u}
115
- + t1507: add tests to document @{upstream} behaviour
116
-
117
-Error messages given when @{u} is used for a branch without its
118
-upstream configured have been clatified.
25
+* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
26
+ (merged to 'next' on 2012-04-23 at f872ba5)
27
+ + cherry-pick: do not expect file arguments
28
120
---------------------------------------------------
121
-[New Topics]
29
+The command line parser choked "git cherry-pick $name" when $name can be
30
+both revision name and a pathname, even though $name can never be a path
31
+in the context of the command.
32
123
-* mm/simple-push (2012-04-24) 7 commits
124
- - push.default doc: explain simple after upstream
125
- - push: document the future default change for push.default (matching -> simple)
126
- - t5570: use explicit push refspec
127
- - push: introduce new push.default mode "simple"
128
- - t5528-push-default.sh: add helper functions
129
- - Undocument deprecated alias 'push.default=tracking'
130
- - Documentation: explain push.default option a bit more
131
- (this branch is used by mm/push-default-switch-warning.)
33
+The issue the patch addresses is real, but the way it is implemented felt
34
+unnecessarily invasive a bit. It may be cleaner for this caller to add
35
+the "--" to the end of the argv_array it passes to setup_revisions().
36
133
-New users tend to work on one branch at a time and push the result
134
-out. The current and upstream modes of push is a more suitable default
135
-mode than matching mode for these people, but neither is surprise-free
136
-depending on how the project is set up. Introduce a "simple" mode that
137
-is a subset of "upstream" but only works when the branch is named the same
138
-between the remote and local repositories.
37
+* cb/http-multi-curl-auth (2012-04-14) 4 commits
38
+ (merged to 'next' on 2012-04-23 at b0259be)
39
+ + http: use newer curl options for setting credentials
40
+ + http: clean up leak in init_curl_http_auth
41
+ + fix http auth with multiple curl handles
42
+ + http auth fails with multiple curl handles
43
140
-The plan is to make it the new default when push.default is not
141
-configured.
44
+Fixes http authentication breakage when we keep multiple HTTP requests in
45
+flight using curl-multi.
46
143
-* mh/ref-api-lazy-loose (2012-04-25) 30 commits
144
- - refs: read loose references lazily
145
- - create_dir_entry(): allow the flag value to be passed as an argument
146
- - read_loose_refs(): access ref_cache via the ref_dir field
147
- - read_loose_refs(): rename function from get_ref_dir()
148
- - struct ref_dir: store a reference to the enclosing ref_cache
149
- - sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
150
- - do_for_each_ref_in_dir(): take (ref_entry *) instead of (ref_dir *)
151
- - do_for_each_ref_in_dirs(): take (ref_entry *) instead of (ref_dir *)
152
- - add_entry(): take (ref_entry *) instead of (ref_dir *)
153
- - search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
154
- - search_for_subdir(): take (ref_entry *) instead of (ref_dir *)
155
- - get_ref_dir(): remove dirname argument
156
- - get_ref_dir(): take (ref_entry *) instead of (ref_dir *)
157
- - find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
158
- - add_ref(): take (ref_entry *) instead of (ref_dir *)
159
- - read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
160
- - find_ref(): take (ref_entry *) instead of (ref_dir *)
161
- - is_refname_available(): take (ref_entry *) instead of (ref_dir *)
162
- - get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
163
- - get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
164
- - refs: wrap top-level ref_dirs in ref_entries
165
- - do_for_each_reflog(): reuse strbuf across recursive function calls
166
- - do_for_each_reflog(): use a strbuf to hold logfile name
167
- - do_for_each_reflog(): return early on error
168
- - get_ref_dir(): take the containing directory as argument
169
- - refs.c: extract function search_for_subdir()
170
- - get_ref_dir(): require that the dirname argument ends in '/'
171
- - get_ref_dir(): rename "base" parameter to "dirname"
172
- - get_ref_dir(): use a strbuf to hold refname
173
- - get_ref_dir(): return early if directory cannot be read
47
+* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
48
+ (merged to 'next' on 2012-04-23 at 9e0c8b4)
49
+ + properly keep track of current working directory
50
175
-Refs API is updated to lazily read sub-hierarchies of refs/ namespace,
176
-so that we do not have to grab everything from the filesystem when we
177
-are only interested in listing branches, for example.
51
+The filesystem boundary was not correctly reported when .git directory
52
+discovery stopped at a mount point.
53
+
54
+* jc/merge-reduce-parents-early (2012-04-18) 5 commits
55
+ (merged to 'next' on 2012-04-23 at 16e7e53)
56
+ + fmt-merge-msg: discard needless merge parents
57
+ + builtin/merge.c: reduce parents early
58
+ + builtin/merge.c: collect other parents early
59
+ + builtin/merge.c: remove "remoteheads" global variable
60
+ + merge tests: octopus with redundant parents
61
+
62
+* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits
63
+ (merged to 'next' on 2012-04-20 at 4eb2534)
64
+ + gc: use argv-array for sub-commands
65
+ + argv-array: add a new "pushl" method
66
+ + argv-array: refactor empty_argv initialization
67
+ (merged to 'next' on 2012-04-15 at 7586e50)
68
+ + gc: do not explode objects which will be immediately pruned
69
+
70
+* js/daemon-test-race-fix (2012-04-27) 1 commit
71
+ (merged to 'next' on 2012-04-27 at 6edb57f)
72
+ + t5570: fix forwarding of git-daemon messages via cat
73
+
74
+The shell construct to launch git-daemon and wait for it to start
75
+serving during the test was faulty, and this fixes it.
76
+
77
+Replaced cb/daemon-test-race-fix topic with this, as this addresses
78
+the real cause of the issue.
79
+
80
+* js/fast-import-test-9300 (2012-04-20) 1 commit
81
+ (merged to 'next' on 2012-04-23 at a9bd236)
82
+ + t9300-fast-import: avoid 'exit' in test_expect_success snippets
83
+
84
+* kk/gitweb-omit-expensive (2012-04-26) 2 commits
85
+ (merged to 'next' on 2012-04-27 at b057127)
86
+ + gitweb: Option to not display information about owner
87
+ + gitweb: Option to omit column with time of the last change
88
+ (this branch uses kk/maint-gitweb-missing-owner.)
89
+
90
+"gitweb" learned to optionally omit output of fields that are expensive
91
+to generate.
92
+
93
+* kk/maint-gitweb-missing-owner (2012-04-25) 1 commit
94
+ (merged to 'next' on 2012-04-27 at e526304)
95
+ + gitweb: Don't set owner if got empty value from projects.list
96
+ (this branch is used by kk/gitweb-omit-expensive.)
97
98
* mm/include-userpath (2012-04-25) 2 commits
99
(merged to 'next' on 2012-04-26 at c68e261)
@@ -184,44 +103,53 @@ are only interested in listing branches, for example.
103
The new "include.path" directive in the configuration files learned
104
to understand "~/path" and "~user/path".
105
106
+* pw/t5800-import-race-fix (2012-04-24) 1 commit
107
+ (merged to 'next' on 2012-04-24 at e97bb42)
108
+ + git-remote-testgit: fix race when spawning fast-import
109
+
110
+Longstanding bug in a test scaffolding that occasionally made t5800
111
+hang was fixed.
112
+
113
* rs/commit-list-append (2012-04-25) 3 commits
114
(merged to 'next' on 2012-04-26 at 2ba48b3)
115
+ commit: remove commit_list_reverse()
116
+ revision: append to list instead of insert and reverse
117
+ sequencer: export commit_list_append()
118
193
-* jk/maint-config-bogus-section (2012-04-25) 1 commit
194
- (merged to 'next' on 2012-04-26 at 9919198)
195
- + config: reject bogus section names for --rename-section
196
-
197
-"git config --rename-section" to rename an existing section into a
198
-bogus one did not check the new name.
199
-
200
-* kk/maint-gitweb-missing-owner (2012-04-25) 1 commit
201
- - gitweb: Don't set owner if got empty value from projects.list
202
- (this branch is used by kk/gitweb-omit-expensive.)
203
-
204
-Will merge to 'next'.
119
+* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit
120
+ (merged to 'next' on 2012-04-23 at e7766c2)
121
+ + sequencer: remove additional blank line
122
206
-* jk/doc-asciidoc-inline-literal (2012-04-26) 1 commit
207
- - docs: stop using asciidoc no-inline-literal
123
+In the older days, the header "Conflicts:" in "cherry-pick" and
124
+"merge" was separated by a blank line from the list of paths that
125
+follow for readability, but when "merge" was rewritten in C, we lost
126
+it by mistake. Remove the newline from "cherry-pick" to make them
127
+match again.
128
209
-Our documentation was written for an ancient version of AsciiDoc,
210
-making the source not very readable.
129
+--------------------------------------------------
130
+[New Topics]
131
212
-* kk/gitweb-omit-expensive (2012-04-26) 2 commits
213
- - gitweb: Option to not display information about owner
214
- - gitweb: Option to omit column with time of the last change
215
- (this branch uses kk/maint-gitweb-missing-owner.)
132
+* zj/mksh-columns-breakage (2012-04-27) 1 commit
133
+ - test-lib: skip test with COLUMNS=1 under mksh
134
+ (this branch is used by lp/diffstat-with-graph and nd/columns.)
135
217
-"gitweb" learned to optionally omit output of fields that are expensive
218
-to generate.
136
+A broken shell does not let us set an environment value to an
137
+arbitrary value, interfering with some of the tests. Introduce a test
138
+prerequisite so that we can skip some tests on such a platform.
139
140
Will merge to 'next'.
141
142
--------------------------------------------------
143
[Stalled]
144
145
+* jc/run-hook-env-1 (2012-03-11) 1 commit
146
+ - run_hook(): enhance the interface to pass arbitrary environment
147
+
148
+Not urgent.
149
+
150
+Updates run_hook() API to be much less specific to "commit". It would
151
+only be useful if people start doing more interesting things with hooks.
152
+
153
* jc/split-blob (2012-04-03) 7 commits
154
- chunked-object: streaming checkout
155
- chunked-object: fallback checkout codepaths
@@ -257,12 +185,68 @@ not working :-(.
185
--------------------------------------------------
186
[Cooking]
187
260
-* pw/t5800-import-race-fix (2012-04-24) 1 commit
261
- (merged to 'next' on 2012-04-24 at e97bb42)
262
- + git-remote-testgit: fix race when spawning fast-import
188
+* mm/simple-push (2012-04-24) 7 commits
189
+ - push.default doc: explain simple after upstream
190
+ - push: document the future default change for push.default (matching -> simple)
191
+ - t5570: use explicit push refspec
192
+ - push: introduce new push.default mode "simple"
193
+ - t5528-push-default.sh: add helper functions
194
+ - Undocument deprecated alias 'push.default=tracking'
195
+ - Documentation: explain push.default option a bit more
196
+ (this branch is used by mm/push-default-switch-warning.)
197
264
-Longstanding bug in a test scaffolding that occasionally made t5800
265
-hang was fixed.
198
+New users tend to work on one branch at a time and push the result
199
+out. The current and upstream modes of push is a more suitable default
200
+mode than matching mode for these people, but neither is surprise-free
201
+depending on how the project is set up. Introduce a "simple" mode that
202
+is a subset of "upstream" but only works when the branch is named the same
203
+between the remote and local repositories.
204
+
205
+The plan is to make it the new default when push.default is not
206
+configured.
207
+
208
+Will merge to 'next'.
209
+
210
+* mh/ref-api-lazy-loose (2012-04-26) 18 commits
211
+ - refs: read loose references lazily
212
+ - read_loose_refs(): eliminate ref_cache argument
213
+ - struct ref_dir: store a reference to the enclosing ref_cache
214
+ - search_for_subdir(): return (ref_dir *) instead of (ref_entry *)
215
+ - get_ref_dir(): add function for getting a ref_dir from a ref_entry
216
+ - read_loose_refs(): rename function from get_ref_dir()
217
+ - refs: wrap top-level ref_dirs in ref_entries
218
+ - find_containing_dir(): use strbuf in implementation of this function
219
+ - bisect: copy filename string obtained from git_path()
220
+ - do_for_each_reflog(): reuse strbuf across recursive function calls
221
+ - do_for_each_reflog(): use a strbuf to hold logfile name
222
+ - do_for_each_reflog(): return early on error
223
+ - get_ref_dir(): take the containing directory as argument
224
+ - refs.c: extract function search_for_subdir()
225
+ - get_ref_dir(): require that the dirname argument ends in '/'
226
+ - get_ref_dir(): rename "base" parameter to "dirname"
227
+ - get_ref_dir(): use a strbuf to hold refname
228
+ - get_ref_dir(): return early if directory cannot be read
229
+
230
+Refs API is updated to lazily read sub-hierarchies of refs/ namespace,
231
+so that we do not have to grab everything from the filesystem when we
232
+are only interested in listing branches, for example.
233
+
234
+* jk/maint-config-bogus-section (2012-04-25) 1 commit
235
+ (merged to 'next' on 2012-04-26 at 9919198)
236
+ + config: reject bogus section names for --rename-section
237
+
238
+"git config --rename-section" to rename an existing section into a
239
+bogus one did not check the new name.
240
+
241
+Will merge to 'master'.
242
+
243
+* jk/doc-asciidoc-inline-literal (2012-04-26) 1 commit
244
+ - docs: stop using asciidoc no-inline-literal
245
+
246
+Our documentation was written for an ancient version of AsciiDoc,
247
+making the source not very readable.
248
+
249
+Will merge to 'next'.
250
251
* nd/i18n (2012-04-25) 11 commits
252
- help: replace underlining "help -a" headers using hyphens with a blank line
@@ -280,6 +264,8 @@ hang was fixed.
264
265
More message strings marked for i18n.
266
267
+Will merge to 'next'.
268
+
269
* nh/empty-rebase (2012-04-24) 4 commits
270
(merged to 'next' on 2012-04-24 at 91d2dfd)
271
+ git-rebase: add keep_empty flag
@@ -290,25 +276,9 @@ More message strings marked for i18n.
276
"git rebase" learned to optionally keep commits that do not introduce
277
any change in the original history.
278
293
-* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit
294
- (merged to 'next' on 2012-04-23 at e7766c2)
295
- + sequencer: remove additional blank line
296
-
297
-In the older days, the header "Conflicts:" in "cherry-pick" and
298
-"merge" was separated by a blank line from the list of paths that
299
-follow for readability, but when "merge" was rewritten in C, we lost
300
-it by mistake. Remove the newline from "cherry-pick" to make them
301
-match again.
302
-
303
-Will merge to 'master'.
304
-
305
-* js/fast-import-test-9300 (2012-04-20) 1 commit
306
- (merged to 'next' on 2012-04-23 at a9bd236)
307
- + t9300-fast-import: avoid 'exit' in test_expect_success snippets
308
-
309
-Will merge to 'master'.
310
-
311
-* lp/diffstat-with-graph (2012-04-18) 6 commits
279
+* lp/diffstat-with-graph (2012-04-27) 8 commits
280
+ - t4052: work around shells unable to set COLUMNS to 1
281
+ - Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph
282
(merged to 'next' on 2012-04-23 at 8de0747)
283
+ Prevent graph_width of stat width from falling below min
284
+ t4052: Test diff-stat output with minimum columns
@@ -316,60 +286,22 @@ Will merge to 'master'.
286
+ Adjust stat width calculations to take --graph output into account
287
+ Add output_prefix_length to diff_options
288
+ t4052: test --stat output with --graph
289
+ (this branch uses zj/mksh-columns-breakage; is tangled with nd/columns.)
290
320
-Looked reasonable.
321
-Will merge to 'master'.
322
-
323
-* jc/merge-reduce-parents-early (2012-04-18) 5 commits
324
- (merged to 'next' on 2012-04-23 at 16e7e53)
325
- + fmt-merge-msg: discard needless merge parents
326
- + builtin/merge.c: reduce parents early
327
- + builtin/merge.c: collect other parents early
328
- + builtin/merge.c: remove "remoteheads" global variable
329
- + merge tests: octopus with redundant parents
330
-
331
-Will merge to 'master'.
332
-
333
-* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
334
- (merged to 'next' on 2012-04-23 at f872ba5)
335
- + cherry-pick: do not expect file arguments
336
-
337
-The command line parser choked "git cherry-pick $name" when $name can be
338
-both revision name and a pathname, even though $name can never be a path
339
-in the context of the command.
340
-
341
-The issue the patch addresses is real, but the way it is implemented felt
342
-unnecessarily invasive a bit. It may be cleaner for this caller to add
343
-the "--" to the end of the argv_array it passes to setup_revisions().
344
-
345
-Will merge to 'master'.
346
-
347
-* cb/daemon-test-race-fix (2012-04-19) 1 commit
348
- (merged to 'next' on 2012-04-24 at d5c30be)
349
- + git-daemon wrapper to wait until daemon is ready
350
-
351
-Fix race condition between starting and waiting for git-daemon in the
352
-test.
353
-
354
-* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
355
- (merged to 'next' on 2012-04-23 at 9e0c8b4)
356
- + properly keep track of current working directory
357
-
358
-The filesystem boundary was not correctly reported when .git directory
359
-discovery stopped at a mount point.
360
-
361
-Will merge to 'master'.
291
+Will merge to 'next'.
292
363
-* nd/columns (2012-04-20) 9 commits
293
+* nd/columns (2012-04-27) 10 commits
294
- tag: add --column
295
- column: support piping stdout to external git-column process
296
- status: add --column
297
- branch: add --column
298
- help: reuse print_columns() for help -a
299
- column: add dense layout support
300
+ - t9002: work around shells that are unable to set COLUMNS to 1
301
- column: add columnar layout
302
- Stop starting pager recursively
303
- Add column layout skeleton and git-column
304
+ (this branch uses zj/mksh-columns-breakage; is tangled with lp/diffstat-with-graph.)
305
306
A couple of commands learn --column option to produce columnar output.
307
@@ -383,17 +315,10 @@ A couple of commands learn --column option to produce columnar output.
315
- http: handle proxy proactive authentication
316
- http: try http_proxy env var when http.proxy config option is not set
317
386
-The code to talk to http proxies learn to use the same credential
387
-API used to talk to the final http destinations. This still needs
388
-to peek into $ENV{HTTPS_PROXY}.
318
+Still needs to address review comments from Peff, some of which were
319
+partly addressed with later "fixup" patches queued here.
320
390
-* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits
391
- (merged to 'next' on 2012-04-20 at 4eb2534)
392
- + gc: use argv-array for sub-commands
393
- + argv-array: add a new "pushl" method
394
- + argv-array: refactor empty_argv initialization
395
- (merged to 'next' on 2012-04-15 at 7586e50)
396
- + gc: do not explode objects which will be immediately pruned
321
+It probably is a good idea to re-roll the entire series.
322
323
* ld/git-p4-tags-and-labels (2012-04-25) 7 commits
324
(merged to 'next' on 2012-04-25 at 8b959e5)
@@ -407,29 +332,24 @@ to peek into $ENV{HTTPS_PROXY}.
332
+ git p4: import/export of labels to/from p4
333
+ git p4: Fixing script editor checks
334
335
+What's the current status of this topic? Pete? Luke?
336
+
337
* nd/threaded-index-pack (2012-04-19) 4 commits
338
- index-pack: disable threading if NO_PREAD is defined
339
- index-pack: support multithreaded delta resolving
340
- index-pack: split second pass obj handling into own function
341
- compat/win32/pthread.h: Add an pthread_key_delete() implementation
342
416
-* cb/http-multi-curl-auth (2012-04-14) 4 commits
417
- (merged to 'next' on 2012-04-23 at b0259be)
418
- + http: use newer curl options for setting credentials
419
- + http: clean up leak in init_curl_http_auth
420
- + fix http auth with multiple curl handles
421
- + http auth fails with multiple curl handles
422
-
423
-Fixes http authentication breakage when we keep multiple HTTP requests in
424
-flight using curl-multi.
425
-
426
-Will merge to 'master'.
427
-
343
* tr/xdiff-fast-hash (2012-04-09) 1 commit
344
(merged to 'next' on 2012-04-24 at ed693cf)
345
+ xdiff: load full words in the inner loop of xdl_hash_record
346
432
-* jc/index-v4 (2012-04-04) 10 commits
347
+Breakage reported on MacOS X. Perhaps needs to be reverted out of 'next'.
348
+
349
+* jc/index-v4 (2012-04-27) 12 commits
350
+ (merged to 'next' on 2012-04-29 at ed71f9c)
351
+ + index-v4: document the entry format
352
+ + unpack-trees: preserve the index file version of original
353
(merged to 'next' on 2012-04-19 at 5e4b029)
354
+ update-index: upgrade/downgrade on-disk index version
355
+ read-cache.c: write prefix-compressed names in the index
@@ -444,13 +364,7 @@ Will merge to 'master'.
364
(this branch is tangled with jc/split-blob.)
365
366
Trivially shrinks the on-disk size of the index file to save both I/O and
447
-checksum overhead. The "v4" format represented here may not be what we
448
-eventually want to have, but the preparatory refactoring steps and the way
449
-how backward compatibility is retained should give plenty to learn to GSoC
450
-student-hopefuls.
451
-
452
-The bottom one makes use of "varint" encoding from the stalled
453
-jc/split-blob topic.
367
+checksum overhead. It even comes with a technical doc updates ;-)
368
369
* th/difftool-diffall (2012-04-23) 8 commits
370
- difftool: print list of valid tools with '--tool-help'
@@ -465,17 +379,25 @@ jc/split-blob topic.
379
Rolls the two-directory-diff logic from diffall script (in contrib/) into
380
"git difftool" framework.
381
468
-Still being reworked.
469
-
470
-* jc/run-hook-env-1 (2012-03-11) 1 commit
471
- - run_hook(): enhance the interface to pass arbitrary environment
472
-
473
-Not urgent.
474
-
475
-Updates run_hook() API to be much less specific to "commit". It would
476
-only be useful if people start doing more interesting things with hooks.
382
+What's the doneness of this topic? David? Tim?
383
384
* mm/push-default-switch-warning (2012-04-26) 2 commits
385
- t5541: warning message is given even with --quiet
386
- push: start warning upcoming default change for push.default
387
(this branch uses mm/simple-push.)
388
+
389
+Will squash the two, but this has to wait for a few release cycles.
390
+
391
+--------------------------------------------------
392
+[Discarded]
393
+
394
+* cb/daemon-test-race-fix (2012-04-27) 2 commits
395
+ (merged to 'next' on 2012-04-27 at 84bbcf8)
396
+ + Revert "git-daemon wrapper to wait until daemon is ready"
397
+ (merged to 'next' on 2012-04-24 at d5c30be)
398
+ + git-daemon wrapper to wait until daemon is ready
399
+
400
+Fix race condition between starting and waiting for git-daemon in the
401
+test.
402
+
403
+Reverted from 'next' to replace it with js/daemon-test-race-fix.