What's cooking (2012/11 #02)
Jeff King committed
Nov 9, 2012 at 14:19 UTC
af2a5277e6526ae9bc7c80398ec9d21bd5e4806c
1 file changed
+301
-285
whats-cooking.txt
+301
-285
@@ -1,17 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #01; Sun, 4)
4
-X-master-at: f07e5551a845b45076bf5c45118e16efa69610c4
5
-X-next-at: 54991f2bb33a966609ff94ac4f8824bf9091ad7d
3
+Subject: What's cooking in git.git (Nov 2012, #02; Fri, 9)
4
+X-master-at: b0b00a3ee43b4813eb85728a482500f6422499fd
5
+X-next-at: 7a4c58c4d7b270e7e6bea673b5515cd0babe9508
6
7
-What's cooking in git.git (Nov 2012, #01; Sun, 4)
7
+What's cooking in git.git (Nov 2012, #02; Fri, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The third batch of topics has graduated to master.
14
+The fourth batch of topics has graduated to master. This should be my
15
+last integration cycle, as Junio will be back to take over before the
16
+next one.
17
18
You can find the changes described here in the integration branches of
19
my repository at:
@@ -24,193 +26,265 @@ updated.
26
--------------------------------------------------
27
[New Topics]
28
27
-* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit
28
- - commit: fixup misplacement of --no-post-rewrite description
29
+* cr/push-force-tag-update (2012-11-09) 5 commits
30
+ - push: update remote tags only with force
31
+ - push: flag updates that require force
32
+ - push: flag updates
33
+ - push: add advice for rejected tag reference
34
+ - push: return reject reasons via a mask
35
30
- Will merge to 'next'.
36
+ Require "-f" for push to update a tag, even if it is a fast-forward.
37
38
+ Needs review.
39
33
-* fc/remote-bzr (2012-11-04) 3 commits
34
- - remote-bzr: add simple tests
35
- - remote-bzr: add support for pushing
36
- - Add new remote-bzr transport helper
40
+ I'm undecided yet on whether the goal is the right thing to do, but it
41
+ does prevent some potential mistakes. I haven't looked closely at the
42
+ implementation itself; review from interested parties would be helpful.
43
+
44
+
45
+* fc/fast-export-fixes (2012-11-08) 14 commits
46
+ - fast-export: don't handle uninteresting refs
47
+ - fast-export: make sure updated refs get updated
48
+ - fast-export: fix comparison in tests
49
+ - fast-export: trivial cleanup
50
+ - remote-testgit: make clear the 'done' feature
51
+ - remote-testgit: report success after an import
52
+ - remote-testgit: exercise more features
53
+ - remote-testgit: cleanup tests
54
+ - remote-testgit: remove irrelevant test
55
+ - remote-testgit: get rid of non-local functionality
56
+ - Add new simplified git-remote-testgit
57
+ - Rename git-remote-testgit to git-remote-testpy
58
+ - remote-testgit: fix direction of marks
59
+ - fast-export: avoid importing blob marks
60
+
61
+ Improvements to fix fast-export bugs, including how refs pointing to
62
+ already-seen commits are handled. An earlier 4-commit version of this
63
+ series looked good to me, but this much-expanded version has not seen
64
+ any comments.
65
38
- New remote helper for bzr.
66
+ Needs review.
67
68
41
-* fc/remote-hg (2012-11-04) 16 commits
42
- - remote-hg: the author email can be null
43
- - remote-hg: add option to not track branches
44
- - remote-hg: add extra author test
45
- - remote-hg: add tests to compare with hg-git
46
- - remote-hg: add bidirectional tests
47
- - test-lib: avoid full path to store test results
48
- - remote-hg: add basic tests
49
- - remote-hg: fake bookmark when there's none
50
- - remote-hg: add compat for hg-git author fixes
51
- - remote-hg: add support for hg-git compat mode
52
- - remote-hg: match hg merge behavior
53
- - remote-hg: make sure the encoding is correct
54
- - remote-hg: add support to push URLs
55
- - remote-hg: add support for remote pushing
56
- - remote-hg: add support for pushing
57
- - Add new remote-hg transport helper
58
-
59
- New remote helper for hg.
69
+* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit
70
+ - push/pull: adjust missing upstream help text to changed interface
71
61
- May want to do one more round of review on the list.
72
+ Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
73
+ suggesting the deprecated "--set-upstream".
74
63
- Most of the discussion so far has been on whether to pursue this versus
64
- what's in msysgit, and not on the specifics of the code. I'd like to
65
- put this in next soon, but it probably makes sense for everybody to
66
- give it a final look-over.
75
+ Will merge to 'next'.
76
77
69
-* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits
70
- - remote-curl: retry failed requests for auth even with gzip
71
- - remote-curl: hoist gzip buffer size to top of post_rpc
78
+* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits
79
+ - link_alt_odb_entries(): take (char *, len) rather than two pointers
80
+ - link_alt_odb_entries(): use string_list_split_in_place()
81
73
- Fixes fetch from servers that ask for auth only during the actual
74
- packing phase. This is not really a recommended configuration, but it
75
- cleans up the code at the same time.
82
+ Cleanups in the alternates code. Fixes a potential bug and makes the
83
+ code much cleaner.
84
85
Will merge to 'next'.
86
87
80
-* js/hp-nonstop (2012-10-30) 1 commit
81
- - fix 'make test' for HP NonStop
88
+* pf/editor-ignore-sigint (2012-11-08) 1 commit
89
+ - launch_editor: ignore SIGINT while the editor has control
90
83
- Will merge to 'next'.
91
+ Avoid confusing cases where the user hits Ctrl-C while in the editor
92
+ session, not realizing git will receive the signal. Since most editors
93
+ will take over the terminal and will block SIGINT, this is not likely
94
+ to confuse anyone.
95
96
+ Comments welcome from people using unusual editors (e.g., a script that
97
+ starts an editor in another window then blocks, waiting for the user to
98
+ finish).
99
86
-* kb/preload-index-more (2012-11-02) 1 commit
87
- - update-index/diff-index: use core.preloadindex to improve performance
100
89
- Use preloadindex in more places, which has a nice speedup on systems
90
- with slow stat calls (and even on Linux).
101
+* pp/gitweb-config-underscore (2012-11-08) 1 commit
102
+ - gitweb: make remote_heads config setting work
103
92
- Will merge to 'next'.
104
+ The key "gitweb.remote_heads" is not legal git config; this maps it to
105
+ "gitweb.remoteheads".
106
+
107
+ Junio raised a good point about the implementation for three-level
108
+ variables.
109
110
+ Expecting a re-roll.
111
95
-* mh/notes-string-list (2012-11-04) 5 commits
96
- - string_list_add_refs_from_colon_sep(): use string_list_split()
97
- - notes: fix handling of colon-separated values
98
- - combine_notes_cat_sort_uniq(): sort and dedup lines all at once
99
- - Initialize sort_uniq_list using named constant
100
- - string_list: add a function string_list_remove_empty_items()
112
102
- Improve the asymptotic performance of the cat_sort_uniq notes merge
103
- strategy.
113
+* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit
114
+ - git p4: RCS expansion should not span newlines
115
+
116
+ I do not have p4 to play with, but looks obviously correct to me.
117
118
Will merge to 'next'.
119
120
108
-* mh/strbuf-split (2012-11-04) 4 commits
109
- - strbuf_split*(): document functions
110
- - strbuf_split*(): rename "delim" parameter to "terminator"
111
- - strbuf_split_buf(): simplify iteration
112
- - strbuf_split_buf(): use ALLOC_GROW()
121
+* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit
122
+ - gitweb.perl: fix %highlight_ext mappings
123
114
- Cleanups and documentation for strbuf_split.
124
+ Fixes a clever misuse of perl's list interpretation.
125
126
Will merge to 'next'.
127
128
119
-* mm/maint-doc-commit-edit (2012-11-02) 1 commit
120
- - Document 'git commit --no-edit' explicitly
129
+* rr/submodule-diff-config (2012-11-08) 3 commits
130
+ - submodule: display summary header in bold
131
+ - diff: introduce diff.submodule configuration variable
132
+ - Documentation: move diff.wordRegex from config.txt to diff-config.txt
133
122
- Will merge to 'next'.
134
+ Lets "git diff --submodule=log" become the default via configuration.
135
+
136
+ Seems like a good direction, though I had a few comments.
137
+
138
+ Expecting a re-roll.
139
140
141
--------------------------------------------------
142
[Graduated to "master"]
143
128
-* gb/maint-doc-svn-log-window-size (2012-10-26) 1 commit
129
- (merged to 'next' on 2012-10-29 at ee50b22)
130
- + Document git-svn fetch --log-window-size parameter
144
+* fc/completion-send-email-with-format-patch (2012-10-16) 1 commit
145
+ (merged to 'next' on 2012-11-04 at 0a6366e)
146
+ + completion: add format-patch options to send-email
147
132
- Will merge to 'master' in the third batch.
148
+ Will merge to 'master' in the fourth batch.
149
150
135
-* km/maint-doc-git-reset (2012-10-29) 1 commit
136
- (merged to 'next' on 2012-10-29 at cdb4e8f)
137
- + doc: git-reset: make "<mode>" optional
151
+* js/format-2047 (2012-10-18) 7 commits
152
+ (merged to 'next' on 2012-10-25 at 76d91fe)
153
+ + format-patch tests: check quoting/encoding in To: and Cc: headers
154
+ + format-patch: fix rfc2047 address encoding with respect to rfc822 specials
155
+ + format-patch: make rfc2047 encoding more strict
156
+ + format-patch: introduce helper function last_line_length()
157
+ + format-patch: do not wrap rfc2047 encoded headers too late
158
+ + format-patch: do not wrap non-rfc2047 headers too early
159
+ + utf8: fix off-by-one wrapping of text
160
139
- Will merge to 'master' in the third batch.
161
+ Fixes many rfc2047 quoting issues in the output from format-patch.
162
163
+ Will merge to 'master' in the fourth batch.
164
142
-* mm/maint-doc-remote-tracking (2012-10-25) 1 commit
143
- (merged to 'next' on 2012-10-25 at 80f1592)
144
- + Documentation: remote tracking branch -> remote-tracking branch
165
146
- We long ago hyphenated "remote-tracking branch"; this
147
- catches some new instances added since then.
166
+* km/send-email-compose-encoding (2012-10-25) 5 commits
167
+ (merged to 'next' on 2012-10-29 at d7d2bb4)
168
+ + git-send-email: add rfc2047 quoting for "=?"
169
+ + git-send-email: introduce quote_subject()
170
+ + git-send-email: skip RFC2047 quoting for ASCII subjects
171
+ + git-send-email: use compose-encoding for Subject
172
+ (merged to 'next' on 2012-10-25 at 5447367)
173
+ + git-send-email: introduce compose-encoding
174
+
175
+ "git send-email --compose" can let the user create a non-ascii
176
+ cover letter message, but there was not a way to mark it with
177
+ appropriate content type before sending it out.
178
149
- Will merge to 'master' in the third batch.
179
+ Further updates fix subject quoting.
180
+
181
+ Will merge to 'master' in the fourth batch.
182
183
152
-* ph/pull-rebase-detached (2012-10-25) 1 commit
153
- (merged to 'next' on 2012-10-25 at 73d9d14)
154
- + git-pull: Avoid merge-base on detached head
184
+* mh/maint-parse-dirstat-fix (2012-10-29) 1 commit
185
+ (merged to 'next' on 2012-11-04 at 852d609)
186
+ + parse_dirstat_params(): use string_list to split comma-separated string
187
+
188
+ Cleans up some code and avoids a potential bug.
189
+
190
+ Will merge to 'master' in the fourth batch.
191
+
192
+
193
+* mo/cvs-server-cleanup (2012-10-26) 11 commits
194
+ (merged to 'next' on 2012-10-29 at 4e70622)
195
+ + Use character class for sed expression instead of \s
196
+ (merged to 'next' on 2012-10-25 at c70881d)
197
+ + cvsserver status: provide real sticky info
198
+ + cvsserver: cvs add: do not expand directory arguments
199
+ + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
200
+ + cvsserver: split up long lines in req_{status,diff,log}
201
+ + cvsserver: clean up client request handler map comments
202
+ + cvsserver: remove unused functions _headrev and gethistory
203
+ + cvsserver update: comment about how we shouldn't remove a user-modified file
204
+ + cvsserver: add comments about database schema/usage
205
+ + cvsserver: removed unused sha1Or-k mode from kopts_from_path
206
+ + cvsserver t9400: add basic 'cvs log' test
207
+ (this branch is tangled with mo/cvs-server-updates.)
208
+
209
+ Cleanups to prepare for mo/cvs-server-updates.
210
156
- Avoids spewing error messages when using "pull --rebase" on a
157
- detached HEAD.
211
+ Will merge to 'master' in the fourth batch.
212
159
- Will merge to 'master' in the third batch.
213
214
+* nd/attr-match-optim-more (2012-10-15) 7 commits
215
+ (merged to 'next' on 2012-10-25 at 09f70ce)
216
+ + attr: more matching optimizations from .gitignore
217
+ + gitignore: make pattern parsing code a separate function
218
+ + exclude: split pathname matching code into a separate function
219
+ + exclude: fix a bug in prefix compare optimization
220
+ + exclude: split basename matching code into a separate function
221
+ + exclude: stricten a length check in EXC_FLAG_ENDSWITH case
222
+ + Merge commit 'f9f6e2c' into nd/attr-match-optim-more
223
+ (this branch is used by as/check-ignore and nd/wildmatch.)
224
162
-* po/maint-refs-replace-docs (2012-10-25) 1 commit
163
- (merged to 'next' on 2012-10-25 at 3874c9d)
164
- + Doc repository-layout: Show refs/replace
225
+ Start laying the foundation to build the "wildmatch" after we can
226
+ agree on its desired semantics.
227
166
- The refs/replace hierarchy was not mentioned in the
167
- repository-layout docs.
228
+ Will merge to 'master' in the fourth batch.
229
169
- Will merge to 'master' in the third batch.
230
231
+* nd/builtin-to-libgit (2012-10-29) 7 commits
232
+ (merged to 'next' on 2012-11-04 at 06cbf9b)
233
+ + fetch-pack: move core code to libgit.a
234
+ + fetch-pack: remove global (static) configuration variable "args"
235
+ + send-pack: move core code to libgit.a
236
+ + Move setup_diff_pager to libgit.a
237
+ + Move print_commit_list to libgit.a
238
+ + Move estimate_bisect_steps to libgit.a
239
+ + Move try_merge_command and checkout_fast_forward to libgit.a
240
172
-* pp/maint-doc-pager-config (2012-10-29) 1 commit
173
- (merged to 'next' on 2012-10-29 at 434fbd0)
174
- + Documentation: improve the example of overriding LESS via core.pager
241
+ Code cleanups so that libgit.a does not depend on anything in the
242
+ builtin/ directory.
243
176
- Will merge to 'master' in the third batch.
244
+ Some of the code movement is pretty big, but there doesn't seem to be
245
+ any conflicts with topics in flight.
246
247
+ Will merge to 'master' in the fourth batch.
248
179
-* rf/maint-mailmap-off-by-one (2012-10-28) 1 commit
180
- (merged to 'next' on 2012-10-29 at 8c2214b)
181
- + mailmap: avoid out-of-bounds memory access
249
183
- Will merge to 'master' in the third batch.
250
+* nd/tree-walk-enum-cleanup (2012-10-19) 1 commit
251
+ (merged to 'next' on 2012-11-04 at 8ccdf98)
252
+ + tree-walk: use enum interesting instead of integer
253
254
+ Will merge to 'master' in the fourth batch.
255
186
-* sl/maint-configure-messages (2012-10-25) 1 commit
187
- (merged to 'next' on 2012-10-25 at e1d7ecd)
188
- + configure: fix some output message
256
190
- Minor message fixes for the configure script.
257
+* ph/maint-submodule-status-fix (2012-10-29) 2 commits
258
+ (merged to 'next' on 2012-11-04 at d700e02)
259
+ + submodule status: remove unused orig_* variables
260
+ + t7407: Fix recursive submodule test
261
192
- Will merge to 'master' in the third batch.
262
+ Cleans up some leftover bits from an earlier submodule change.
263
264
+ Will merge to 'master' in the fourth batch.
265
195
-* sz/maint-submodule-reference-arg (2012-10-26) 1 commit
196
- (merged to 'next' on 2012-10-29 at 1aab03c)
197
- + submodule add: fix handling of --reference=<repo> option
266
199
- Will merge to 'master' in the third batch.
267
+* rs/lock-correct-ref-during-delete (2012-10-16) 1 commit
268
+ (merged to 'next' on 2012-10-25 at 9341eea)
269
+ + refs: lock symref that is to be deleted, not its target
270
271
+ When "update-ref -d --no-deref SYM" tried to delete a symbolic ref
272
+ SYM, it incorrectly locked the underlying reference pointed by SYM,
273
+ not the symbolic ref itself.
274
202
-* tb/maint-t9200-case-insensitive (2012-10-28) 1 commit
203
- (merged to 'next' on 2012-10-29 at 62af90c)
204
- + Fix t9200 on case insensitive file systems
275
+ Will merge to 'master' in the fourth batch.
276
206
- Will merge to 'master' in the third batch.
277
278
+* sz/maint-curl-multi-timeout (2012-10-19) 1 commit
279
+ (merged to 'next' on 2012-11-04 at f696dd8)
280
+ + Fix potential hang in https handshake
281
209
-* tj/maint-doc-commit-sign (2012-10-29) 1 commit
210
- (merged to 'next' on 2012-10-29 at 44c61a0)
211
- + Add -S, --gpg-sign option to manpage of "git commit"
282
+ Sometimes curl_multi_timeout() function suggested a wrong timeout
283
+ value when there is no file descriptors to wait on and the http
284
+ transport ended up sleeping for minutes in select(2) system call.
285
+ Detect this and reduce the wait timeout in such a case.
286
213
- Will merge to 'master' in the third batch.
287
+ Will merge to 'master' in the fourth batch.
288
289
--------------------------------------------------
290
[Stalled]
@@ -322,13 +396,11 @@ updated.
396
often attempt to use 'origin'. This can now be customized via a
397
configuration variable.
398
325
- Expecting a reroll.
399
+ Expecting a re-roll.
400
401
"The first remote becomes the default" bit is better done as a
402
separate step.
403
330
---------------------------------------------------
331
-[Cooking]
404
405
* mh/ceiling (2012-10-29) 8 commits
406
- string_list_longest_prefix(): remove function
@@ -344,31 +416,11 @@ updated.
416
pathname we obtain from getcwd(), leading the GIT_DIR discovery
417
logic to escape the ceilings the user thought to have specified.
418
347
- Need to look at v4 which made it to the list.
348
-
349
-
350
-* mo/cvs-server-cleanup (2012-10-26) 11 commits
351
- (merged to 'next' on 2012-10-29 at 4e70622)
352
- + Use character class for sed expression instead of \s
353
- (merged to 'next' on 2012-10-25 at c70881d)
354
- + cvsserver status: provide real sticky info
355
- + cvsserver: cvs add: do not expand directory arguments
356
- + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
357
- + cvsserver: split up long lines in req_{status,diff,log}
358
- + cvsserver: clean up client request handler map comments
359
- + cvsserver: remove unused functions _headrev and gethistory
360
- + cvsserver update: comment about how we shouldn't remove a user-modified file
361
- + cvsserver: add comments about database schema/usage
362
- + cvsserver: removed unused sha1Or-k mode from kopts_from_path
363
- + cvsserver t9400: add basic 'cvs log' test
364
- (this branch is tangled with mo/cvs-server-updates.)
365
-
366
- Cleanups to prepare for mo/cvs-server-updates.
367
-
368
- Will merge to 'master' in the fourth batch.
419
420
+--------------------------------------------------
421
+[Cooking]
422
371
-* mo/cvs-server-updates (2012-10-16) 20 commits
423
+* mo/cvs-server-updates (2012-10-16) 10 commits
424
- cvsserver Documentation: new cvs ... -r support
425
- cvsserver: add t9402 to test branch and tag refs
426
- cvsserver: support -r and sticky tags for most operations
@@ -379,18 +431,6 @@ updated.
431
- cvsserver: define a tag name character escape mechanism
432
- cvsserver: cleanup extra slashes in filename arguments
433
- cvsserver: factor out git-log parsing logic
382
- (merged to 'next' on 2012-10-25 at c70881d)
383
- + cvsserver status: provide real sticky info
384
- + cvsserver: cvs add: do not expand directory arguments
385
- + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
386
- + cvsserver: split up long lines in req_{status,diff,log}
387
- + cvsserver: clean up client request handler map comments
388
- + cvsserver: remove unused functions _headrev and gethistory
389
- + cvsserver update: comment about how we shouldn't remove a user-modified file
390
- + cvsserver: add comments about database schema/usage
391
- + cvsserver: removed unused sha1Or-k mode from kopts_from_path
392
- + cvsserver t9400: add basic 'cvs log' test
393
- (this branch is tangled with mo/cvs-server-cleanup.)
434
435
Needs review by folks interested in cvsserver.
436
@@ -403,10 +443,7 @@ updated.
443
- Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
444
- Split over-long synopsis in git-fetch-pack.txt into several lines
445
406
- Misapplication of a patch fixed; the ones near the tip needs to
407
- update the links to point at the html files, though.
408
-
409
- Needs follow-up on Junio's comment above.
446
+ Will merge to 'next'.
447
448
449
* lt/diff-stat-show-0-lines (2012-10-17) 1 commit
@@ -436,19 +473,7 @@ updated.
473
Now that Philip has submitted some documentation updates, this is
474
looking more ready.
475
439
- Will merge to master in the fifth batch.
440
-
441
-
442
-* sz/maint-curl-multi-timeout (2012-10-19) 1 commit
443
- (merged to 'next' on 2012-11-04 at f696dd8)
444
- + Fix potential hang in https handshake
445
-
446
- Sometimes curl_multi_timeout() function suggested a wrong timeout
447
- value when there is no file descriptors to wait on and the http
448
- transport ended up sleeping for minutes in select(2) system call.
449
- Detect this and reduce the wait timeout in such a case.
450
-
451
- Will merge to master in the fourth batch.
476
+ Will merge to 'master' in the fifth batch.
477
478
479
* jc/same-encoding (2012-11-04) 1 commit
@@ -462,14 +487,7 @@ updated.
487
equated them in some but not all codepaths. Introduce a new helper
488
function to make these codepaths consistent.
489
465
- will merge to master in the fourth batch.
466
-
467
-
468
-* nd/tree-walk-enum-cleanup (2012-10-19) 1 commit
469
- (merged to 'next' on 2012-11-04 at 8ccdf98)
470
- + tree-walk: use enum interesting instead of integer
471
-
472
- Will merge to master in the fourth batch.
490
+ Will merge to 'master' in the fifth batch.
491
492
493
* cr/cvsimport-local-zone (2012-11-04) 2 commits
@@ -480,14 +498,7 @@ updated.
498
Allows "cvsimport" to read per-author timezone from the author info
499
file.
500
483
- Will merge to master in the fifth batch.
484
-
485
-
486
-* fc/completion-send-email-with-format-patch (2012-10-16) 1 commit
487
- (merged to 'next' on 2012-11-04 at 0a6366e)
488
- + completion: add format-patch options to send-email
489
-
490
- Will merge to master in the fourth batch.
501
+ Will merge to 'master' in the fifth batch.
502
503
504
* fc/zsh-completion (2012-10-29) 3 commits
@@ -495,7 +506,9 @@ updated.
506
- completion: add new __gitcompadd helper
507
- completion: get rid of empty COMPREPLY assignments
508
498
- Needs comments from completion folks.
509
+ There were some comments on this, but I wasn't clear on the outcome.
510
+
511
+ Need to take a closer look.
512
513
514
* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
@@ -523,18 +536,8 @@ updated.
536
they turn out to be directories?
537
538
526
-* rs/lock-correct-ref-during-delete (2012-10-16) 1 commit
527
- (merged to 'next' on 2012-10-25 at 9341eea)
528
- + refs: lock symref that is to be deleted, not its target
529
-
530
- When "update-ref -d --no-deref SYM" tried to delete a symbolic ref
531
- SYM, it incorrectly locked the underlying reference pointed by SYM,
532
- not the symbolic ref itself.
533
-
534
- Will merge to 'master' in the fourth batch.
535
-
536
-
537
-* as/check-ignore (2012-10-29) 13 commits
539
+* as/check-ignore (2012-11-08) 14 commits
540
+ - t0007: fix tests on Windows
541
- Documentation/check-ignore: we show the deciding match, not the first
542
- Add git-check-ignore sub-command
543
- dir.c: provide free_directory() for reclaiming dir_struct memory
@@ -548,44 +551,10 @@ updated.
551
- dir.c: rename excluded_from_list() to is_excluded_from_list()
552
- dir.c: rename path_excluded() to is_path_excluded()
553
- dir.c: rename cryptic 'which' variable to more consistent name
551
- (this branch uses nd/attr-match-optim-more; is tangled with nd/wildmatch.)
554
555
Duy helped to reroll this.
556
555
- Expecting another re-roll.
556
-
557
-
558
-* js/format-2047 (2012-10-18) 7 commits
559
- (merged to 'next' on 2012-10-25 at 76d91fe)
560
- + format-patch tests: check quoting/encoding in To: and Cc: headers
561
- + format-patch: fix rfc2047 address encoding with respect to rfc822 specials
562
- + format-patch: make rfc2047 encoding more strict
563
- + format-patch: introduce helper function last_line_length()
564
- + format-patch: do not wrap rfc2047 encoded headers too late
565
- + format-patch: do not wrap non-rfc2047 headers too early
566
- + utf8: fix off-by-one wrapping of text
567
-
568
- Fixes many rfc2047 quoting issues in the output from format-patch.
569
-
570
- Will merge to 'master' in the fourth batch.
571
-
572
-
573
-* km/send-email-compose-encoding (2012-10-25) 5 commits
574
- (merged to 'next' on 2012-10-29 at d7d2bb4)
575
- + git-send-email: add rfc2047 quoting for "=?"
576
- + git-send-email: introduce quote_subject()
577
- + git-send-email: skip RFC2047 quoting for ASCII subjects
578
- + git-send-email: use compose-encoding for Subject
579
- (merged to 'next' on 2012-10-25 at 5447367)
580
- + git-send-email: introduce compose-encoding
581
-
582
- "git send-email --compose" can let the user create a non-ascii
583
- cover letter message, but there was not a way to mark it with
584
- appropriate content type before sending it out.
585
-
586
- Further updates fix subject quoting.
587
-
588
- Will merge to 'master' in the fourth batch.
557
+ Expecting a re-roll.
558
559
560
* so/prompt-command (2012-10-17) 4 commits
@@ -599,7 +568,7 @@ updated.
568
instead of being used for command substitution in $PS1, to embed
569
color escape sequences in its output.
570
602
- Will 'cook' in next.
571
+ Will cook in 'next'.
572
573
574
* aw/rebase-am-failure-detection (2012-10-11) 1 commit
@@ -625,7 +594,6 @@ updated.
594
+ Import wildmatch from rsync
595
+ ctype: support iscntrl, ispunct, isxdigit and isprint
596
+ ctype: make sane_ctype[] const array
628
- (this branch uses nd/attr-match-optim-more; is tangled with as/check-ignore.)
597
598
Allows pathname patterns in .gitignore and .gitattributes files
599
with double-asterisks "foo/**/bar" to match any number of directory
@@ -652,23 +620,6 @@ updated.
620
"parents", etc.
621
622
655
-* nd/attr-match-optim-more (2012-10-15) 7 commits
656
- (merged to 'next' on 2012-10-25 at 09f70ce)
657
- + attr: more matching optimizations from .gitignore
658
- + gitignore: make pattern parsing code a separate function
659
- + exclude: split pathname matching code into a separate function
660
- + exclude: fix a bug in prefix compare optimization
661
- + exclude: split basename matching code into a separate function
662
- + exclude: stricten a length check in EXC_FLAG_ENDSWITH case
663
- + Merge commit 'f9f6e2c' into nd/attr-match-optim-more
664
- (this branch is used by as/check-ignore and nd/wildmatch.)
665
-
666
- Start laying the foundation to build the "wildmatch" after we can
667
- agree on its desired semantics.
668
-
669
- Will merge to 'master' in the fourth batch.
670
-
671
-
623
* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits
624
. pretty: support %>> that steal trailing spaces
625
. pretty: support truncating in %>, %< and %><
@@ -690,7 +641,7 @@ updated.
641
642
This was split out from discarded jc/maint-push-refs-all topic.
643
693
- Will merge to master in the fifth batch.
644
+ Will merge to 'master' in the fifth batch.
645
646
647
* jh/symbolic-ref-d (2012-10-21) 1 commit
@@ -702,7 +653,7 @@ updated.
653
It is already possible to remove a symbolic ref with "update-ref -d
654
--no-deref", but it may be a good addition for completeness.
655
705
- Will merge to master in the fifth batch.
656
+ Will merge to 'master' in the fifth batch.
657
658
659
* jh/update-ref-d-through-symref (2012-10-21) 2 commits
@@ -740,7 +691,7 @@ updated.
691
692
Adds "--recursive" option to submodule sync.
693
743
- Will merge to master in the fifth batch.
694
+ Will merge to 'master' in the fifth batch.
695
696
697
* fc/completion-test-simplification (2012-10-29) 2 commits
@@ -780,41 +731,106 @@ updated.
731
Waiting for a sanity check and review from Junio.
732
733
783
-* mh/maint-parse-dirstat-fix (2012-10-29) 1 commit
784
- (merged to 'next' on 2012-11-04 at 852d609)
785
- + parse_dirstat_params(): use string_list to split comma-separated string
734
+* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit
735
+ (merged to 'next' on 2012-11-09 at 117a91e)
736
+ + commit: fixup misplacement of --no-post-rewrite description
737
787
- Cleans up some code and avoids a potential bug.
738
+ Will merge to 'master' in the fifth batch.
739
789
- Will merge master in the fourth batch.
740
741
+* fc/remote-bzr (2012-11-08) 5 commits
742
+ - remote-bzr: update working tree
743
+ - remote-bzr: add support for remote repositories
744
+ - remote-bzr: add support for pushing
745
+ - remote-bzr: add simple tests
746
+ - Add new remote-bzr transport helper
747
792
-* nd/builtin-to-libgit (2012-10-29) 7 commits
793
- (merged to 'next' on 2012-11-04 at 06cbf9b)
794
- + fetch-pack: move core code to libgit.a
795
- + fetch-pack: remove global (static) configuration variable "args"
796
- + send-pack: move core code to libgit.a
797
- + Move setup_diff_pager to libgit.a
798
- + Move print_commit_list to libgit.a
799
- + Move estimate_bisect_steps to libgit.a
800
- + Move try_merge_command and checkout_fast_forward to libgit.a
748
+ New remote helper for bzr.
749
802
- Code cleanups so that libgit.a does not depend on anything in the
803
- builtin/ directory.
750
+ Will merge to 'next'.
751
805
- Some of the code movement is pretty big, but there doesn't seem to be
806
- any conflicts with topics in flight.
752
808
- Will merge to master in the fourth batch.
753
+* fc/remote-hg (2012-11-04) 16 commits
754
+ - remote-hg: the author email can be null
755
+ - remote-hg: add option to not track branches
756
+ - remote-hg: add extra author test
757
+ - remote-hg: add tests to compare with hg-git
758
+ - remote-hg: add bidirectional tests
759
+ - test-lib: avoid full path to store test results
760
+ - remote-hg: add basic tests
761
+ - remote-hg: fake bookmark when there's none
762
+ - remote-hg: add compat for hg-git author fixes
763
+ - remote-hg: add support for hg-git compat mode
764
+ - remote-hg: match hg merge behavior
765
+ - remote-hg: make sure the encoding is correct
766
+ - remote-hg: add support to push URLs
767
+ - remote-hg: add support for remote pushing
768
+ - remote-hg: add support for pushing
769
+ - Add new remote-hg transport helper
770
771
+ New remote helper for hg.
772
811
-* ph/maint-submodule-status-fix (2012-10-29) 2 commits
812
- (merged to 'next' on 2012-11-04 at d700e02)
813
- + submodule status: remove unused orig_* variables
814
- + t7407: Fix recursive submodule test
773
+ Will merge to 'next'.
774
+
775
+
776
+* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits
777
+ (merged to 'next' on 2012-11-09 at af69926)
778
+ + remote-curl: retry failed requests for auth even with gzip
779
+ + remote-curl: hoist gzip buffer size to top of post_rpc
780
+
781
+ Fixes fetch from servers that ask for auth only during the actual
782
+ packing phase. This is not really a recommended configuration, but it
783
+ cleans up the code at the same time.
784
+
785
+ Will merge to 'master' in the sixth batch.
786
+
787
+
788
+* js/hp-nonstop (2012-10-30) 1 commit
789
+ (merged to 'next' on 2012-11-09 at fe58205)
790
+ + fix 'make test' for HP NonStop
791
+
792
+ Will merge to 'master' in the fifth batch.
793
816
- Cleans up some leftover bits from an earlier submodule change.
794
818
- Will merge to master in the fourth batch.
795
+* kb/preload-index-more (2012-11-02) 1 commit
796
+ (merged to 'next' on 2012-11-09 at a750ebd)
797
+ + update-index/diff-index: use core.preloadindex to improve performance
798
+
799
+ Use preloadindex in more places, which has a nice speedup on systems
800
+ with slow stat calls (and even on Linux).
801
+
802
+ Will merge to 'master' in the sixth batch.
803
+
804
+
805
+* mh/notes-string-list (2012-11-08) 5 commits
806
+ (merged to 'next' on 2012-11-09 at 7a4c58c)
807
+ + string_list_add_refs_from_colon_sep(): use string_list_split()
808
+ + notes: fix handling of colon-separated values
809
+ + combine_notes_cat_sort_uniq(): sort and dedup lines all at once
810
+ + Initialize sort_uniq_list using named constant
811
+ + string_list: add a function string_list_remove_empty_items()
812
+
813
+ Improve the asymptotic performance of the cat_sort_uniq notes merge
814
+ strategy.
815
+
816
+ Will merge to 'master' in the fifth batch.
817
818
819
+* mh/strbuf-split (2012-11-04) 4 commits
820
+ (merged to 'next' on 2012-11-09 at fa984b1)
821
+ + strbuf_split*(): document functions
822
+ + strbuf_split*(): rename "delim" parameter to "terminator"
823
+ + strbuf_split_buf(): simplify iteration
824
+ + strbuf_split_buf(): use ALLOC_GROW()
825
+
826
+ Cleanups and documentation for strbuf_split.
827
+
828
+ Will merge to 'master' in the fifth batch.
829
+
830
+
831
+* mm/maint-doc-commit-edit (2012-11-02) 1 commit
832
+ (merged to 'next' on 2012-11-09 at 8dab7f5)
833
+ + Document 'git commit --no-edit' explicitly
834
+
835
+ Will merge to 'master' in the fifth batch.
836
+