What's cooking (2010/05 #03)
Junio C Hamano committed
May 9, 2010 at 00:23 UTC
576287a1973149702db5b4267ed81436e92064e2
1 file changed
+240
-207
whats-cooking.txt
+240
-207
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2010, #02; Fri, 7)
3
-X-master-at: cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768
4
-X-next-at: 703bdcf9e5ad91e669ce4c834d8d17a47c9e720e
2
+Subject: What's cooking in git.git (May 2010, #03; Sun, 9)
3
+X-master-at: 212f0ba357cde43d1cf66692f73a2f662d13ac55
4
+X-next-at: 07419c952633f427ce186bf4c2b9a49592c9d3d3
5
6
-What's cooking in git.git (May 2010, #02; Fri, 7)
6
+What's cooking in git.git (May 2010, #03; Sun, 9)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,77 +11,173 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-I'm in the middle of physically moving and haven't started graduating the
15
-topics that have been cooking in 'next'. Perhaps I can find time to do so
16
-for some of them over the weekend. I expect that I won't be back up to
17
-speed until later this month.
14
+Tonight's 'master' merges many topics that has been cooking for a few
15
+weeks in 'next' as the first batch of 1.7.2 cycle. I will be moving some
16
+topics in 'pu' to 'next' as the next step tomorrow. I'm in the middle of
17
+moving and I expect that I won't be back up to speed until later this
18
+month.
19
20
--------------------------------------------------
21
[New Topics]
22
22
-* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
23
- - gitweb: Refactor syntax highlighting support
24
- - gitweb: Syntax highlighting support
23
+* jn/gitweb-fastcgi (2010-05-07) 5 commits
24
+ - gitweb: Add support for FastCGI, using CGI::Fast
25
+ - gitweb: Put all per-connection code in run() subroutine
26
+ - gitweb: Use nonlocal jump instead of 'exit' in die_error
27
+ - gitweb: href(..., -path_info => 0|1)
28
+ - Export more test-related variables when running external tests
29
+ (this branch shares commits with jn/gitweb-caching-prep.)
30
26
-* jn/maint-amend-missing-name (2010-05-02) 1 commit
27
- - commit --amend: cope with missing display name
31
+* jn/make-header-dependency (2010-05-08) 2 commits
32
+ - Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
33
+ - Makefile: fix header dependency checker to allow NO_CURL builds
34
29
-* rs/diff-no-minimal (2010-05-02) 1 commit
30
- - git diff too slow for a file
35
+* js/try-to-free-stackable (2010-05-08) 2 commits
36
+ - Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
37
+ - Have set_try_to_free_routine return the previous routine
38
+ (this branch uses np/malloc-threading.)
39
32
-* ab/test-cleanup (2010-05-07) 2 commits
33
- - Turn setup code in t2007-checkout-symlink.sh into a test
34
- - Move t6000lib.sh to lib-*
40
+Should be Ok for 'next'.
41
36
-* by/blame-doc-m-c (2010-05-06) 1 commit
37
- - blame-options.txt: Add default value for `-M/-C` options.
42
+--------------------------------------------------
43
+[Graduated to "master"]
44
39
-* by/log-follow (2010-05-06) 3 commits
40
- - Make git log --follow find copies among unmodified files.
41
- - Make diffcore_std only can run once before a diff_flush
42
- - Add a macro DIFF_QUEUE_CLEAR.
45
+* ab/commit-empty-message (2010-04-06) 1 commit
46
+ (merged to 'next' on 2010-05-04 at 54c2e47)
47
+ + Add option to git-commit to allow empty log messages
48
44
-* eb/crlf (2010-05-07) 3 commits
45
- - Add per-repository eol normalization
46
- - Add tests for per-repository eol normalization
47
- - Add "auto-eol" attribute and "core.eolStyle" config variable
49
+(has been in 'next' since 2010-04-07)
50
49
-* jn/notes-doc (2010-05-03) 4 commits
50
- - Documentation/notes: nitpicks
51
- - Documentation/notes: describe content of notes
52
- - Documentation/notes: adjust description to use configuration section
53
- - Documentation/notes: describe effect of environment and configuration
51
+* bg/apply-blank-trailing-context (2010-04-08) 1 commit
52
+ (merged to 'next' on 2010-05-04 at 31f3482)
53
+ + apply: Allow blank *trailing* context lines to match beyond EOF
54
55
-* mg/advice-statushints (2010-04-22) 2 commits
56
- - wt-status: take advice.statusHints seriously
57
- - t7508: test advice.statusHints
55
+(has been in 'next' since 2010-04-14)
56
59
---------------------------------------------------
60
-[Graduated to "master"]
57
+* bg/send-email-smtpdomain (2010-04-10) 4 commits
58
+ (merged to 'next' on 2010-05-04 at 2afbe2c)
59
+ + send-email: Cleanup smtp-domain and add config
60
+ + Document send-email --smtp-domain
61
+ + send-email: Don't use FQDNs without a '.'
62
+ + send-email: Cleanup { style
63
62
-* jc/doc-submit-gmail (2010-04-07) 1 commit
63
- (merged to 'next' on 2010-04-10 at cd4e8cf)
64
- + SubmittingPatches: update GMail section
64
+(has been in 'next' since 2010-04-14)
65
66
-* jg/auto-initialize-notes-with-percent-n-in-format (2010-04-13) 1 commit
67
- + pretty: Initialize notes if %N is used
66
+* cc/revert-strategy (2010-03-31) 5 commits
67
+ (merged to 'next' on 2010-05-04 at 6d44a83)
68
+ + revert: add "--strategy" option to choose merge strategy
69
+ + merge: make function try_merge_command non static
70
+ + merge: refactor code that calls "git merge-STRATEGY"
71
+ + revert: refactor merge recursive code into its own function
72
+ + revert: use strbuf to refactor the code that writes the merge message
73
69
-* jk/maint-diffstat-overflow (2010-04-17) 1 commit
70
- + diff: use large integers for diffstat calculations
74
+(has been in 'next' since 2010-04-05)
75
72
-* rr/remote-helper-doc (2010-04-07) 3 commits
73
- + Documentation/remote-helpers: Add invocation section
74
- + Documentation/urls: Rewrite to accomodate <transport>::<address>
75
- + Documentation/remote-helpers: Rewrite description
76
+* cw/ws-indent-with-tab (2010-04-03) 6 commits
77
+ (merged to 'next' on 2010-05-04 at 1d7aca4)
78
+ + whitespace: tests for git-apply --whitespace=fix with tab-in-indent
79
+ + whitespace: add tab-in-indent support for --whitespace=fix
80
+ + whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
81
+ + whitespace: tests for git-diff --check with tab-in-indent error class
82
+ + whitespace: add tab-in-indent error class
83
+ + whitespace: we cannot "catch all errors known to git" anymore
84
77
-* wp/doc-filter-direction (2010-04-17) 1 commit
78
- + documentation: clarify direction of core.autocrlf
85
+(has been in 'next' since 2010-04-05)
86
80
-These were pushed out as part of 1.7.1
87
+* eb/unpretty-b-format (2010-03-24) 1 commit
88
+ (merged to 'next' on 2010-05-04 at a466ed8)
89
+ + Add `%B' in format strings for raw commit body in `git log' and friends
90
+
91
+(has been in 'next' since 2010-04-07)
92
+
93
+* hg/maint-attr-fix (2010-04-06) 3 commits
94
+ (merged to 'next' on 2010-05-04 at 8b98845)
95
+ + attr: Expand macros immediately when encountered.
96
+ + attr: Allow multiple changes to an attribute on the same line.
97
+ + attr: Fixed debug output for macro expansion.
98
+
99
+(has been in 'next' since 2010-04-14)
100
+
101
+* jc/maint-reflog-expire-unreachable (2010-04-07) 1 commit
102
+ (merged to 'next' on 2010-05-04 at 4efe837)
103
+ + reflog --expire-unreachable: avoid merge-base computation
104
+ (this branch is used by jc/maint-no-reflog-expire-unreach-for-head.)
105
+
106
+(has been in 'next' since 2010-04-22)
107
+
108
+* jc/test-sleepless (2010-04-06) 1 commit
109
+ (merged to 'next' on 2010-05-04 at 9ff84b0)
110
+ + war on "sleep" in tests
111
+
112
+(has been in 'next' since 2010-04-07)
113
+
114
+* jk/cached-textconv (2010-04-01) 5 commits
115
+ (merged to 'next' on 2010-05-04 at e4b72a0)
116
+ + diff: avoid useless filespec population
117
+ + diff: cache textconv output
118
+ + textconv: refactor calls to run_textconv
119
+ + introduce notes-cache interface
120
+ + make commit_tree a library function
121
+
122
+(has been in 'next' since 2010-04-02)
123
+
124
+* mh/status-optionally-refresh (2010-04-03) 3 commits
125
+ (merged to 'next' on 2010-05-04 at be164f0)
126
+ + t7508: add a test for "git status" in a read-only repository
127
+ + git status: refresh the index if possible
128
+ + t7508: add test for "git status" refreshing the index
129
+
130
+(has been in 'next' since 2010-04-05)
131
+
132
+* pc/remove-warn (2010-03-26) 4 commits
133
+ (merged to 'next' on 2010-05-04 at c79c1e6)
134
+ + Remove a redundant errno test in a usage of remove_path
135
+ + Introduce remove_or_warn function
136
+ + Implement the rmdir_or_warn function
137
+ + Generalise the unlink_or_warn function
138
+
139
+(has been in 'next' since 2010-04-02)
140
+
141
+* rc/ls-remote-default (2010-04-09) 1 commit
142
+ (merged to 'next' on 2010-05-04 at 2af33e1)
143
+ + ls-remote: fall-back to default remotes when no remote specified
144
+
145
+(has been in 'next' since 2010-04-14)
146
+
147
+* rc/maint-curl-helper (2010-04-08) 3 commits
148
+ (merged to 'next' on 2010-05-04 at c32988d)
149
+ + remote-curl: ensure that URLs have a trailing slash
150
+ + http: make end_url_with_slash() public
151
+ + t5541-http-push: add test for URLs with trailing slash
152
+
153
+(has been in 'next' since 2010-04-14)
154
+
155
+* sc/http-late-auth (2010-04-01) 1 commit
156
+ (merged to 'next' on 2010-05-04 at 23ae2e8)
157
+ + Prompt for a username when an HTTP request 401s
158
+
159
+(has been in 'next' since 2010-04-02)
160
+
161
+* sd/log-decorate (2010-04-08) 6 commits
162
+ (merged to 'next' on 2010-05-04 at 6e54ae9)
163
+ + log.decorate: only ignore it under "log --pretty=raw"
164
+ + script with rev-list instead of log
165
+ + log --pretty/--oneline: ignore log.decorate
166
+ + log.decorate: usability fixes
167
+ + Add `log.decorate' configuration variable.
168
+ + git_config_maybe_bool()
169
+
170
+(has been in 'next' since 2010-04-08)
171
172
--------------------------------------------------
173
[Stalled]
174
175
+* jc/rev-list-ancestry-path (2010-04-20) 1 commit
176
+ - revision: --ancestry-path
177
+
178
+Just an illustration patch. merge simplification logic used when
179
+pathspecs are in effect interacts with this rather badly.
180
+
181
* js/rebase-origin-x (2010-02-05) 1 commit
182
- [RFC w/o test and incomplete] rebase: add -x option to record original commit name
183
@@ -114,42 +210,90 @@ Good thing to do, but it came at a bad time.
210
--------------------------------------------------
211
[Cooking]
212
213
+* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
214
+ - gitweb: Refactor syntax highlighting support
215
+ - gitweb: Syntax highlighting support
216
+
217
+* jn/maint-amend-missing-name (2010-05-02) 1 commit
218
+ - commit --amend: cope with missing display name
219
+
220
+Should be Ok for 'next'.
221
+
222
+* rs/diff-no-minimal (2010-05-02) 1 commit
223
+ - git diff too slow for a file
224
+
225
+Should be Ok for 'next'.
226
+
227
+* ab/test-cleanup (2010-05-07) 2 commits
228
+ - Turn setup code in t2007-checkout-symlink.sh into a test
229
+ - Move t6000lib.sh to lib-*
230
+
231
+Should be Ok for 'next'.
232
+
233
+* by/blame-doc-m-c (2010-05-06) 1 commit
234
+ - blame-options.txt: Add default value for `-M/-C` options.
235
+
236
+* by/log-follow (2010-05-06) 3 commits
237
+ - Make git log --follow find copies among unmodified files.
238
+ - Make diffcore_std only can run once before a diff_flush
239
+ - Add a macro DIFF_QUEUE_CLEAR.
240
+
241
+Should be Ok for 'next'.
242
+
243
+* eb/crlf (2010-05-08) 4 commits
244
+ - Add per-repository eol normalization
245
+ - Pass eol conv mode as an argument instead of using global auto_crlf
246
+ - Add tests for per-repository eol normalization
247
+ - Add "core.eolStyle" variable to control end-of-line conversion
248
+
249
+* jn/notes-doc (2010-05-08) 8 commits
250
+ - Documentation/notes: nitpicks
251
+ - Documentation/notes: clean up description of rewriting configuration
252
+ - Documentation/notes: simplify treatment of default display refs
253
+ - Documentation/log: add a CONFIGURATION section
254
+ - Documentation/notes: simplify treatment of default notes ref
255
+ - Documentation/notes: add configuration section
256
+ - Documentation/notes: describe content of notes blobs
257
+ - Documentation/notes: document format of notes trees
258
+
259
+* mg/advice-statushints (2010-04-22) 2 commits
260
+ - wt-status: take advice.statusHints seriously
261
+ - t7508: test advice.statusHints
262
+
263
+Should be Ok for 'next'.
264
+
265
* cb/maint-stash-orphaned-file (2010-04-18) 2 commits
266
(merged to 'next' on 2010-05-04 at 38488ba)
267
+ stash tests: stash can lose data in a file removed from the index
268
+ stash: Don't overwrite files that have gone from the index
269
122
-(was in 'next' on 2010-04-22)
270
+(has been in 'next' since 2010-04-22)
271
272
* jn/maint-bundle (2010-04-19) 2 commits
273
(merged to 'next' on 2010-05-04 at f2086f5)
274
+ fix "bundle --stdin" segfault
275
+ t5704 (bundle): add tests for bundle --stdin
276
129
-(was in 'next' on 2010-04-22)
277
+(has been in 'next' since 2010-04-22)
278
279
* pb/patch-id-plus (2010-04-19) 2 commits
280
(merged to 'next' on 2010-05-04 at 59881b8)
281
+ patch-id: Add support for mbox format
282
+ patch-id: extract parsing one diff out of generate_id_list
283
136
-(was in 'next' on 2010-04-22)
284
+(has been in 'next' since 2010-04-22)
285
286
* rr/doc-submitting (2010-04-19) 1 commit
287
(merged to 'next' on 2010-05-04 at 5f040bd)
288
+ SubmittingPatches: Add new section about what to base work on
289
142
-(was in 'next' on 2010-04-22)
290
+(has been in 'next' since 2010-04-22)
291
292
* st/remote-tags-no-tags (2010-04-20) 2 commits
293
- remote add: add a --[no-]tags option
294
- Honor "tagopt = --tags" configuration option
295
148
-* jc/rev-list-ancestry-path (2010-04-20) 1 commit
149
- - revision: --ancestry-path
150
-
151
-Just an illustration patch. merge simplification logic used when
152
-pathspecs are in effect interacts with this rather badly.
296
+Should be Ok for 'next'.
297
298
* cb/assume-unchanged-fix (2010-05-01) 2 commits
299
- Documentation: git-add does not update files marked "assume unchanged"
@@ -161,20 +305,29 @@ pathspecs are in effect interacts with this rather badly.
305
There also was a companion patch to fast-import to deal with foreign SCM
306
interface that may not have human-readable author identifier.
307
308
+Should be Ok for 'next'.
309
+
310
* jn/gitweb-caching-prep (2010-04-24) 5 commits
311
- gitweb: Move generating page title to separate subroutine
312
- gitweb: Add custom error handler using die_error
313
- gitweb: Use nonlocal jump instead of 'exit' in die_error
314
- gitweb: href(..., -path_info => 0|1)
315
- Export more test-related variables when running external tests
316
+ (this branch shares commits with jn/gitweb-fastcgi.)
317
+
318
+Should be Ok for 'next'.
319
320
* jn/gitweb-install (2010-05-01) 2 commits
321
- gitweb: Create install target for gitweb in Makefile
322
- gitweb: Improve installation instructions in gitweb/INSTALL
323
324
+Should be Ok for 'next'.
325
+
326
* jn/gitweb-our-squelch (2010-04-30) 1 commit
327
- gitweb: Silence 'Variable VAR may be unavailable' warnings
328
329
+Should be Ok for 'next'.
330
+
331
* jn/maint-request-pull (2010-05-07) 3 commits
332
- t5150: protect backslash with backslash in shell
333
- request-pull: protect against OPTIONS_KEEPDASHDASH from environment
@@ -186,6 +339,8 @@ interface that may not have human-readable author identifier.
339
- Merge branch 'jn/maint-request-pull' into jn/request-pull
340
(this branch uses jn/maint-request-pull.)
341
342
+Should be Ok for 'next'.
343
+
344
* jn/shortlog (2010-05-03) 5 commits
345
- pretty: Respect --abbrev option
346
- shortlog: Document and test --format option
@@ -193,16 +348,21 @@ interface that may not have human-readable author identifier.
348
- t4201 (shortlog): guard setup with test_expect_success
349
- Documentation/shortlog: scripted users should not rely on implicit HEAD
350
196
-* wp/pretty-enhancement (2010-05-02) 3 commits
351
+Should be Ok for 'next'.
352
+
353
+* wp/pretty-enhancement (2010-05-08) 4 commits
354
+ - pretty: initialize new cmt_fmt_map to 0
355
- pretty: add aliases for pretty formats
356
- pretty: add infrastructure for commit format aliases
357
- pretty: make it easier to add new formats
358
359
+Should be Ok for 'next'.
360
+
361
* jn/t7006-fixup (2010-04-14) 1 commit
362
(merged to 'next' on 2010-05-04 at 490ab5d)
363
+ t7006: guard cleanup with test_expect_success
364
205
-(was in 'next' on 2010-04-22)
365
+(has been in 'next' since 2010-04-22)
366
367
* js/maint-receive-pack-symref-alias (2010-04-19) 3 commits
368
(merged to 'next' on 2010-05-04 at 259f4f1)
@@ -210,7 +370,7 @@ interface that may not have human-readable author identifier.
370
+ receive-pack: detect aliased updates which can occur with symrefs
371
+ receive-pack: switch global variable 'commands' to a parameter
372
213
-(was in 'next' on 2010-04-22)
373
+(has been in 'next' since 2010-04-22)
374
375
* sp/maint-dumb-http-pack-reidx (2010-04-19) 12 commits
376
(merged to 'next' on 2010-05-04 at 166443a)
@@ -227,7 +387,7 @@ interface that may not have human-readable author identifier.
387
+ t5550-http-fetch: Use subshell for repository operations
388
+ http.c: Remove bad free of static block
389
230
-(was in 'next' on 2010-04-22)
390
+(has been in 'next' since 2010-04-22)
391
392
* hg/id-munging (2010-04-06) 2 commits
393
- convert: Keep foreign $Id$ on checkout.
@@ -239,7 +399,7 @@ interface that may not have human-readable author identifier.
399
+ t7400: clarify 'submodule add' tests
400
+ t7400: split setup into multiple tests
401
242
-(was in 'next' on 2010-04-22)
402
+(has been in 'next' since 2010-04-22)
403
404
* np/index-pack-memsave (2010-04-12) 3 commits
405
(merged to 'next' on 2010-05-04 at 366b014)
@@ -247,35 +407,34 @@ interface that may not have human-readable author identifier.
407
+ index-pack: rationalize unpack_entry_data()
408
+ index-pack: smarter memory usage when resolving deltas
409
250
-(was in 'next' on 2010-04-22)
410
+(has been in 'next' since 2010-04-22)
411
412
* jc/am-3-show-corrupted-patch (2010-04-09) 1 commit
413
(merged to 'next' on 2010-05-04 at 951f0e6)
414
+ am -3: recover the diagnostic messages for corrupt patches
415
256
-(was in 'next' on 2010-04-22)
416
+(has been in 'next' since 2010-04-22)
417
418
* jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits
419
(merged to 'next' on 2010-05-04 at d23a180)
420
+ reflog --expire-unreachable: special case entries in "HEAD" reflog
421
+ more war on "sleep" in tests
422
+ Document gc.<pattern>.reflogexpire variables
263
- (this branch uses jc/maint-reflog-expire-unreachable.)
423
265
-(was in 'next' on 2010-04-22)
424
+(has been in 'next' since 2010-04-22)
425
426
* cw/maint-exec-defpath (2010-04-15) 2 commits
427
(merged to 'next' on 2010-05-04 at 8d1591f)
428
+ autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
429
+ exec_cmd.c: replace hard-coded path list with one from <paths.h>
430
272
-(was in 'next' on 2010-04-22)
431
+(has been in 'next' since 2010-04-22)
432
433
* tr/word-diff (2010-04-14) 1 commit
434
(merged to 'next' on 2010-05-04 at d191b25)
435
+ diff: add --word-diff option that generalizes --color-words
436
278
-(was in 'next' on 2010-04-22)
437
+(has been in 'next' since 2010-04-22)
438
There are gitk patches that go with this series.
439
440
* sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits
@@ -286,44 +445,7 @@ There are gitk patches that go with this series.
445
+ tag.h: Remove unused signature field
446
+ tag.c: Correct indentation
447
289
-(was in 'next' on 2010-04-22)
290
-
291
-* bg/apply-blank-trailing-context (2010-04-08) 1 commit
292
- (merged to 'next' on 2010-05-04 at 31f3482)
293
- + apply: Allow blank *trailing* context lines to match beyond EOF
294
-
295
-(was in 'next' on 2010-04-14)
296
-
297
-* bg/send-email-smtpdomain (2010-04-10) 4 commits
298
- (merged to 'next' on 2010-05-04 at 2afbe2c)
299
- + send-email: Cleanup smtp-domain and add config
300
- + Document send-email --smtp-domain
301
- + send-email: Don't use FQDNs without a '.'
302
- + send-email: Cleanup { style
303
-
304
-(was in 'next' on 2010-04-14)
305
-
306
-* rc/ls-remote-default (2010-04-09) 1 commit
307
- (merged to 'next' on 2010-05-04 at 2af33e1)
308
- + ls-remote: fall-back to default remotes when no remote specified
309
-
310
-(was in 'next' on 2010-04-14)
311
-
312
-* rc/maint-curl-helper (2010-04-08) 3 commits
313
- (merged to 'next' on 2010-05-04 at c32988d)
314
- + remote-curl: ensure that URLs have a trailing slash
315
- + http: make end_url_with_slash() public
316
- + t5541-http-push: add test for URLs with trailing slash
317
-
318
-(was in 'next' on 2010-04-14)
319
-
320
-* hg/maint-attr-fix (2010-04-06) 3 commits
321
- (merged to 'next' on 2010-05-04 at 8b98845)
322
- + attr: Expand macros immediately when encountered.
323
- + attr: Allow multiple changes to an attribute on the same line.
324
- + attr: Fixed debug output for macro expansion.
325
-
326
-(was in 'next' on 2010-04-14)
448
+(has been in 'next' since 2010-04-22)
449
450
* jc/status-show-ignored (2010-05-01) 6 commits
451
(merged to 'next' on 2010-05-04 at 8b32120)
@@ -334,42 +456,18 @@ There are gitk patches that go with this series.
456
+ wt-status: plug memory leak while collecting untracked files
457
+ wt-status: remove unused workdir_untracked member
458
337
-(was in 'next' on 2010-05-01)
459
+(has been in 'next' since 2010-05-01)
460
461
I am negative about conflating the JSON output to the mix at this point.
462
Let's stabilize "status" with the existing --porcelain/-z option first.
463
342
-* eb/unpretty-b-format (2010-03-24) 1 commit
343
- (merged to 'next' on 2010-05-04 at a466ed8)
344
- + Add `%B' in format strings for raw commit body in `git log' and friends
345
-
346
-(was in 'next' on 2010-04-07)
347
-
348
-* ab/commit-empty-message (2010-04-06) 1 commit
349
- (merged to 'next' on 2010-05-04 at 54c2e47)
350
- + Add option to git-commit to allow empty log messages
351
-
352
-(was in 'next' on 2010-04-07)
353
-
354
-* jc/test-sleepless (2010-04-06) 1 commit
355
- (merged to 'next' on 2010-05-04 at 9ff84b0)
356
- + war on "sleep" in tests
357
-
358
-(was in 'next' on 2010-04-07)
359
-
360
-* jc/maint-reflog-expire-unreachable (2010-04-07) 1 commit
361
- (merged to 'next' on 2010-05-04 at 4efe837)
362
- + reflog --expire-unreachable: avoid merge-base computation
363
- (this branch is used by jc/maint-no-reflog-expire-unreach-for-head.)
364
-
365
-(was in 'next' on 2010-04-22)
366
-
464
* np/malloc-threading (2010-04-08) 2 commits
465
(merged to 'next' on 2010-05-04 at 1b0567f)
466
+ Thread-safe xmalloc and xrealloc needs a recursive mutex
467
+ Make xmalloc and xrealloc thread-safe
468
+ (this branch is used by js/try-to-free-stackable.)
469
372
-(was in 'next' on 2010-04-10)
470
+(has been in 'next' since 2010-04-10)
471
472
The fix should eventually go to 'maint' and 'master'.
473
@@ -383,37 +481,7 @@ The fix should eventually go to 'maint' and 'master'.
481
+ Make report() from usage.c public as vreportf() and use it.
482
+ Modernize t5530-upload-pack-error.
483
386
-(all except for the tip was in 'next' on 2010-03-20).
387
-
388
-* sd/log-decorate (2010-04-08) 6 commits
389
- (merged to 'next' on 2010-05-04 at 6e54ae9)
390
- + log.decorate: only ignore it under "log --pretty=raw"
391
- + script with rev-list instead of log
392
- + log --pretty/--oneline: ignore log.decorate
393
- + log.decorate: usability fixes
394
- + Add `log.decorate' configuration variable.
395
- + git_config_maybe_bool()
396
-
397
-(was in 'next' on 2010-04-08)
398
-
399
-* mh/status-optionally-refresh (2010-04-03) 3 commits
400
- (merged to 'next' on 2010-05-04 at be164f0)
401
- + t7508: add a test for "git status" in a read-only repository
402
- + git status: refresh the index if possible
403
- + t7508: add test for "git status" refreshing the index
404
-
405
-(was in 'next' on 2010-04-05)
406
-
407
-* cw/ws-indent-with-tab (2010-04-03) 6 commits
408
- (merged to 'next' on 2010-05-04 at 1d7aca4)
409
- + whitespace: tests for git-apply --whitespace=fix with tab-in-indent
410
- + whitespace: add tab-in-indent support for --whitespace=fix
411
- + whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
412
- + whitespace: tests for git-diff --check with tab-in-indent error class
413
- + whitespace: add tab-in-indent error class
414
- + whitespace: we cannot "catch all errors known to git" anymore
415
-
416
-(was in 'next' on 2010-04-05)
484
+(all except for the tip has been in 'next' since 2010-03-20).
485
486
* sr/remote-helper-export (2010-04-12) 9 commits
487
(merged to 'next' on 2010-05-04 at 519ab16)
@@ -428,33 +496,7 @@ The fix should eventually go to 'maint' and 'master'.
496
+ clone: pass the remote name to remote_get
497
(this branch is used by jp/hold-string-list-sanity.)
498
431
-(was in 'next' on 2010-04-12)
432
-
433
-* cc/revert-strategy (2010-03-31) 5 commits
434
- (merged to 'next' on 2010-05-04 at 6d44a83)
435
- + revert: add "--strategy" option to choose merge strategy
436
- + merge: make function try_merge_command non static
437
- + merge: refactor code that calls "git merge-STRATEGY"
438
- + revert: refactor merge recursive code into its own function
439
- + revert: use strbuf to refactor the code that writes the merge message
440
-
441
-(was in 'next' on 2010-04-05)
442
-
443
-* sc/http-late-auth (2010-04-01) 1 commit
444
- (merged to 'next' on 2010-05-04 at 23ae2e8)
445
- + Prompt for a username when an HTTP request 401s
446
-
447
-(was in 'next' on 2010-04-02)
448
-
449
-* jk/cached-textconv (2010-04-01) 5 commits
450
- (merged to 'next' on 2010-05-04 at e4b72a0)
451
- + diff: avoid useless filespec population
452
- + diff: cache textconv output
453
- + textconv: refactor calls to run_textconv
454
- + introduce notes-cache interface
455
- + make commit_tree a library function
456
-
457
-(was in 'next' on 2010-04-02)
499
+(has been in 'next' since 2010-04-12)
500
501
* ld/discovery-limit-to-fs (2010-04-04) 6 commits
502
- write-index: check and warn when worktree crosses a filesystem boundary
@@ -465,24 +507,15 @@ The fix should eventually go to 'maint' and 'master'.
507
+ truncate cwd string before printing error message
508
+ config.c: remove static keyword from git_env_bool()
509
468
-(all except for the tip was in 'next' on 2010-04-07)
510
+(all except for the tip has been in 'next' since 2010-04-07)
511
512
The tip one is a bit iffy.
513
472
-* pc/remove-warn (2010-03-26) 4 commits
473
- (merged to 'next' on 2010-05-04 at c79c1e6)
474
- + Remove a redundant errno test in a usage of remove_path
475
- + Introduce remove_or_warn function
476
- + Implement the rmdir_or_warn function
477
- + Generalise the unlink_or_warn function
478
-
479
-(was in 'next' on 2010-04-02)
480
-
514
* em/checkout-orphan (2010-03-21) 1 commit
515
(merged to 'next' on 2010-05-04 at ddb45fc)
516
+ git checkout: create unparented branch by --orphan
517
485
-(was in 'next' on 2010-03-28)
518
+(has been in 'next' since 2010-03-28)
519
520
Perhaps needs a bit of documentation updates, describing the "going open
521
source" scenario.
@@ -492,4 +525,4 @@ source" scenario.
525
+ Use strbufs instead of open-coded string manipulation
526
+ Allow passing of configuration parameters in the command line
527
495
-(was in 'next' on 2010-04-07)
528
+(has been in 'next' since 2010-04-07)