What's cooking (2012/11 #03)
Jeff King committed
Nov 13, 2012 at 12:49 UTC
b37205e1e8491f9c7d693ffce7726bf73a0f6ffb
1 file changed
+165
-258
whats-cooking.txt
+165
-258
@@ -1,19 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #02; Fri, 9)
3
+Subject: What's cooking in git.git (Nov 2012, #03; Tue, 13)
4
X-master-at: b0b00a3ee43b4813eb85728a482500f6422499fd
5
-X-next-at: 7a4c58c4d7b270e7e6bea673b5515cd0babe9508
5
+X-next-at: c57d8567839e5251e59fe5bdbd421c59cfe4a9ae
6
7
-What's cooking in git.git (Nov 2012, #02; Fri, 9)
7
+What's cooking in git.git (Nov 2012, #03; Tue, 13)
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 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.
14
+This is my final "what's cooking" as interim maintainer. I didn't
15
+graduate anything to master, but I updated my plans for each topic to
16
+give Junio an idea of where I was.
17
18
You can find the changes described here in the integration branches of
19
my repository at:
@@ -26,266 +26,43 @@ updated.
26
--------------------------------------------------
27
[New Topics]
28
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
-
36
- Require "-f" for push to update a tag, even if it is a fast-forward.
37
-
38
- Needs review.
39
-
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
-
66
- Needs review.
67
-
68
-
69
-* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit
70
- - push/pull: adjust missing upstream help text to changed interface
71
-
72
- Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
73
- suggesting the deprecated "--set-upstream".
74
-
75
- Will merge to 'next'.
29
+* jk/maint-gitweb-xss (2012-11-12) 1 commit
30
+ - gitweb: escape html in rss title
31
77
-
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
-
82
- Cleanups in the alternates code. Fixes a potential bug and makes the
83
- code much cleaner.
32
+ Fixes an XSS vulnerability in gitweb.
33
34
Will merge to 'next'.
35
36
88
-* pf/editor-ignore-sigint (2012-11-08) 1 commit
89
- - launch_editor: ignore SIGINT while the editor has control
37
+* jk/send-email-sender-prompt (2012-11-13) 6 commits
38
+ - send-email: do not prompt for explicit repo ident
39
+ - Git.pm: teach "ident" to query explicitness
40
+ - var: provide explicit/implicit ident information
41
+ - var: accept multiple variables on the command line
42
+ - ident: keep separate "explicit" flags for author and committer
43
+ - ident: make user_ident_explicitly_given private
44
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
-
100
-
101
-* pp/gitweb-config-underscore (2012-11-08) 1 commit
102
- - gitweb: make remote_heads config setting work
45
+ Avoid annoying sender prompt in git-send-email, but only when it is
46
+ safe to do so.
47
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.
48
+ Needs review.
49
110
- Expecting a re-roll.
50
51
+* mg/replace-resolve-delete (2012-11-13) 1 commit
52
+ - replace: parse revision argument for -d
53
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.
54
+ Be more user friendly to people using "git replace -d".
55
56
Will merge to 'next'.
57
58
121
-* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit
122
- - gitweb.perl: fix %highlight_ext mappings
59
+* ml/cygwin-mingw-headers (2012-11-12) 1 commit
60
+ - Update cygwin.c for new mingw-64 win32 api headers
61
124
- Fixes a clever misuse of perl's list interpretation.
62
+ Make git work on newer cygwin.
63
64
Will merge to 'next'.
65
128
-
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
-
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
-
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
-
148
- Will merge to 'master' in the fourth batch.
149
-
150
-
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
-
161
- Fixes many rfc2047 quoting issues in the output from format-patch.
162
-
163
- Will merge to 'master' in the fourth batch.
164
-
165
-
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
-
179
- Further updates fix subject quoting.
180
-
181
- Will merge to 'master' in the fourth batch.
182
-
183
-
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
-
211
- Will merge to 'master' in the fourth batch.
212
-
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
-
225
- Start laying the foundation to build the "wildmatch" after we can
226
- agree on its desired semantics.
227
-
228
- Will merge to 'master' in the fourth batch.
229
-
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
-
241
- Code cleanups so that libgit.a does not depend on anything in the
242
- builtin/ directory.
243
-
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
-
249
-
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
-
256
-
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
-
262
- Cleans up some leftover bits from an earlier submodule change.
263
-
264
- Will merge to 'master' in the fourth batch.
265
-
266
-
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
-
275
- Will merge to 'master' in the fourth batch.
276
-
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
-
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
-
287
- Will merge to 'master' in the fourth batch.
288
-
66
--------------------------------------------------
67
[Stalled]
68
@@ -416,7 +193,6 @@ updated.
193
pathname we obtain from getcwd(), leading the GIT_DIR discovery
194
logic to escape the ceilings the user thought to have specified.
195
419
-
196
--------------------------------------------------
197
[Cooking]
198
@@ -436,14 +212,15 @@ updated.
212
213
214
* ta/doc-cleanup (2012-10-25) 6 commits
439
- - Documentation: build html for all files in technical and howto
440
- - Documentation/howto: convert plain text files to asciidoc
441
- - Documentation/technical: convert plain text files to asciidoc
442
- - Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
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
215
+ (merged to 'next' on 2012-11-13 at e11fafd)
216
+ + Documentation: build html for all files in technical and howto
217
+ + Documentation/howto: convert plain text files to asciidoc
218
+ + Documentation/technical: convert plain text files to asciidoc
219
+ + Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
220
+ + Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
221
+ + Split over-long synopsis in git-fetch-pack.txt into several lines
222
446
- Will merge to 'next'.
223
+ Will merge to 'master' in the sixth batch.
224
225
226
* lt/diff-stat-show-0-lines (2012-10-17) 1 commit
@@ -663,6 +440,8 @@ updated.
440
"update-ref -d --deref SYM" to delete a ref through a symbolic ref
441
that points to it did not remove it correctly.
442
443
+ Need to check reviews, but is probably ready for 'next'.
444
+
445
446
* jk/config-ignore-duplicates (2012-10-29) 9 commits
447
(merged to 'next' on 2012-10-29 at 67fa0a2)
@@ -681,7 +460,7 @@ updated.
460
better match the internal config callbacks, which clears up
461
some corner cases with includes.
462
684
- Will cook in 'next'.
463
+ Will merge to 'master' in the sixth batch.
464
465
466
* ph/submodule-sync-recursive (2012-10-29) 2 commits
@@ -750,7 +529,11 @@ updated.
529
Will merge to 'next'.
530
531
753
-* fc/remote-hg (2012-11-04) 16 commits
532
+* fc/remote-hg (2012-11-12) 20 commits
533
+ - remote-hg: avoid bad refs
534
+ - remote-hg: try the 'tip' if no checkout present
535
+ - remote-hg: fix compatibility with older versions of hg
536
+ - remote-hg: add missing config for basic tests
537
- remote-hg: the author email can be null
538
- remote-hg: add option to not track branches
539
- remote-hg: add extra author test
@@ -834,3 +617,127 @@ updated.
617
618
Will merge to 'master' in the fifth batch.
619
620
+
621
+* cr/push-force-tag-update (2012-11-12) 5 commits
622
+ - push: update remote tags only with force
623
+ - push: flag updates that require force
624
+ - push: flag updates
625
+ - push: add advice for rejected tag reference
626
+ - push: return reject reasons via a mask
627
+
628
+ Require "-f" for push to update a tag, even if it is a fast-forward.
629
+
630
+ Needs review.
631
+
632
+ I'm undecided yet on whether the goal is the right thing to do, but it
633
+ does prevent some potential mistakes. I haven't looked closely at the
634
+ implementation itself; review from interested parties would be helpful.
635
+
636
+
637
+* fc/fast-export-fixes (2012-11-08) 14 commits
638
+ - fast-export: don't handle uninteresting refs
639
+ - fast-export: make sure updated refs get updated
640
+ - fast-export: fix comparison in tests
641
+ - fast-export: trivial cleanup
642
+ - remote-testgit: make clear the 'done' feature
643
+ - remote-testgit: report success after an import
644
+ - remote-testgit: exercise more features
645
+ - remote-testgit: cleanup tests
646
+ - remote-testgit: remove irrelevant test
647
+ - remote-testgit: get rid of non-local functionality
648
+ - Add new simplified git-remote-testgit
649
+ - Rename git-remote-testgit to git-remote-testpy
650
+ - remote-testgit: fix direction of marks
651
+ - fast-export: avoid importing blob marks
652
+
653
+ Improvements to fix fast-export bugs, including how refs pointing to
654
+ already-seen commits are handled. An earlier 4-commit version of this
655
+ series looked good to me, but this much-expanded version has not seen
656
+ any comments.
657
+
658
+ Looks like it has been re-rolled, but I haven't checked it out yet.
659
+
660
+ Needs review.
661
+
662
+
663
+* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit
664
+ (merged to 'next' on 2012-11-13 at bd74252)
665
+ + push/pull: adjust missing upstream help text to changed interface
666
+
667
+ Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
668
+ suggesting the deprecated "--set-upstream".
669
+
670
+ Will merge to 'master' in the fifth batch.
671
+
672
+
673
+* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits
674
+ (merged to 'next' on 2012-11-13 at 2bf41d9)
675
+ + link_alt_odb_entries(): take (char *, len) rather than two pointers
676
+ + link_alt_odb_entries(): use string_list_split_in_place()
677
+
678
+ Cleanups in the alternates code. Fixes a potential bug and makes the
679
+ code much cleaner.
680
+
681
+ Will merge to 'master' in the sixth batch.
682
+
683
+
684
+* pf/editor-ignore-sigint (2012-11-11) 5 commits
685
+ - launch_editor: propagate SIGINT from editor to git
686
+ - run-command: do not warn about child death by SIGINT
687
+ - run-command: drop silent_exec_failure arg from wait_or_whine
688
+ - launch_editor: ignore SIGINT while the editor has control
689
+ - launch_editor: refactor to use start/finish_command
690
+
691
+ Avoid confusing cases where the user hits Ctrl-C while in the editor
692
+ session, not realizing git will receive the signal. Since most editors
693
+ will take over the terminal and will block SIGINT, this is not likely
694
+ to confuse anyone.
695
+
696
+ Some people raised issues with emacsclient, which are addressed by this
697
+ re-roll. It should probably also handle SIGQUIT, and there were a
698
+ handful of other review comments.
699
+
700
+ Expecting a re-roll.
701
+
702
+
703
+* pp/gitweb-config-underscore (2012-11-08) 1 commit
704
+ - gitweb: make remote_heads config setting work
705
+
706
+ The key "gitweb.remote_heads" is not legal git config; this maps it to
707
+ "gitweb.remoteheads".
708
+
709
+ Junio raised a good point about the implementation for three-level
710
+ variables.
711
+
712
+ Expecting a re-roll.
713
+
714
+
715
+* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit
716
+ (merged to 'next' on 2012-11-13 at e90cc7c)
717
+ + git p4: RCS expansion should not span newlines
718
+
719
+ I do not have p4 to play with, but looks obviously correct to me.
720
+
721
+ Will merge to 'master' in the sixth batch.
722
+
723
+
724
+* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit
725
+ (merged to 'next' on 2012-11-13 at c57d856)
726
+ + gitweb.perl: fix %highlight_ext mappings
727
+
728
+ Fixes a clever misuse of perl's list interpretation.
729
+
730
+ Will merge to 'master' in the sixth batch.
731
+
732
+
733
+* rr/submodule-diff-config (2012-11-08) 3 commits
734
+ - submodule: display summary header in bold
735
+ - diff: introduce diff.submodule configuration variable
736
+ - Documentation: move diff.wordRegex from config.txt to diff-config.txt
737
+
738
+ Lets "git diff --submodule=log" become the default via configuration.
739
+
740
+ Almost there. Looks like a new version has been posted, but I haven't
741
+ picked it up yet.
742
+
743
+ Needs review.