What's cooking (2011/04 #07)
Junio C Hamano committed
Apr 27, 2011 at 14:10 UTC
1c1cd37b453a99cedc61709af84d466e9c0bb88a
1 file changed
+252
-200
whats-cooking.txt
+252
-200
@@ -1,56 +1,198 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2011, #06; Mon, 25)
3
-X-master-at: ec014eac0e9e6f30cbbca616090fa2ecf74797e7
4
-X-next-at: 4216d33f893e8855ed345bfc97625e82433e569c
2
+Subject: What's cooking in git.git (Apr 2011, #07; Wed, 27)
3
+X-master-at: e839fe6c1206292aeb4518939b8f124ae5068619
4
+X-next-at: f5ef3c22908b68d63e56ce32f4234438cd775f22
5
6
-What's cooking in git.git (Apr 2011, #06; Mon, 25)
6
+What's cooking in git.git (Apr 2011, #07; Wed, 27)
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
The main part of this cycle is expected to run thru May, aiming for a
13
-feature freeze in early June. We are at the beginning of week #1 of this
13
+feature freeze in early June. We are in the middle of week #1 of this
14
cycle and week #2 starts on May 2nd.
15
16
--------------------------------------------------
17
-[New Topics]
17
+[Graduated to "master"]
18
19
-* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
20
- - revisions: allow --glob and friends in parse_options-enabled commands
21
- - revisions: split out handle_revision_pseudo_opt function
19
+* ar/clean-rmdir-empty (2011-04-01) 1 commit
20
+ (merged to 'next' on 2011-04-25 at 5a71fdb)
21
+ + clean: unreadable directory may still be rmdir-able if it is empty
22
+
23
+* cn/format-patch-quiet (2011-04-12) 2 commits
24
+ (merged to 'next' on 2011-04-25 at 40e2d1c)
25
+ + format-patch: document --quiet option
26
+ + format-patch: don't pass on the --quiet flag
27
+
28
+* dm/color-palette (2011-04-05) 1 commit
29
+ (merged to 'next' on 2011-04-25 at 839b17b)
30
+ + Share color list between graph and show-branch
31
+
32
+* dm/stash-k-i-p (2011-04-07) 2 commits
33
+ (merged to 'next' on 2011-04-25 at 01a207c)
34
+ + stash: ensure --no-keep-index and --patch can be used in any order
35
+ + stash: add two more tests for --no-keep-index
36
+
37
+* ef/maint-strbuf-init (2011-04-10) 2 commits
38
+ (merged to 'next' on 2011-04-25 at 6a45422)
39
+ + config: support values longer than 1023 bytes
40
+ + strbuf: make sure buffer is zero-terminated
41
+
42
+* jc/merge-dash-previous (2011-04-07) 1 commit
43
+ (merged to 'next' on 2011-04-25 at 512faf4)
44
+ + merge: allow "-" as a short-hand for "previous branch"
45
+
46
+* jc/pack-objects-bigfile (2011-04-05) 1 commit
47
+ (merged to 'next' on 2011-04-25 at 621035c)
48
+ + Teach core.bigfilethreashold to pack-objects
49
+
50
+* jk/maint-stash-oob (2011-04-06) 2 commits
51
+ (merged to 'next' on 2011-04-25 at 8478a92)
52
+ + stash: fix false positive in the invalid ref test.
53
+ + stash: fix accidental apply of non-existent stashes
54
+
55
+* jk/maint-upload-pack-shallow (2011-04-06) 1 commit
56
+ (merged to 'next' on 2011-04-25 at 073dac4)
57
+ + upload-pack: start pack-objects before async rev-list
58
+
59
+* jk/stash-loosen-safety (2011-04-05) 1 commit
60
+ (merged to 'next' on 2011-04-25 at cdc549f)
61
+ + stash: drop dirty worktree check on apply
62
+
63
+* mg/reflog-with-options (2011-04-01) 3 commits
64
+ (merged to 'next' on 2011-04-25 at 1ab8b78)
65
+ + reflog: fix overriding of command line options
66
+ + t/t1411: test reflog with formats
67
+ + builtin/log.c: separate default and setup of cmd_log_init()
68
+ (this branch is used by mg/show-without-prune.)
69
+
70
+* mg/sha1-path-advise (2011-03-31) 2 commits
71
+ (merged to 'next' on 2011-04-25 at 8b094f5)
72
+ + sha1_name: Suggest commit:./file for path in subdir
73
+ + t1506: factor out test for "Did you mean..."
74
75
* mg/x-years-12-months (2011-04-20) 1 commit
76
(merged to 'next' on 2011-04-25 at 74ba83b)
77
+ date: avoid "X years, 12 months" in relative dates
78
79
+* mh/git-svn-automkdirs (2011-04-01) 1 commit
80
+ (merged to 'next' on 2011-04-25 at 2e95357)
81
+ + git-svn: add an option to skip the creation of empty directories
82
+
83
+* nk/blame-abbrev (2011-04-06) 1 commit
84
+ (merged to 'next' on 2011-04-25 at 59a4281)
85
+ + blame: add --abbrev command line option and make it honor core.abbrev
86
+
87
+* rj/sparse (2011-04-07) 7 commits
88
+ (merged to 'next' on 2011-04-25 at e1af2af)
89
+ + sparse: Fix some "symbol not declared" warnings
90
+ + sparse: Fix errors due to missing target-specific variables
91
+ + sparse: Fix an "symbol 'merge_file' not decared" warning
92
+ + sparse: Fix an "symbol 'format_subject' not declared" warning
93
+ + sparse: Fix some "Using plain integer as NULL pointer" warnings
94
+ + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
95
+ + Makefile: Use cgcc rather than sparse in the check target
96
+
97
+* rr/doc-content-type (2011-04-07) 4 commits
98
+ (merged to 'next' on 2011-04-25 at 83c41e4)
99
+ + Documentation: Allow custom diff tools to be specified in 'diff.tool'
100
+ + Documentation: Add diff.<driver>.* to config
101
+ + Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
102
+ + Documentation: Add filter.<driver>.* to config
103
+
104
+--------------------------------------------------
105
+[New Topics]
106
+
107
+* aw/maint-rebase-i-p-no-ff (2011-04-20) 1 commit
108
+ - git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
109
+
110
+* mg/alias-expose-prefix (2011-04-27) 2 commits
111
+ - handle_alias: provide GIT_PREFIX to !alias
112
+ - t1020: test !alias in subdirectory
113
+
114
+* mg/diff-uiconfig-doc (2011-04-27) 1 commit
115
+ - config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
116
+
117
+With tentative rewording.
118
+
119
+* ld/p4-preserve-user-names (2011-04-21) 1 commit
120
+ - git-p4: add option to preserve user names
121
+
122
+Pete acked and told Luke to wait and then resend; I just picked it up so
123
+that the patch is not lost.
124
+
125
+* mg/rev-list-count-cherry (2011-04-26) 1 commit
126
+ (merged to 'next' on 2011-04-26 at dc3e80a)
127
+ + rev-list --count: separate count for --cherry-mark
128
+
129
+Will merge to "master" by the end of week #2.
130
+
131
+* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
132
+ (merged to 'next' on 2011-04-26 at 8e59a0e)
133
+ + gitweb: supply '-n' to gzip for identical output
134
+
135
+Will merge to "master" by the end of week #2.
136
+
137
+* ml/test-readme (2011-04-26) 1 commit
138
+ (merged to 'next' on 2011-04-26 at d1efe84)
139
+ + t/README: unify documentation of test function args
140
+
141
+Will merge to "master" by the end of week #2.
142
+
143
+* sp/maint-clear-postfields (2011-04-26) 1 commit
144
+ (merged to 'next' on 2011-04-26 at 0082503)
145
+ + http: clear POSTFIELDS when initializing a slot
146
+
147
+Fixes a rather nasty bug we had since the beginning of smart-HTTP
148
+but has become a lot easier to trigger since 1.7.5, introducing a
149
+regression.
150
+
151
Will merge to "master" by the end of week #1.
152
29
-* jc/fix-add-u-unmerged (2011-04-20) 1 commit
30
- - Fix "add -u" that sometimes fails to resolve unmerged paths
31
- (this branch uses jc/fix-diff-files-unmerged.)
153
+* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
154
+ - pretty: quote rfc822 specials in email addresses
155
33
-* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
34
- - diff-files: show unmerged entries correctly
35
- - diff: remove often unused parameters from diff_unmerge()
36
- - diff.c: return filepair from diff_unmerge()
37
- - test: use $_z40 from test-lib
38
- (this branch is used by jc/fix-add-u-unmerged.)
156
+Will merge to "next".
157
40
-* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
41
- - send-pack: avoid deadlock when pack-object dies early
42
- (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
158
+* rs/strbuf-setlen-assert (2011-04-27) 1 commit
159
+ - strbuf: clarify assertion in strbuf_setlen()
160
44
-* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
45
- - Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
46
- (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
161
+Will merge to "next".
162
48
-* vh/git-svn-doc (2011-04-25) 1 commit
49
- - git-svn.txt: fix usage of --add-author-from
163
+* jh/dirstat-lines (2011-04-27) 7 commits
164
+ - diff --dirstat: tighten and clean-up parsing.
165
+ - New --dirstat=lines mode, doing dirstat analysis based on diffstat
166
+ - Allow specifying --dirstat cut-off percentage as a floating point number
167
+ - Add config variable for specifying default --dirstat behavior
168
+ - Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
169
+ - Make --dirstat=0 output directories that contribute < 0.1% of changes
170
+ - Add several testcases for --dirstat and friends
171
+ (this branch uses jh/dirstat.)
172
+
173
+This is v3/v4 that is still being discussed.
174
175
--------------------------------------------------
176
[Stalled]
177
178
+* jn/gitweb-js (2011-04-15) 13 commits
179
+ - gitweb: Make JavaScript ability to adjust timezones configurable
180
+ - gitweb.js: Add UI for selecting common timezone to display dates
181
+ - gitweb: JavaScript ability to adjust time based on timezone
182
+ - gitweb: Unify the way long timestamp is displayed
183
+ - gitweb: Refactor generating of long dates into format_timestamp_html
184
+ - gitweb.js: Provide getElementsByClassName method (if it not exists)
185
+ - gitweb.js: Introduce gitweb/static/js/lib/cookies.js
186
+ - gitweb.js: Extract and improve datetime handling
187
+ - gitweb.js: Provide default values for padding in padLeftStr and padLeft
188
+ - gitweb.js: Update and improve comments in JavaScript files
189
+ - gitweb: Split JavaScript for maintability, combining on build
190
+ - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
191
+ - git-instaweb: Simplify build dependency on gitweb
192
+
193
+I do not recall seeing this series much reviewed. Is everybody happy with
194
+this series?
195
+
196
* jk/maint-merge-rename-create (2011-03-25) 3 commits
197
- merge: turn on rewrite detection
198
- merge: handle renames with replacement content
@@ -62,24 +204,8 @@ Peff wanted to reroll this, so this is taken out of "next".
204
- http-push: refactor curl_easy_setup madness
205
- http: make curl callbacks match contracts from curl header
206
65
-I didn't see anything glaringly wrong with this, but I would appreciate
66
-extra sets of eyeballs from people who have worked on HTTP transports to
67
-double check.
68
-
69
-* jk/maint-push-async-hang (2011-03-31) 4 commits
70
- - send-pack: abort sideband demuxer on pack-objects error
71
- - run-command: allow aborting async code prematurely
72
- - finish_async: be quiet when waiting for async process
73
- - teach wait_or_whine a "quiet" mode
74
- (this branch is used by jk/maint-push-async-hang-threads.)
75
-
76
-* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
77
- - run-command: implement abort_async for pthreads
78
- - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
79
- (this branch uses jk/maint-push-async-hang.)
80
-
81
-These two series aim for a good goal, but needs reroll after 1.7.5 with
82
-sign-offs.
207
+The second one will probably need re-rolling after
208
+sp/maint-clear-postfields settles.
209
210
* rr/rerere-clear-libify (2011-04-13) 1 commit
211
- rerere: Expose an API corresponding to 'clear' functionality
@@ -96,7 +222,6 @@ we may want to add tests before moving it forward.
222
223
* mg/show-without-prune (2011-04-01) 1 commit
224
- builtin/show: do not prune by pathspec
99
- (this branch uses mg/reflog-with-options.)
225
226
I wanted to like this, but it still feels like too much magic. Will drop
227
and wait for the topic to resurface.
@@ -131,194 +256,115 @@ current usage context.
256
--------------------------------------------------
257
[Cooking]
258
134
-* cn/log-parse-opt (2011-04-14) 1 commit
135
- - log: convert to parse-options
136
-
137
-* jk/format-patch-multiline-header (2011-04-14) 1 commit
138
- - format-patch: wrap email addresses after long names
139
-
140
-Will merge to "next".
141
-
142
-* jn/maint-format-patch-doc (2011-04-14) 1 commit
143
- - Documentation: describe the format of messages with inline patches
144
- (this branch is used by jn/format-patch-doc.)
259
+* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
260
+ - revisions: allow --glob and friends in parse_options-enabled commands
261
+ - revisions: split out handle_revision_pseudo_opt function
262
263
Will merge to "next".
264
148
-* jn/format-patch-doc (2011-04-18) 6 commits
149
- - Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
150
- - Documentation: publicize hints for sending patches with GMail
151
- - Documentation: publicize KMail hints for sending patches inline
152
- - Documentation: hints for sending patches inline with Thunderbird
153
- - Documentation: explain how to check for patch corruption
154
- - Merge v1.7.5-rc2 into jn/format-patch-doc
155
- (this branch uses jn/maint-format-patch-doc.)
265
+* cn/log-parse-opt (2011-04-14) 1 commit
266
+ - log: convert to parse-options
267
268
Will merge to "next".
269
159
-* jn/gitweb-js (2011-04-15) 13 commits
160
- - gitweb: Make JavaScript ability to adjust timezones configurable
161
- - gitweb.js: Add UI for selecting common timezone to display dates
162
- - gitweb: JavaScript ability to adjust time based on timezone
163
- - gitweb: Unify the way long timestamp is displayed
164
- - gitweb: Refactor generating of long dates into format_timestamp_html
165
- - gitweb.js: Provide getElementsByClassName method (if it not exists)
166
- - gitweb.js: Introduce gitweb/static/js/lib/cookies.js
167
- - gitweb.js: Extract and improve datetime handling
168
- - gitweb.js: Provide default values for padding in padLeftStr and padLeft
169
- - gitweb.js: Update and improve comments in JavaScript files
170
- - gitweb: Split JavaScript for maintability, combining on build
171
- - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
172
- - git-instaweb: Simplify build dependency on gitweb
173
-
174
-* jn/run-command-error-failure (2011-04-20) 2 commits
175
- - run-command: handle short writes and EINTR in die_child
176
- - tests: check error message from run_command
270
+* jc/fix-add-u-unmerged (2011-04-20) 1 commit
271
+ - Fix "add -u" that sometimes fails to resolve unmerged paths
272
+ (this branch uses jc/fix-diff-files-unmerged.)
273
274
Will merge to "next".
275
180
-* ss/cherry-pick-x-doc (2011-04-15) 1 commit
181
- - doc: Clarify that "cherry-pick -x" does not use "git notes"
276
+* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
277
+ - diff-files: show unmerged entries correctly
278
+ - diff: remove often unused parameters from diff_unmerge()
279
+ - diff.c: return filepair from diff_unmerge()
280
+ - test: use $_z40 from test-lib
281
+ (this branch is used by jc/fix-add-u-unmerged.)
282
283
Will merge to "next".
284
185
-* ss/doc-svn (2011-04-19) 1 commit
186
- - remove noise and inaccuracies from git-svn docs
187
-
188
-Will merge to "next".
285
+* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
286
+ - send-pack: avoid deadlock when pack-object dies early
287
+ (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
288
190
-* vr/merge-base-doc (2011-04-15) 2 commits
191
- - Restructure documentation for git-merge-base.
192
- - Documentation: update to git-merge-base --octopus
289
+* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
290
+ - Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
291
+ (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
292
293
Will merge to "next".
294
196
-* ef/maint-strbuf-init (2011-04-10) 2 commits
197
- (merged to 'next' on 2011-04-25 at 6a45422)
198
- + config: support values longer than 1023 bytes
199
- + strbuf: make sure buffer is zero-terminated
200
-
201
-Will merge to "master" by the end of week #1.
202
-
203
-* jh/dirstat (2011-04-12) 4 commits
204
- (merged to 'next' on 2011-04-25 at cb277e6)
205
- + --dirstat: In case of renames, use target filename instead of source filename
206
- + Teach --dirstat not to completely ignore rearranged lines within a file
207
- + --dirstat-by-file: Make it faster and more correct
208
- + --dirstat: Describe non-obvious differences relative to --stat or regular diff
209
-
210
-Will merge to "master" by the end of week #1.
211
-
212
-* jm/mergetool-submodules (2011-04-13) 1 commit
213
- - mergetool: Teach about submodules
295
+* vh/git-svn-doc (2011-04-26) 3 commits
296
+ - git-svn.txt: small typeface improvements
297
+ - git-svn.txt: move option descriptions
298
+ - git-svn.txt: fix usage of --add-author-from
299
300
Will merge to "next".
301
217
-* rj/sparse (2011-04-07) 7 commits
218
- (merged to 'next' on 2011-04-25 at e1af2af)
219
- + sparse: Fix some "symbol not declared" warnings
220
- + sparse: Fix errors due to missing target-specific variables
221
- + sparse: Fix an "symbol 'merge_file' not decared" warning
222
- + sparse: Fix an "symbol 'format_subject' not declared" warning
223
- + sparse: Fix some "Using plain integer as NULL pointer" warnings
224
- + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
225
- + Makefile: Use cgcc rather than sparse in the check target
226
-
227
-Will merge to "master" by the end of week #1.
228
-
229
-* cn/format-patch-quiet (2011-04-12) 2 commits
230
- (merged to 'next' on 2011-04-25 at 40e2d1c)
231
- + format-patch: document --quiet option
232
- + format-patch: don't pass on the --quiet flag
233
-
234
-Will merge to "master" by the end of week #1.
235
-
236
-* dm/stash-k-i-p (2011-04-07) 2 commits
237
- (merged to 'next' on 2011-04-25 at 01a207c)
238
- + stash: ensure --no-keep-index and --patch can be used in any order
239
- + stash: add two more tests for --no-keep-index
240
-
241
-Will merge to "master" by the end of week #1.
242
-
243
-* jc/merge-dash-previous (2011-04-07) 1 commit
244
- (merged to 'next' on 2011-04-25 at 512faf4)
245
- + merge: allow "-" as a short-hand for "previous branch"
246
-
247
-Will merge to "master" by the end of week #1.
248
-
249
-* rr/doc-content-type (2011-04-07) 4 commits
250
- (merged to 'next' on 2011-04-25 at 83c41e4)
251
- + Documentation: Allow custom diff tools to be specified in 'diff.tool'
252
- + Documentation: Add diff.<driver>.* to config
253
- + Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
254
- + Documentation: Add filter.<driver>.* to config
255
-
256
-Will merge to "master" by the end of week #1.
257
-
258
-* jc/pack-objects-bigfile (2011-04-05) 1 commit
259
- (merged to 'next' on 2011-04-25 at 621035c)
260
- + Teach core.bigfilethreashold to pack-objects
261
-
262
-Will merge to "master" by the end of week #1.
263
-
264
-* jk/maint-stash-oob (2011-04-06) 2 commits
265
- (merged to 'next' on 2011-04-25 at 8478a92)
266
- + stash: fix false positive in the invalid ref test.
267
- + stash: fix accidental apply of non-existent stashes
302
+* jk/format-patch-multiline-header (2011-04-14) 1 commit
303
+ (merged to 'next' on 2011-04-26 at 3d5eda3)
304
+ + format-patch: wrap email addresses after long names
305
269
-Will merge to "master" by the end of week #1.
306
+Will merge to "master" by the end of week #2.
307
271
-* nk/blame-abbrev (2011-04-06) 1 commit
272
- (merged to 'next' on 2011-04-25 at 59a4281)
273
- + blame: add --abbrev command line option and make it honor core.abbrev
308
+* jn/maint-format-patch-doc (2011-04-14) 1 commit
309
+ (merged to 'next' on 2011-04-26 at 400cf42)
310
+ + Documentation: describe the format of messages with inline patches
311
+ (this branch is used by jn/format-patch-doc.)
312
275
-Will merge to "master" by the end of week #1.
313
+Will merge to "master" by the end of week #2.
314
277
-* jk/maint-upload-pack-shallow (2011-04-06) 1 commit
278
- (merged to 'next' on 2011-04-25 at 073dac4)
279
- + upload-pack: start pack-objects before async rev-list
315
+* jn/format-patch-doc (2011-04-18) 6 commits
316
+ (merged to 'next' on 2011-04-26 at 3f64325)
317
+ + Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
318
+ + Documentation: publicize hints for sending patches with GMail
319
+ + Documentation: publicize KMail hints for sending patches inline
320
+ + Documentation: hints for sending patches inline with Thunderbird
321
+ + Documentation: explain how to check for patch corruption
322
+ + Merge v1.7.5-rc2 into jn/format-patch-doc
323
+ (this branch uses jn/maint-format-patch-doc.)
324
281
-Will merge to "master" by the end of week #1.
325
+Will merge to "master" by the end of week #2.
326
283
-* jk/stash-loosen-safety (2011-04-05) 1 commit
284
- (merged to 'next' on 2011-04-25 at cdc549f)
285
- + stash: drop dirty worktree check on apply
327
+* jn/run-command-error-failure (2011-04-20) 2 commits
328
+ (merged to 'next' on 2011-04-26 at a1f171e)
329
+ + run-command: handle short writes and EINTR in die_child
330
+ + tests: check error message from run_command
331
287
-Will merge to "master" by the end of week #1.
332
+Will merge to "master" by the end of week #2.
333
289
-* dm/color-palette (2011-04-05) 1 commit
290
- (merged to 'next' on 2011-04-25 at 839b17b)
291
- + Share color list between graph and show-branch
334
+* ss/cherry-pick-x-doc (2011-04-15) 1 commit
335
+ (merged to 'next' on 2011-04-26 at c9a6f83)
336
+ + doc: Clarify that "cherry-pick -x" does not use "git notes"
337
293
-Will merge to "master" by the end of week #1.
338
+Will merge to "master" by the end of week #2.
339
295
-* mg/sha1-path-advise (2011-03-31) 2 commits
296
- (merged to 'next' on 2011-04-25 at 8b094f5)
297
- + sha1_name: Suggest commit:./file for path in subdir
298
- + t1506: factor out test for "Did you mean..."
340
+* ss/doc-svn (2011-04-19) 1 commit
341
+ (merged to 'next' on 2011-04-26 at a723b91)
342
+ + remove noise and inaccuracies from git-svn docs
343
300
-Will merge to "master" by the end of week #1.
344
+Will merge to "master" by the end of week #2.
345
302
-* ar/clean-rmdir-empty (2011-04-01) 1 commit
303
- (merged to 'next' on 2011-04-25 at 5a71fdb)
304
- + clean: unreadable directory may still be rmdir-able if it is empty
346
+* vr/merge-base-doc (2011-04-15) 2 commits
347
+ (merged to 'next' on 2011-04-26 at e906ba3)
348
+ + Restructure documentation for git-merge-base.
349
+ + Documentation: update to git-merge-base --octopus
350
306
-Will merge to "master" by the end of week #1.
351
+Will merge to "master" by the end of week #2.
352
308
-* mg/reflog-with-options (2011-04-01) 3 commits
309
- (merged to 'next' on 2011-04-25 at 1ab8b78)
310
- + reflog: fix overriding of command line options
311
- + t/t1411: test reflog with formats
312
- + builtin/log.c: separate default and setup of cmd_log_init()
313
- (this branch is used by mg/show-without-prune.)
353
+* jh/dirstat (2011-04-12) 4 commits
354
+ (merged to 'next' on 2011-04-25 at cb277e6)
355
+ + --dirstat: In case of renames, use target filename instead of source filename
356
+ + Teach --dirstat not to completely ignore rearranged lines within a file
357
+ + --dirstat-by-file: Make it faster and more correct
358
+ + --dirstat: Describe non-obvious differences relative to --stat or regular diff
359
+ (this branch is used by jh/dirstat-lines.)
360
361
Will merge to "master" by the end of week #1.
362
317
-* mh/git-svn-automkdirs (2011-04-01) 1 commit
318
- (merged to 'next' on 2011-04-25 at 2e95357)
319
- + git-svn: add an option to skip the creation of empty directories
363
+* jm/mergetool-submodules (2011-04-13) 1 commit
364
+ (merged to 'next' on 2011-04-26 at 40892cf)
365
+ + mergetool: Teach about submodules
366
321
-Will merge to "master" by the end of week #1.
367
+Will merge to "master" by the end of week #2.
368
369
* ab/i18n-fixup (2011-04-14) 24 commits
370
(merged to 'next' on 2011-04-25 at 32fef07)
@@ -474,8 +520,14 @@ Will merge to "master" by the end of week #2.
520
--------------------------------------------------
521
[Discarded]
522
477
-* cn/system-path-tweak (2011-03-17) 1 commit
478
- . system_path: use a static buffer
523
+* jk/maint-push-async-hang (2011-03-31) 4 commits
524
+ . send-pack: abort sideband demuxer on pack-objects error
525
+ . run-command: allow aborting async code prematurely
526
+ . finish_async: be quiet when waiting for async process
527
+ . teach wait_or_whine a "quiet" mode
528
+ (this branch is used by jk/maint-push-async-hang-threads.)
529
480
-* jh/gitweb-localtime (2011-03-23) 1 commit
481
- . gitweb: javascript ability to adjust time based on timezone
530
+* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
531
+ . run-command: implement abort_async for pthreads
532
+ . Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
533
+ (this branch uses jk/maint-push-async-hang.)