What's cooking (2012/11 #05)
Junio C Hamano committed
Nov 16, 2012 at 15:33 UTC
54e860aa5c0818e2e93453114037e63d9f858b77
1 file changed
+189
-168
whats-cooking.txt
+189
-168
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #04; Wed, 14)
4
-X-master-at: b0b00a3ee43b4813eb85728a482500f6422499fd
5
-X-next-at: 7a667bc8d11125a8f74ecadedd74c71c91f5c0d4
3
+Subject: What's cooking in git.git (Nov 2012, #05; Fri, 16)
4
+X-master-at: 5a90748f2856f587a948148a9b6fad50a43df57c
5
+X-next-at: e7909caa037a3472e4c34fa47f04758920bd6c91
6
7
-What's cooking in git.git (Nov 2012, #04; Wed, 14)
7
+What's cooking in git.git (Nov 2012, #05; Fri, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,25 +12,187 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'.
13
14
Big thanks go to Jeff who curated topics in flight while I was on
15
-vacation. I merged a couple of topics to 'next', and will start
16
-merging what he marked for 'master' after giving them a final look
17
-by the end of the week.
15
+vacation. I merged a couple of topics to 'next', and made the fifth
16
+batch of topics graduate to 'master'. Over the weekend, I'll start
17
+merging maintenance topics to 'maint' in preparation for cutting
18
+1.8.1, hopefully sometime late next week.
19
20
You can find the changes described here in the integration branches of the
21
repositories listed at
22
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
+--------------------------------------------------
26
+[Graduated to "master"]
27
+
28
+* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit
29
+ (merged to 'next' on 2012-11-09 at 117a91e)
30
+ + commit: fixup misplacement of --no-post-rewrite description
31
+
32
+
33
+* cr/cvsimport-local-zone (2012-11-04) 2 commits
34
+ (merged to 'next' on 2012-11-04 at 292f0b4)
35
+ + cvsimport: work around perl tzset issue
36
+ + git-cvsimport: allow author-specific timezones
37
+
38
+ Allows "cvsimport" to read per-author timezone from the author info
39
+ file.
40
+
41
+
42
+* jc/maint-fetch-tighten-refname-check (2012-10-19) 1 commit
43
+ (merged to 'next' on 2012-11-04 at eda85ef)
44
+ + get_fetch_map(): tighten checks on dest refs
45
+
46
+ This was split out from discarded jc/maint-push-refs-all topic.
47
+
48
+
49
+* jc/prettier-pretty-note (2012-11-13) 12 commits
50
+ (merged to 'next' on 2012-11-14 at 7230f26)
51
+ + format-patch: add a blank line between notes and diffstat
52
+ (merged to 'next' on 2012-11-04 at 40e3e48)
53
+ + Doc User-Manual: Patch cover letter, three dashes, and --notes
54
+ + Doc format-patch: clarify --notes use case
55
+ + Doc notes: Include the format-patch --notes option
56
+ + Doc SubmittingPatches: Mention --notes option after "cover letter"
57
+ + Documentation: decribe format-patch --notes
58
+ + format-patch --notes: show notes after three-dashes
59
+ + format-patch: append --signature after notes
60
+ + pretty_print_commit(): do not append notes message
61
+ + pretty: prepare notes message at a centralized place
62
+ + format_note(): simplify API
63
+ + pretty: remove reencode_commit_message()
64
+
65
+ Emit the notes attached to the commit in "format-patch --notes"
66
+ output after three-dashes.
67
+
68
+
69
+* jc/same-encoding (2012-11-04) 1 commit
70
+ (merged to 'next' on 2012-11-04 at 54991f2)
71
+ + reencode_string(): introduce and use same_encoding()
72
+
73
+ Various codepaths checked if two encoding names are the same using
74
+ ad-hoc code and some of them ended up asking iconv() to convert
75
+ between "utf8" and "UTF-8". The former is not a valid way to spell
76
+ the encoding name, but often people use it by mistake, and we
77
+ equated them in some but not all codepaths. Introduce a new helper
78
+ function to make these codepaths consistent.
79
+
80
+
81
+* jh/symbolic-ref-d (2012-10-21) 1 commit
82
+ (merged to 'next' on 2012-11-04 at b0762f5)
83
+ + git symbolic-ref --delete $symref
84
+
85
+ Add "symbolic-ref -d SYM" to delete a symbolic ref SYM.
86
+
87
+ It is already possible to remove a symbolic ref with "update-ref -d
88
+ --no-deref", but it may be a good addition for completeness.
89
+
90
+
91
+* jk/maint-diff-grep-textconv (2012-10-28) 1 commit
92
+ (merged to 'next' on 2012-11-04 at 790337b)
93
+ + diff_grep: use textconv buffers for add/deleted files
94
+ (this branch is used by jk/pickaxe-textconv.)
95
+
96
+ Fixes inconsistent use of textconv with "git log -G".
97
+
98
+
99
+* js/hp-nonstop (2012-10-30) 1 commit
100
+ (merged to 'next' on 2012-11-09 at fe58205)
101
+ + fix 'make test' for HP NonStop
102
+
103
+
104
+* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit
105
+ (merged to 'next' on 2012-11-13 at bd74252)
106
+ + push/pull: adjust missing upstream help text to changed interface
107
+
108
+ Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
109
+ suggesting the deprecated "--set-upstream".
110
+
111
+
112
+* mh/notes-string-list (2012-11-08) 5 commits
113
+ (merged to 'next' on 2012-11-09 at 7a4c58c)
114
+ + string_list_add_refs_from_colon_sep(): use string_list_split()
115
+ + notes: fix handling of colon-separated values
116
+ + combine_notes_cat_sort_uniq(): sort and dedup lines all at once
117
+ + Initialize sort_uniq_list using named constant
118
+ + string_list: add a function string_list_remove_empty_items()
119
+
120
+ Improve the asymptotic performance of the cat_sort_uniq notes merge
121
+ strategy.
122
+
123
+
124
+* mh/strbuf-split (2012-11-04) 4 commits
125
+ (merged to 'next' on 2012-11-09 at fa984b1)
126
+ + strbuf_split*(): document functions
127
+ + strbuf_split*(): rename "delim" parameter to "terminator"
128
+ + strbuf_split_buf(): simplify iteration
129
+ + strbuf_split_buf(): use ALLOC_GROW()
130
+
131
+ Cleanups and documentation for strbuf_split.
132
+
133
+
134
+* mm/maint-doc-commit-edit (2012-11-02) 1 commit
135
+ (merged to 'next' on 2012-11-09 at 8dab7f5)
136
+ + Document 'git commit --no-edit' explicitly
137
+
138
+
139
+* ph/submodule-sync-recursive (2012-10-29) 2 commits
140
+ (merged to 'next' on 2012-11-04 at a000f78)
141
+ + Add tests for submodule sync --recursive
142
+ + Teach --recursive to submodule sync
143
+
144
+ Adds "--recursive" option to submodule sync.
145
+
146
--------------------------------------------------
147
[New Topics]
148
149
* jl/submodule-rm (2012-11-14) 1 commit
150
- docs: move submodule section
151
152
+ Documentation correction for d21240f (Merge branch
153
+ 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked.
154
+
155
+ Will merge to 'next' and soon to 'master'.
156
+
157
158
* sg/complete-help-undup (2012-11-14) 1 commit
159
- completion: remove 'help' duplicate from porcelain commands
160
161
+ Will merge to 'next' and soon to 'master'.
162
+
163
+
164
+* bc/do-not-recurse-in-die (2012-11-15) 1 commit
165
+ - usage.c: detect recursion in die routines and bail out immediately
166
+
167
+ Will merge to 'next'.
168
+
169
+
170
+* cn/config-missing-path (2012-11-15) 1 commit
171
+ - config: don't segfault when given --path with a missing value
172
+
173
+ Will merge to 'next' and soon to 'master'.
174
+
175
+
176
+* jk/checkout-out-of-unborn (2012-11-15) 1 commit
177
+ - checkout: print a message when switching unborn branches
178
+
179
+ Will merge to 'next'.
180
+
181
+
182
+* mk/complete-tcsh (2012-11-16) 1 commit
183
+ - tcsh-completion re-using git-completion.bash
184
+
185
+
186
+* mm/status-push-pull-advise (2012-11-16) 1 commit
187
+ - status: add advice on how to push/pull to tracking branch
188
+
189
+
190
+* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit
191
+ - Unify appending signoff in format-patch, commit and sequencer
192
+
193
+ I am not sure if the logic to refrain from adding a sign-off based
194
+ on the existing run of sign-offs is done correctly in this change.
195
+
196
--------------------------------------------------
197
[Stalled]
198
@@ -186,18 +348,23 @@ repositories listed at
348
Fixes an XSS vulnerability in gitweb.
349
350
189
-* jk/send-email-sender-prompt (2012-11-13) 6 commits
351
+* jk/send-email-sender-prompt (2012-11-15) 8 commits
352
- send-email: do not prompt for explicit repo ident
353
- Git.pm: teach "ident" to query explicitness
354
- var: provide explicit/implicit ident information
355
- var: accept multiple variables on the command line
356
- ident: keep separate "explicit" flags for author and committer
195
- - ident: make user_ident_explicitly_given private
357
+ - ident: make user_ident_explicitly_given static
358
+ - t7502: factor out autoident prerequisite
359
+ - test-lib: allow negation of prerequisites
360
361
Avoid annoying sender prompt in git-send-email, but only when it is
362
safe to do so.
363
200
- Needs review.
364
+ Perhaps keep only the first three patches, and replace the rest
365
+ with the one from Felipe that takes a much simpler approach (the
366
+ rationale of that patch needs to be cleaned up first, along the
367
+ lines Jeff outlined, though).
368
369
370
* mg/replace-resolve-delete (2012-11-13) 1 commit
@@ -208,12 +375,11 @@ repositories listed at
375
376
377
* ml/cygwin-mingw-headers (2012-11-12) 1 commit
211
- - Update cygwin.c for new mingw-64 win32 api headers
378
+ (merged to 'next' on 2012-11-15 at 22e11b3)
379
+ + Update cygwin.c for new mingw-64 win32 api headers
380
381
Make git work on newer cygwin.
382
215
- Will merge to 'next'.
216
-
383
384
* mo/cvs-server-updates (2012-10-16) 10 commits
385
- cvsserver Documentation: new cvs ... -r support
@@ -252,53 +418,6 @@ repositories listed at
418
Needs some test updates.
419
420
255
-* jc/prettier-pretty-note (2012-11-13) 12 commits
256
- (merged to 'next' on 2012-11-14 at 7230f26)
257
- + format-patch: add a blank line between notes and diffstat
258
- (merged to 'next' on 2012-11-04 at 40e3e48)
259
- + Doc User-Manual: Patch cover letter, three dashes, and --notes
260
- + Doc format-patch: clarify --notes use case
261
- + Doc notes: Include the format-patch --notes option
262
- + Doc SubmittingPatches: Mention --notes option after "cover letter"
263
- + Documentation: decribe format-patch --notes
264
- + format-patch --notes: show notes after three-dashes
265
- + format-patch: append --signature after notes
266
- + pretty_print_commit(): do not append notes message
267
- + pretty: prepare notes message at a centralized place
268
- + format_note(): simplify API
269
- + pretty: remove reencode_commit_message()
270
-
271
- Emit the notes attached to the commit in "format-patch --notes"
272
- output after three-dashes.
273
-
274
- Will merge to 'master' in the fifth batch.
275
-
276
-
277
-* jc/same-encoding (2012-11-04) 1 commit
278
- (merged to 'next' on 2012-11-04 at 54991f2)
279
- + reencode_string(): introduce and use same_encoding()
280
-
281
- Various codepaths checked if two encoding names are the same using
282
- ad-hoc code and some of them ended up asking iconv() to convert
283
- between "utf8" and "UTF-8". The former is not a valid way to spell
284
- the encoding name, but often people use it by mistake, and we
285
- equated them in some but not all codepaths. Introduce a new helper
286
- function to make these codepaths consistent.
287
-
288
- Will merge to 'master' in the fifth batch.
289
-
290
-
291
-* cr/cvsimport-local-zone (2012-11-04) 2 commits
292
- (merged to 'next' on 2012-11-04 at 292f0b4)
293
- + cvsimport: work around perl tzset issue
294
- + git-cvsimport: allow author-specific timezones
295
-
296
- Allows "cvsimport" to read per-author timezone from the author info
297
- file.
298
-
299
- Will merge to 'master' in the fifth batch.
300
-
301
-
421
* fc/zsh-completion (2012-10-29) 3 commits
422
- completion: add new zsh completion
423
- completion: add new __gitcompadd helper
@@ -418,27 +537,6 @@ repositories listed at
537
"parents", etc.
538
539
421
-* jc/maint-fetch-tighten-refname-check (2012-10-19) 1 commit
422
- (merged to 'next' on 2012-11-04 at eda85ef)
423
- + get_fetch_map(): tighten checks on dest refs
424
-
425
- This was split out from discarded jc/maint-push-refs-all topic.
426
-
427
- Will merge to 'master' in the fifth batch.
428
-
429
-
430
-* jh/symbolic-ref-d (2012-10-21) 1 commit
431
- (merged to 'next' on 2012-11-04 at b0762f5)
432
- + git symbolic-ref --delete $symref
433
-
434
- Add "symbolic-ref -d SYM" to delete a symbolic ref SYM.
435
-
436
- It is already possible to remove a symbolic ref with "update-ref -d
437
- --no-deref", but it may be a good addition for completeness.
438
-
439
- Will merge to 'master' in the fifth batch.
440
-
441
-
540
* jh/update-ref-d-through-symref (2012-10-21) 2 commits
541
- Fix failure to delete a packed ref through a symref
542
- t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
@@ -469,25 +567,18 @@ repositories listed at
567
Will merge to 'master' in the sixth batch.
568
569
472
-* ph/submodule-sync-recursive (2012-10-29) 2 commits
473
- (merged to 'next' on 2012-11-04 at a000f78)
474
- + Add tests for submodule sync --recursive
475
- + Teach --recursive to submodule sync
476
-
477
- Adds "--recursive" option to submodule sync.
478
-
479
- Will merge to 'master' in the fifth batch.
480
-
481
-
482
-* fc/completion-test-simplification (2012-10-29) 2 commits
483
- - completion: simplify __gitcomp test helper
570
+* fc/completion-test-simplification (2012-11-16) 6 commits
571
+ - completion: simplify __gitcomp() test helper
572
- completion: refactor __gitcomp related tests
573
+ - completion: consolidate test_completion*() tests
574
+ - completion: simplify tests using test_completion_long()
575
+ - completion: standardize final space marker in tests
576
+ - completion: add comment for test_completion()
577
486
- Clean up completion tests.
487
-
488
- There were some comments on the list.
489
-
490
- Expecting a re-roll.
578
+ Clean up completion tests. Use of conslidated helper may make
579
+ instrumenting one particular test during debugging of the test
580
+ itself, but I think that issue should be addressed in some other
581
+ way (e.g. making sure individual tests in 9902 can be skipped).
582
583
584
* fc/remote-testgit-feature-done (2012-10-29) 1 commit
@@ -496,32 +587,12 @@ repositories listed at
587
Needs review.
588
589
499
-* jk/maint-diff-grep-textconv (2012-10-28) 1 commit
500
- (merged to 'next' on 2012-11-04 at 790337b)
501
- + diff_grep: use textconv buffers for add/deleted files
502
- (this branch is used by jk/pickaxe-textconv.)
503
-
504
- Fixes inconsistent use of textconv with "git log -G".
505
-
506
- Will merge to 'master' in the fifth batch.
507
-
508
-
590
* jk/pickaxe-textconv (2012-10-28) 2 commits
591
- pickaxe: use textconv for -S counting
592
- pickaxe: hoist empty needle check
512
- (this branch uses jk/maint-diff-grep-textconv.)
593
594
Use textconv filters when searching with "log -S".
595
516
- Waiting for a sanity check and review from Junio.
517
-
518
-
519
-* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit
520
- (merged to 'next' on 2012-11-09 at 117a91e)
521
- + commit: fixup misplacement of --no-post-rewrite description
522
-
523
- Will merge to 'master' in the fifth batch.
524
-
596
597
* fc/remote-bzr (2012-11-08) 5 commits
598
- remote-bzr: update working tree
@@ -574,13 +645,6 @@ repositories listed at
645
Will merge to 'master' in the sixth batch.
646
647
577
-* js/hp-nonstop (2012-10-30) 1 commit
578
- (merged to 'next' on 2012-11-09 at fe58205)
579
- + fix 'make test' for HP NonStop
580
-
581
- Will merge to 'master' in the fifth batch.
582
-
583
-
648
* kb/preload-index-more (2012-11-02) 1 commit
649
(merged to 'next' on 2012-11-09 at a750ebd)
650
+ update-index/diff-index: use core.preloadindex to improve performance
@@ -591,39 +655,6 @@ repositories listed at
655
Will merge to 'master' in the sixth batch.
656
657
594
-* mh/notes-string-list (2012-11-08) 5 commits
595
- (merged to 'next' on 2012-11-09 at 7a4c58c)
596
- + string_list_add_refs_from_colon_sep(): use string_list_split()
597
- + notes: fix handling of colon-separated values
598
- + combine_notes_cat_sort_uniq(): sort and dedup lines all at once
599
- + Initialize sort_uniq_list using named constant
600
- + string_list: add a function string_list_remove_empty_items()
601
-
602
- Improve the asymptotic performance of the cat_sort_uniq notes merge
603
- strategy.
604
-
605
- Will merge to 'master' in the fifth batch.
606
-
607
-
608
-* mh/strbuf-split (2012-11-04) 4 commits
609
- (merged to 'next' on 2012-11-09 at fa984b1)
610
- + strbuf_split*(): document functions
611
- + strbuf_split*(): rename "delim" parameter to "terminator"
612
- + strbuf_split_buf(): simplify iteration
613
- + strbuf_split_buf(): use ALLOC_GROW()
614
-
615
- Cleanups and documentation for strbuf_split.
616
-
617
- Will merge to 'master' in the fifth batch.
618
-
619
-
620
-* mm/maint-doc-commit-edit (2012-11-02) 1 commit
621
- (merged to 'next' on 2012-11-09 at 8dab7f5)
622
- + Document 'git commit --no-edit' explicitly
623
-
624
- Will merge to 'master' in the fifth batch.
625
-
626
-
658
* cr/push-force-tag-update (2012-11-12) 5 commits
659
- push: update remote tags only with force
660
- push: flag updates that require force
@@ -666,16 +697,6 @@ repositories listed at
697
Needs review.
698
699
669
-* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit
670
- (merged to 'next' on 2012-11-13 at bd74252)
671
- + push/pull: adjust missing upstream help text to changed interface
672
-
673
- Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
674
- suggesting the deprecated "--set-upstream".
675
-
676
- Will merge to 'master' in the fifth batch.
677
-
678
-
700
* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits
701
(merged to 'next' on 2012-11-13 at 2bf41d9)
702
+ link_alt_odb_entries(): take (char *, len) rather than two pointers