What's cooking (2010/05 #05)
Junio C Hamano committed
May 25, 2010 at 21:28 UTC
17bd783f39ebeac6650d0dbf70b87d6dfacd1acb
1 file changed
+296
-271
whats-cooking.txt
+296
-271
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2010, #04; Wed, 12)
3
-X-master-at: 0e4607c09d72ada4942ea49298dba83ec4145892
4
-X-next-at: 7d1e8fef7ffce7fe8e9fa8fae99aaa15468fb6d3
2
+Subject: What's cooking in git.git (May 2010, #05; Tue, 25)
3
+X-master-at: d0b16c8f878bef5c1268e033a3d1f427498c7008
4
+X-next-at: b26ba11a604b521da594b71d7e3fbc51f26e24fa
5
6
-What's cooking in git.git (May 2010, #04; Wed, 12)
6
+What's cooking in git.git (May 2010, #05; Tue, 25)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,112 +11,21 @@ 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'll be packing my primary machine tomorrow morning, and hopefully I can
15
-resume my git activity early next week. This will be the last pushout
16
-until then.
14
+Many topics that have been cooking since 1.7.1 pre-release freeze period
15
+are now in master; maybe it is a good time to start freezing feature
16
+branches for 1.7.2---I think I said I'll keep this cycle shorter, no?
17
18
---------------------------------------------------
19
-[New Topics]
20
-
21
-* bw/diff-metainfo-color (2010-05-04) 1 commit
22
- - [sign-off?] diff: fix coloring of extended diff headers
23
-
24
-* ph/clone-message-reword (2010-05-09) 1 commit
25
- - clone: reword messages to match the end-user perception
26
-
27
-* rc/ls-remote-default (2010-05-12) 1 commit
28
- - ls-remote: print URL when no repo is specified
29
-
30
-* fg/autocrlf (2010-05-12) 1 commit
31
- - autocrlf: Make it work also for un-normalized repositories
32
-
33
-* tc/merge-m-log (2010-05-11) 8 commits
34
- - merge: --log appends shortlog to message if specified
35
- - fmt-merge-msg: add function to append shortlog only
36
- - fmt-merge-msg: refactor merge title formatting
37
- - fmt-merge-msg: minor refactor of fmt_merge_msg()
38
- - merge: rename variable
39
- - merge: update comment
40
- - t7604-merge-custom-message: show that --log doesn't append to -m
41
- - t7604-merge-custom-message: shift expected output creation
18
+Btw, fwiw, I recently took a position with Google. The primary
19
+development machine has been unpacked but I still haven't managed to get
20
+back to speed yet.
21
22
--------------------------------------------------
44
-[Stalled]
45
-
46
-* jc/rev-list-ancestry-path (2010-04-20) 1 commit
47
- - revision: --ancestry-path
48
-
49
-Just an illustration patch. merge simplification logic used when
50
-pathspecs are in effect interacts with this rather badly.
51
-
52
-* js/rebase-origin-x (2010-02-05) 1 commit
53
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
54
-
55
-I retract my objection against the idea of -x; needs polishing before
56
-moving forward.
57
-
58
-* js/grep-open (2010-05-01) 3 commits
59
- - grep: do not ignore return value from chdir()
60
- - grep -O: allow optional argument specifying the pager (or editor)
61
- - grep: Add the option '--open-files-in-pager'
62
- (this branch is used by jp/hold-string-list-sanity.)
63
-
64
-Probably needs to support --no-index mode as well.
23
+[Graduated to "master"]
24
66
-* jp/hold-string-list-sanity (2010-04-06) 9 commits
67
- . string_list: Fix argument order for string_list_append
68
- . Merge branch 'sr/remote-helper-export' into HEAD
69
- . Merge branch 'js/grep-open' into HEAD
70
- . Merge branch 'sb/fmt-merge-msg' into HEAD
71
- . string_list: Fix argument order for string_list_lookup
72
- . string_list: Fix argument order for string_list_insert_at_index
73
- . string_list: Fix argument order for string_list_insert
74
- . string_list: Fix argument order for for_each_string_list
75
- . string_list: Fix argument order for print_string_list
76
- (this branch uses js/grep-open and sr/remote-helper-export.)
77
-
78
-Building this on top of slushy codebase is not a very promising endeavor.
79
-Good thing to do, but it came at a bad time.
80
-
81
---------------------------------------------------
82
-[Cooking]
83
-
84
-* jn/gitweb-fastcgi (2010-05-07) 5 commits
85
- - gitweb: Add support for FastCGI, using CGI::Fast
86
- - gitweb: Put all per-connection code in run() subroutine
87
- + gitweb: Use nonlocal jump instead of 'exit' in die_error
88
- + gitweb: href(..., -path_info => 0|1)
89
- + Export more test-related variables when running external tests
90
- (this branch shares commits with jn/gitweb-caching-prep.)
91
-
92
-* jn/make-header-dependency (2010-05-08) 2 commits
93
- - Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
94
- - Makefile: fix header dependency checker to allow NO_CURL builds
95
-
96
-* js/try-to-free-stackable (2010-05-08) 2 commits
97
- - Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
98
- - Have set_try_to_free_routine return the previous routine
99
- (this branch uses np/malloc-threading.)
100
-
101
-Should be Ok for 'next'.
102
-
103
-* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
104
- - gitweb: Refactor syntax highlighting support
105
- - gitweb: Syntax highlighting support
106
-
107
-* jn/maint-amend-missing-name (2010-05-02) 1 commit
108
- (merged to 'next' on 2010-05-09 at 9023332)
109
- + commit --amend: cope with missing display name
110
-
111
-* rs/diff-no-minimal (2010-05-02) 1 commit
112
- (merged to 'next' on 2010-05-09 at 6c74aa0)
113
- + git diff too slow for a file
114
-
115
-* ab/test-cleanup (2010-05-07) 2 commits
116
- - Turn setup code in t2007-checkout-symlink.sh into a test
117
- - Move t6000lib.sh to lib-*
118
-
119
-Should be Ok for 'next'.
25
+* ar/config-from-command-line (2010-03-26) 2 commits
26
+ (merged to 'next' on 2010-05-04 at 2962717)
27
+ + Use strbufs instead of open-coded string manipulation
28
+ + Allow passing of configuration parameters in the command line
29
30
* by/blame-doc-m-c (2010-05-06) 1 commit
31
(merged to 'next' on 2010-05-09 at c975ad5)
@@ -130,56 +39,37 @@ Should be Ok for 'next'.
39
+ Make diffcore_std only can run once before a diff_flush
40
+ Add a macro DIFF_QUEUE_CLEAR.
41
133
-* jn/notes-doc (2010-05-08) 8 commits
134
- - Documentation/notes: nitpicks
135
- - Documentation/notes: clean up description of rewriting configuration
136
- - Documentation/notes: simplify treatment of default display refs
137
- - Documentation/log: add a CONFIGURATION section
138
- - Documentation/notes: simplify treatment of default notes ref
139
- - Documentation/notes: add configuration section
140
- - Documentation/notes: describe content of notes blobs
141
- - Documentation/notes: document format of notes trees
142
-
143
-* mg/advice-statushints (2010-04-22) 2 commits
144
- (merged to 'next' on 2010-05-09 at 4642509)
145
- + wt-status: take advice.statusHints seriously
146
- + t7508: test advice.statusHints
147
-
42
* cb/maint-stash-orphaned-file (2010-04-18) 2 commits
43
(merged to 'next' on 2010-05-04 at 38488ba)
44
+ stash tests: stash can lose data in a file removed from the index
45
+ stash: Don't overwrite files that have gone from the index
46
153
-(has been in 'next' since 2010-04-22)
154
-
155
-* jn/maint-bundle (2010-04-19) 2 commits
156
- (merged to 'next' on 2010-05-04 at f2086f5)
157
- + fix "bundle --stdin" segfault
158
- + t5704 (bundle): add tests for bundle --stdin
159
-
160
-(has been in 'next' since 2010-04-22)
161
-
162
-* pb/patch-id-plus (2010-04-19) 2 commits
163
- (merged to 'next' on 2010-05-04 at 59881b8)
164
- + patch-id: Add support for mbox format
165
- + patch-id: extract parsing one diff out of generate_id_list
166
-
167
-(has been in 'next' since 2010-04-22)
47
+* cw/maint-exec-defpath (2010-04-15) 2 commits
48
+ (merged to 'next' on 2010-05-04 at 8d1591f)
49
+ + autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
50
+ + exec_cmd.c: replace hard-coded path list with one from <paths.h>
51
169
-* rr/doc-submitting (2010-04-19) 1 commit
170
- (merged to 'next' on 2010-05-04 at 5f040bd)
171
- + SubmittingPatches: Add new section about what to base work on
52
+* jc/am-3-show-corrupted-patch (2010-04-09) 1 commit
53
+ (merged to 'next' on 2010-05-04 at 951f0e6)
54
+ + am -3: recover the diagnostic messages for corrupt patches
55
173
-(has been in 'next' since 2010-04-22)
56
+* jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits
57
+ (merged to 'next' on 2010-05-04 at d23a180)
58
+ + reflog --expire-unreachable: special case entries in "HEAD" reflog
59
+ + more war on "sleep" in tests
60
+ + Document gc.<pattern>.reflogexpire variables
61
175
-* st/remote-tags-no-tags (2010-04-20) 2 commits
176
- (merged to 'next' on 2010-05-09 at fa9e04e)
177
- + remote add: add a --[no-]tags option
178
- + Honor "tagopt = --tags" configuration option
62
+* jc/status-show-ignored (2010-05-01) 6 commits
63
+ (merged to 'next' on 2010-05-04 at 8b32120)
64
+ + wt-status: fix 'fprintf' compilation warning
65
+ + status: --ignored option shows ignored files
66
+ + wt-status: rename and restructure status-print-untracked
67
+ + wt-status: collect ignored files
68
+ + wt-status: plug memory leak while collecting untracked files
69
+ + wt-status: remove unused workdir_untracked member
70
180
-* cb/assume-unchanged-fix (2010-05-01) 2 commits
181
- - Documentation: git-add does not update files marked "assume unchanged"
182
- - do not overwrite files marked "assume unchanged"
71
+I am negative about conflating the JSON output to the mix at this point.
72
+Let's stabilize "status" with the existing --porcelain/-z option first.
73
74
* jn/fsck-ident (2010-04-24) 1 commit
75
(merged to 'next' on 2010-05-09 at 0d36355)
@@ -206,6 +96,11 @@ interface that may not have human-readable author identifier.
96
(merged to 'next' on 2010-05-09 at 060726a)
97
+ gitweb: Silence 'Variable VAR may be unavailable' warnings
98
99
+* jn/maint-bundle (2010-04-19) 2 commits
100
+ (merged to 'next' on 2010-05-04 at f2086f5)
101
+ + fix "bundle --stdin" segfault
102
+ + t5704 (bundle): add tests for bundle --stdin
103
+
104
* jn/maint-request-pull (2010-05-07) 3 commits
105
+ t5150: protect backslash with backslash in shell
106
+ request-pull: protect against OPTIONS_KEEPDASHDASH from environment
@@ -228,26 +123,57 @@ interface that may not have human-readable author identifier.
123
+ t4201 (shortlog): guard setup with test_expect_success
124
+ Documentation/shortlog: scripted users should not rely on implicit HEAD
125
231
-* wp/pretty-enhancement (2010-05-08) 4 commits
232
- (merged to 'next' on 2010-05-09 at eeaa4dc)
233
- + pretty: initialize new cmt_fmt_map to 0
234
- + pretty: add aliases for pretty formats
235
- + pretty: add infrastructure for commit format aliases
236
- + pretty: make it easier to add new formats
126
+* jn/submodule-basic-test (2010-04-10) 3 commits
127
+ (merged to 'next' on 2010-05-04 at 0bec27a)
128
+ + t7400: clarify submodule update tests
129
+ + t7400: clarify 'submodule add' tests
130
+ + t7400: split setup into multiple tests
131
132
* jn/t7006-fixup (2010-04-14) 1 commit
133
(merged to 'next' on 2010-05-04 at 490ab5d)
134
+ t7006: guard cleanup with test_expect_success
135
242
-(has been in 'next' since 2010-04-22)
243
-
136
* js/maint-receive-pack-symref-alias (2010-04-19) 3 commits
137
(merged to 'next' on 2010-05-04 at 259f4f1)
138
+ t5516-fetch-push.sh: style cleanup
139
+ receive-pack: detect aliased updates which can occur with symrefs
140
+ receive-pack: switch global variable 'commands' to a parameter
141
250
-(has been in 'next' since 2010-04-22)
142
+* mg/advice-statushints (2010-04-22) 2 commits
143
+ (merged to 'next' on 2010-05-09 at 4642509)
144
+ + wt-status: take advice.statusHints seriously
145
+ + t7508: test advice.statusHints
146
+
147
+* np/index-pack-memsave (2010-04-12) 3 commits
148
+ (merged to 'next' on 2010-05-04 at 366b014)
149
+ + index-pack: smarter memory usage when appending objects
150
+ + index-pack: rationalize unpack_entry_data()
151
+ + index-pack: smarter memory usage when resolving deltas
152
+
153
+* np/malloc-threading (2010-04-08) 2 commits
154
+ (merged to 'next' on 2010-05-04 at 1b0567f)
155
+ + Thread-safe xmalloc and xrealloc needs a recursive mutex
156
+ + Make xmalloc and xrealloc thread-safe
157
+ (this branch is used by js/try-to-free-stackable.)
158
+
159
+This fix should eventually go to 'maint' and 'master'.
160
+
161
+* pb/patch-id-plus (2010-04-19) 2 commits
162
+ (merged to 'next' on 2010-05-04 at 59881b8)
163
+ + patch-id: Add support for mbox format
164
+ + patch-id: extract parsing one diff out of generate_id_list
165
+
166
+* rr/doc-submitting (2010-04-19) 1 commit
167
+ (merged to 'next' on 2010-05-04 at 5f040bd)
168
+ + SubmittingPatches: Add new section about what to base work on
169
+
170
+* sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits
171
+ (merged to 'next' on 2010-05-04 at af2d605)
172
+ + describe: Break annotated tag ties by tagger date
173
+ + tag.c: Parse tagger date (if present)
174
+ + tag.c: Refactor parse_tag_buffer to be saner to program
175
+ + tag.h: Remove unused signature field
176
+ + tag.c: Correct indentation
177
178
* sp/maint-dumb-http-pack-reidx (2010-04-19) 12 commits
179
(merged to 'next' on 2010-05-04 at 166443a)
@@ -264,92 +190,241 @@ interface that may not have human-readable author identifier.
190
+ t5550-http-fetch: Use subshell for repository operations
191
+ http.c: Remove bad free of static block
192
267
-(has been in 'next' since 2010-04-22)
193
+* sr/remote-helper-export (2010-04-12) 9 commits
194
+ (merged to 'next' on 2010-05-04 at 519ab16)
195
+ + t5800: testgit helper requires Python support
196
+ + Makefile: Simplify handling of python scripts
197
+ + remote-helpers: add tests for testgit helper
198
+ + remote-helpers: add testgit helper
199
+ + remote-helpers: add support for an export command
200
+ + remote-helpers: allow requesing the path to the .git directory
201
+ + fast-import: always create marks_file directories
202
+ + clone: also configure url for bare clones
203
+ + clone: pass the remote name to remote_get
204
+ (this branch is used by jp/hold-string-list-sanity.)
205
269
-* hg/id-munging (2010-04-06) 2 commits
270
- - convert: Keep foreign $Id$ on checkout.
271
- - convert: Safer handling of $Id$ contraction.
206
+* st/remote-tags-no-tags (2010-04-20) 2 commits
207
+ (merged to 'next' on 2010-05-09 at fa9e04e)
208
+ + remote add: add a --[no-]tags option
209
+ + Honor "tagopt = --tags" configuration option
210
273
-* jn/submodule-basic-test (2010-04-10) 3 commits
274
- (merged to 'next' on 2010-05-04 at 0bec27a)
275
- + t7400: clarify submodule update tests
276
- + t7400: clarify 'submodule add' tests
277
- + t7400: split setup into multiple tests
211
+* tr/word-diff (2010-04-14) 1 commit
212
+ (merged to 'next' on 2010-05-04 at d191b25)
213
+ + diff: add --word-diff option that generalizes --color-words
214
279
-(has been in 'next' since 2010-04-22)
215
+There are gitk patches that go with this series.
216
281
-* np/index-pack-memsave (2010-04-12) 3 commits
282
- (merged to 'next' on 2010-05-04 at 366b014)
283
- + index-pack: smarter memory usage when appending objects
284
- + index-pack: rationalize unpack_entry_data()
285
- + index-pack: smarter memory usage when resolving deltas
217
+--------------------------------------------------
218
+[New Topics]
219
287
-(has been in 'next' since 2010-04-22)
220
+* em/checkout-orphan (2010-05-21) 5 commits
221
+ - [sign-off?] bash completion: add --orphan to 'git checkout'
222
+ - [sign-off?] t3200: test -l with core.logAllRefUpdates options
223
+ - [sign-off?] checkout --orphan: respect -l option always
224
+ - [sign-off?] refs: split log_ref_write logic into log_ref_setup
225
+ - [sign-off?] Documentation: alter checkout --orphan description
226
+
227
+* ec/diff-noprefix-config (2010-05-02) 1 commit
228
+ - diff: add configuration option for disabling diff prefixes.
229
+
230
+* jk/diff-m-doc (2010-05-08) 1 commit
231
+ - docs: clarify meaning of -M for git-log
232
+
233
+* mc/maint-zoneparse (2010-05-17) 1 commit
234
+ - Add "Z" as an alias for the timezone "UTC"
235
+
236
+* mg/notes-dry-run (2010-05-14) 1 commit
237
+ - notes: dry-run and verbose options for prune
238
+
239
+* mg/rev-parse-lrbranches-locals (2010-05-14) 1 commit
240
+ - revlist: Introduce --lrbranches and --locals revision specifiers
241
+ (this branch uses mg/rev-parse-option-sifter-deprecation.)
242
+
243
+* mg/rev-parse-option-sifter-deprecation (2010-05-14) 3 commits
244
+ - t6018: make sure all tested symbolic names are different revs
245
+ - t6018: add tests for rev-list's --branches and --tags
246
+ - rev-parse: deprecate use as an option sifter
247
+ (this branch is used by mg/rev-parse-lrbranches-locals.)
248
+
249
+* ab/cvsserver (2010-05-15) 6 commits
250
+ - git-cvsserver: test for pserver authentication support
251
+ - git-cvsserver: document making a password without htpasswd
252
+ - git-cvsserver: Improved error handling for pserver
253
+ - git-cvsserver: indent & clean up authdb code
254
+ - git-cvsserver: use a password file cvsserver pserver
255
+ - git-cvsserver: authentication support for pserver
256
+
257
+* eb/core-eol (2010-05-19) 4 commits
258
+ - Add "core.eol" config variable
259
+ - Rename the "crlf" attribute "text"
260
+ - Add per-repository eol normalization
261
+ - Add tests for per-repository eol normalization
262
+ (this branch uses fg/autocrlf.)
263
+
264
+* jn/remote-set-branches (2010-05-19) 1 commit
265
+ - Add git remote set-branches
266
+
267
+* js/maint-windows (2009-07-20) 2 commits
268
+ (merged to 'next' on 2010-05-21 at 16abe03)
269
+ + Recent MinGW has a C99 implementation of snprintf functions
270
+ + mingw: use _commit to implement fsync
271
+
272
+* rs/grep-binary (2010-05-22) 8 commits
273
+ - grep: support NUL chars in search strings for -F
274
+ - grep: use REG_STARTEND for all matching if available
275
+ - grep: continue case insensitive fixed string search after NUL chars
276
+ - grep: use memmem() for fixed string search
277
+ - grep: --name-only over binary
278
+ - grep: --count over binary
279
+ - grep: grep: refactor handling of binary mode options
280
+ - grep: add test script for binary file handling
281
+
282
+* ab/submodule-foreach-toplevel (2010-05-21) 1 commit
283
+ - git-submodule foreach: Add $toplevel variable
284
+
285
+* cb/ls-files-cdup (2010-05-22) 1 commit
286
+ - ls-files: allow relative pathspec
287
+
288
+* jk/maint-pull-dry-run-noop (2010-05-25) 1 commit
289
+ - pull: do nothing on --dry-run
290
+
291
+* jk/maint-sha1-file-name-fix (2010-05-22) 1 commit
292
+ - remove over-eager caching in sha1_file_name
293
+
294
+* jk/url-decode (2010-05-23) 2 commits
295
+ - decode file:// and ssh:// URLs
296
+ - make url-related functions reusable
297
289
-* jc/am-3-show-corrupted-patch (2010-04-09) 1 commit
290
- (merged to 'next' on 2010-05-04 at 951f0e6)
291
- + am -3: recover the diagnostic messages for corrupt patches
298
+--------------------------------------------------
299
+[Stalled]
300
293
-(has been in 'next' since 2010-04-22)
301
+* jc/rev-list-ancestry-path (2010-04-20) 1 commit
302
+ - revision: --ancestry-path
303
295
-* jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits
296
- (merged to 'next' on 2010-05-04 at d23a180)
297
- + reflog --expire-unreachable: special case entries in "HEAD" reflog
298
- + more war on "sleep" in tests
299
- + Document gc.<pattern>.reflogexpire variables
304
+Just an illustration patch. merge simplification logic used when
305
+pathspecs are in effect interacts with this rather badly.
306
301
-(has been in 'next' since 2010-04-22)
307
+* js/rebase-origin-x (2010-02-05) 1 commit
308
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
309
303
-* cw/maint-exec-defpath (2010-04-15) 2 commits
304
- (merged to 'next' on 2010-05-04 at 8d1591f)
305
- + autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
306
- + exec_cmd.c: replace hard-coded path list with one from <paths.h>
310
+I retract my objection against the idea of -x; needs polishing before
311
+moving forward.
312
308
-(has been in 'next' since 2010-04-22)
313
+* js/grep-open (2010-05-01) 3 commits
314
+ - grep: do not ignore return value from chdir()
315
+ - grep -O: allow optional argument specifying the pager (or editor)
316
+ - grep: Add the option '--open-files-in-pager'
317
+ (this branch is used by jp/hold-string-list-sanity.)
318
310
-* tr/word-diff (2010-04-14) 1 commit
311
- (merged to 'next' on 2010-05-04 at d191b25)
312
- + diff: add --word-diff option that generalizes --color-words
319
+Probably needs to support --no-index mode as well.
320
314
-(has been in 'next' since 2010-04-22)
315
-There are gitk patches that go with this series.
321
+* jp/hold-string-list-sanity (2010-04-06) 9 commits
322
+ . string_list: Fix argument order for string_list_append
323
+ . Merge branch 'sr/remote-helper-export' into HEAD
324
+ . Merge branch 'js/grep-open' into HEAD
325
+ . Merge branch 'sb/fmt-merge-msg' into HEAD
326
+ . string_list: Fix argument order for string_list_lookup
327
+ . string_list: Fix argument order for string_list_insert_at_index
328
+ . string_list: Fix argument order for string_list_insert
329
+ . string_list: Fix argument order for for_each_string_list
330
+ . string_list: Fix argument order for print_string_list
331
+ (this branch uses js/grep-open.)
332
317
-* sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits
318
- (merged to 'next' on 2010-05-04 at af2d605)
319
- + describe: Break annotated tag ties by tagger date
320
- + tag.c: Parse tagger date (if present)
321
- + tag.c: Refactor parse_tag_buffer to be saner to program
322
- + tag.h: Remove unused signature field
323
- + tag.c: Correct indentation
333
+Building this on top of slushy codebase is not a very promising endeavor.
334
+Good thing to do, but it came at a bad time.
335
325
-(has been in 'next' since 2010-04-22)
336
+--------------------------------------------------
337
+[Cooking]
338
327
-* jc/status-show-ignored (2010-05-01) 6 commits
328
- (merged to 'next' on 2010-05-04 at 8b32120)
329
- + wt-status: fix 'fprintf' compilation warning
330
- + status: --ignored option shows ignored files
331
- + wt-status: rename and restructure status-print-untracked
332
- + wt-status: collect ignored files
333
- + wt-status: plug memory leak while collecting untracked files
334
- + wt-status: remove unused workdir_untracked member
339
+* bw/diff-metainfo-color (2010-05-04) 1 commit
340
+ (merged to 'next' on 2010-05-21 at 3aa552e)
341
+ + diff: fix coloring of extended diff headers
342
336
-(has been in 'next' since 2010-05-01)
343
+* ph/clone-message-reword (2010-05-09) 1 commit
344
+ (merged to 'next' on 2010-05-21 at 1785bd0)
345
+ + clone: reword messages to match the end-user perception
346
338
-I am negative about conflating the JSON output to the mix at this point.
339
-Let's stabilize "status" with the existing --porcelain/-z option first.
347
+* rc/ls-remote-default (2010-05-12) 1 commit
348
+ - ls-remote: print URL when no repo is specified
349
341
-* np/malloc-threading (2010-04-08) 2 commits
342
- (merged to 'next' on 2010-05-04 at 1b0567f)
343
- + Thread-safe xmalloc and xrealloc needs a recursive mutex
344
- + Make xmalloc and xrealloc thread-safe
345
- (this branch is used by js/try-to-free-stackable.)
350
+* fg/autocrlf (2010-05-12) 1 commit
351
+ (merged to 'next' on 2010-05-21 at 5f43b66)
352
+ + autocrlf: Make it work also for un-normalized repositories
353
+ (this branch is used by eb/core-eol.)
354
+
355
+* tc/merge-m-log (2010-05-11) 8 commits
356
+ (merged to 'next' on 2010-05-21 at e889876)
357
+ + merge: --log appends shortlog to message if specified
358
+ + fmt-merge-msg: add function to append shortlog only
359
+ + fmt-merge-msg: refactor merge title formatting
360
+ + fmt-merge-msg: minor refactor of fmt_merge_msg()
361
+ + merge: rename variable
362
+ + merge: update comment
363
+ + t7604-merge-custom-message: show that --log doesn't append to -m
364
+ + t7604-merge-custom-message: shift expected output creation
365
+
366
+* jn/gitweb-fastcgi (2010-05-07) 2 commits
367
+ (merged to 'next' on 2010-05-21 at cb1724f)
368
+ + gitweb: Add support for FastCGI, using CGI::Fast
369
+ + gitweb: Put all per-connection code in run() subroutine
370
+
371
+* jn/make-header-dependency (2010-05-08) 2 commits
372
+ (merged to 'next' on 2010-05-21 at d4ed230)
373
+ + Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
374
+ + Makefile: fix header dependency checker to allow NO_CURL builds
375
+
376
+* js/try-to-free-stackable (2010-05-08) 2 commits
377
+ (merged to 'next' on 2010-05-21 at 4c1afcb)
378
+ + Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
379
+ + Have set_try_to_free_routine return the previous routine
380
+
381
+* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
382
+ - gitweb: Refactor syntax highlighting support
383
+ - gitweb: Syntax highlighting support
384
+
385
+* jn/maint-amend-missing-name (2010-05-02) 1 commit
386
+ (merged to 'next' on 2010-05-09 at 9023332)
387
+ + commit --amend: cope with missing display name
388
+
389
+* rs/diff-no-minimal (2010-05-02) 1 commit
390
+ (merged to 'next' on 2010-05-09 at 6c74aa0)
391
+ + git diff too slow for a file
392
+
393
+* ab/test-cleanup (2010-05-07) 2 commits
394
+ (merged to 'next' on 2010-05-21 at a3cbd67)
395
+ + Turn setup code in t2007-checkout-symlink.sh into a test
396
+ + Move t6000lib.sh to lib-*
397
347
-(has been in 'next' since 2010-04-10)
398
+* jn/notes-doc (2010-05-08) 8 commits
399
+ (merged to 'next' on 2010-05-21 at 1c28059)
400
+ + Documentation/notes: nitpicks
401
+ + Documentation/notes: clean up description of rewriting configuration
402
+ + Documentation/notes: simplify treatment of default display refs
403
+ + Documentation/log: add a CONFIGURATION section
404
+ + Documentation/notes: simplify treatment of default notes ref
405
+ + Documentation/notes: add configuration section
406
+ + Documentation/notes: describe content of notes blobs
407
+ + Documentation/notes: document format of notes trees
408
+
409
+* cb/assume-unchanged-fix (2010-05-01) 2 commits
410
+ (merged to 'next' on 2010-05-21 at bab2342)
411
+ + Documentation: git-add does not update files marked "assume unchanged"
412
+ + do not overwrite files marked "assume unchanged"
413
+
414
+* wp/pretty-enhancement (2010-05-08) 4 commits
415
+ (merged to 'next' on 2010-05-09 at eeaa4dc)
416
+ + pretty: initialize new cmt_fmt_map to 0
417
+ + pretty: add aliases for pretty formats
418
+ + pretty: add infrastructure for commit format aliases
419
+ + pretty: make it easier to add new formats
420
349
-The fix should eventually go to 'maint' and 'master'.
421
+* hg/id-munging (2010-04-06) 2 commits
422
+ - convert: Keep foreign $Id$ on checkout.
423
+ - convert: Safer handling of $Id$ contraction.
424
425
* js/async-thread (2010-03-09) 7 commits
352
- - Enable threaded async procedures whenever pthreads is available
426
+ (merged to 'next' on 2010-05-21 at 9d31940)
427
+ + Enable threaded async procedures whenever pthreads is available
428
(merged to 'next' on 2010-05-04 at 2644e74)
429
+ Dying in an async procedure should only exit the thread, not the process.
430
+ Reimplement async procedures using pthreads
@@ -360,57 +435,7 @@ The fix should eventually go to 'maint' and 'master'.
435
436
(all except for the tip has been in 'next' since 2010-03-20).
437
363
-* sr/remote-helper-export (2010-04-12) 9 commits
364
- (merged to 'next' on 2010-05-04 at 519ab16)
365
- + t5800: testgit helper requires Python support
366
- + Makefile: Simplify handling of python scripts
367
- + remote-helpers: add tests for testgit helper
368
- + remote-helpers: add testgit helper
369
- + remote-helpers: add support for an export command
370
- + remote-helpers: allow requesing the path to the .git directory
371
- + fast-import: always create marks_file directories
372
- + clone: also configure url for bare clones
373
- + clone: pass the remote name to remote_get
374
- (this branch is used by jp/hold-string-list-sanity.)
375
-
376
-(has been in 'next' since 2010-04-12)
377
-
378
-* ld/discovery-limit-to-fs (2010-04-04) 6 commits
438
+* ld/discovery-limit-to-fs (2010-04-04) 1 commit
439
- write-index: check and warn when worktree crosses a filesystem boundary
380
- (merged to 'next' on 2010-05-04 at b7118ad)
381
- + Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
382
- + GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
383
- + Add support for GIT_ONE_FILESYSTEM
384
- + truncate cwd string before printing error message
385
- + config.c: remove static keyword from git_env_bool()
386
-
387
-(all except for the tip has been in 'next' since 2010-04-07)
388
-
389
-The tip one is a bit iffy.
390
-
391
-* em/checkout-orphan (2010-03-21) 1 commit
392
- (merged to 'next' on 2010-05-04 at ddb45fc)
393
- + git checkout: create unparented branch by --orphan
394
-
395
-(has been in 'next' since 2010-03-28)
396
-
397
-Perhaps needs a bit of documentation updates, describing the "going open
398
-source" scenario.
399
-
400
-* ar/config-from-command-line (2010-03-26) 2 commits
401
- (merged to 'next' on 2010-05-04 at 2962717)
402
- + Use strbufs instead of open-coded string manipulation
403
- + Allow passing of configuration parameters in the command line
404
-
405
-(has been in 'next' since 2010-04-07)
406
-
407
-----------------------------------------------------------------
408
-[Dropped]
409
-
410
-* eb/crlf (2010-05-08) 4 commits
411
- . Add per-repository eol normalization
412
- . Pass eol conv mode as an argument instead of using global auto_crlf
413
- . Add tests for per-repository eol normalization
414
- . Add "core.eolStyle" variable to control end-of-line conversion
440
416
-Perhaps will be rerolled after discussion settles.
441
+This one is a bit iffy.