What's cooking (2012/06 #04)
Junio C Hamano committed
Jun 15, 2012 at 16:08 UTC
f0745af245e4ee06fffa0e688ef4b6a22c1bc363
1 file changed
+96
-83
whats-cooking.txt
+96
-83
@@ -1,101 +1,52 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2012, #03; Wed, 13)
3
-X-master-at: 2ae48a9bb87193de9e9da10abd9e7286c0e4c43d
4
-X-next-at: 8698a94dadcf25a536d802359376c8811d29a59d
2
+Subject: What's cooking in git.git (Jun 2012, #04; Fri, 15)
3
+X-master-at: 7dba3f73e9571963fa03549956879d15ca7ad2d3
4
+X-next-at: b465d9982e61447cc6f1c0b16b99b6f38e7c0a47
5
6
-What's cooking in git.git (Jun 2012, #03; Wed, 13)
6
+What's cooking in git.git (Jun 2012, #04; Fri, 15)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-Most likely, I'll tag 1.7.11 final this weekend. It doesn't look
13
-like there is any remaining topic that cannot wait for the next
14
-cycle. A few small regressions on the master front have been
15
-patched up, and it seems we are good to go.
12
+A few more regression fixes have been made on the 'master' front
13
+since 1.7.11-rc3.
14
17
-You can find the changes described here in the integration branches of the
18
-repositories listed at
19
-
20
- http://git-blame.blogspot.com/p/git-public-repositories.html
15
+ - Recent "git diff" change started counting changes to binary files
16
+ in bytes and adding it to shortstat output; fixed by Alexander
17
+ Strasser.
18
22
---------------------------------------------------
23
-[New Topics]
19
+ - Perl libraries needed for git-svn weren't correctly installed
20
+ when MakeMaker was not in use; fixed by Jonathan Nieder.
21
25
-* nd/i18n-branch-lego (2012-06-07) 1 commit
26
- - Remove i18n legos in notifying new branch tracking setup
22
+ - Some gitweb tests failed when neither HTTP::Date or
23
+ Time::ParseDate was available; fixed by Ramsay Jones.
24
28
-Restructure the way message strings are created, in preparation for
29
-marking them for i18n.
30
-
31
-* nd/i18n-misc (2012-06-07) 3 commits
32
- - rerere: remove i18n legos in result message
33
- - notes-merge: remove i18n legos in merge result message
34
- - reflog: remove i18n legos in pruning message
25
+The final is still expected to happen this weekend.
26
36
-Restructure the way message strings are created, in preparation for
37
-marking them for i18n.
38
-
39
-* rr/doc-commit (2012-06-08) 1 commit
40
- - commit: document a couple of options
41
-
42
-* hv/remote-end-hung-up (2012-06-11) 1 commit
43
- - lessen the impression of unexpectedness on remote hangup
44
-
45
-* hv/submodule-checkout-nuke-submodules (2012-06-11) 1 commit
46
- - update-index: allow overwriting existing submodule index entries
47
-
48
-* jc/rev-list-simplify-merges-first-parent (2012-06-13) 3 commits
49
- - revision: ignore side parents while running simplify-merges
50
- - revision: note the lack of free() in simplify_merges()
51
- - revision: "simplify" options imply topo-order sort
52
-
53
-* jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit
54
- - archive: ustar header checksum is computed unsigned
55
-
56
-* rs/git-blame-mapcar-mapc (2012-06-10) 1 commit
57
- - git-blame.el: use mapc instead of mapcar
58
-
59
-* rs/ipv6-ssh-url (2012-06-13) 1 commit
60
- - git: Wrong parsing of ssh urls with IPv6 literals ignores port
27
+You can find the changes described here in the integration branches of the
28
+repositories listed at
29
62
-* vr/use-our-perl-in-tests (2012-06-12) 3 commits
63
- - t/README: add a bit more Don'ts
64
- - tests: enclose $PERL_PATH in duoble quotes
65
- - t: Replace 'perl' by $PERL_PATH
30
+ http://git-blame.blogspot.com/p/git-public-repositories.html
31
32
--------------------------------------------------
68
-[Graduated to "master"]
69
-
70
-* cr/persistent-https (2012-05-30) 1 commit
71
- (merged to 'next' on 2012-06-01 at c647464)
72
- + Add persistent-https to contrib
73
-
74
-A remote helper that acts as a proxy that caches ssl session for the
75
-https:// transport is added to the contrib/ area.
33
+[New Topics]
34
77
-* jc/fmt-merge-msg-people (2012-06-06) 1 commit
78
- (merged to 'next' on 2012-06-08 at 7d8f4b6)
79
- + fmt-merge-msg: make attribution into comment lines
35
+* lm/git-blame-el (2012-06-14) 3 commits
36
+ - git-blame.el: Do not use bare 0 to mean (point-min)
37
+ - git-blame.el: Use with-current-buffer where appropriate
38
+ - git-blame.el: Do not use goto-line in lisp code
39
81
-* jc/svn-auth-providers-unusable-at-1.6.12 (2012-06-04) 1 commit
82
- (merged to 'next' on 2012-06-04 at c4ffe24)
83
- + git-svn: platform auth providers are working only on 1.6.15 or newer
40
+Will merge to next after 1.7.11.
41
85
-Regression fix for people with libsvn between 1.6.12 and 1.6.15 on
86
-which we tried to use non-working platform auth providers.
42
+* lp/no-cmd-http-fetch (2012-06-15) 1 commit
43
+ - builtin.h: remove unused cmd_<foo> declarations
44
88
-* mm/api-credentials-doc (2012-06-07) 5 commits
89
- + docs: fix cross-directory linkgit references
90
- (merged to 'next' on 2012-06-05 at 8e14814)
91
- + api-credentials.txt: add "see also" section
92
- + api-credentials.txt: mention credential.helper explicitly
93
- + api-credentials.txt: show the big picture first
94
- + doc: fix xref link from api docs to manual pages
45
+Will merge to next after 1.7.11.
46
96
-* rr/maint-t3510-cascade-fix (2012-06-04) 1 commit
97
- (merged to 'next' on 2012-06-04 at 4c3368b)
98
- + t3510 (cherry-pick-sequence): add missing '&&'
47
+* jk/diff-no-index-pager (2012-06-15) 2 commits
48
+ - do not run pager with diff --no-index --quiet
49
+ - fix pager.diff with diff --no-index
50
51
--------------------------------------------------
52
[Stalled]
@@ -193,6 +144,68 @@ not working :-(.
144
--------------------------------------------------
145
[Cooking]
146
147
+* nd/i18n-branch-lego (2012-06-07) 1 commit
148
+ - Remove i18n legos in notifying new branch tracking setup
149
+
150
+Restructure the way message strings are created, in preparation for
151
+marking them for i18n.
152
+
153
+Will merge to next after 1.7.11.
154
+
155
+* nd/i18n-misc (2012-06-07) 3 commits
156
+ - rerere: remove i18n legos in result message
157
+ - notes-merge: remove i18n legos in merge result message
158
+ - reflog: remove i18n legos in pruning message
159
+
160
+Restructure the way message strings are created, in preparation for
161
+marking them for i18n.
162
+
163
+Will merge to next after 1.7.11.
164
+
165
+* rr/doc-commit (2012-06-08) 1 commit
166
+ - commit: document a couple of options
167
+
168
+Will merge to next after 1.7.11.
169
+
170
+* hv/remote-end-hung-up (2012-06-11) 1 commit
171
+ - lessen the impression of unexpectedness on remote hangup
172
+
173
+Still being discussed.
174
+
175
+* hv/submodule-checkout-nuke-submodules (2012-06-11) 1 commit
176
+ - update-index: allow overwriting existing submodule index entries
177
+
178
+Will merge to next after 1.7.11.
179
+
180
+* jc/rev-list-simplify-merges-first-parent (2012-06-13) 3 commits
181
+ - revision: ignore side parents while running simplify-merges
182
+ - revision: note the lack of free() in simplify_merges()
183
+ - revision: "simplify" options imply topo-order sort
184
+
185
+I need to send this out to the list for re-review.
186
+
187
+* jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit
188
+ - archive: ustar header checksum is computed unsigned
189
+
190
+Will merge to next after 1.7.11.
191
+
192
+* rs/git-blame-mapcar-mapc (2012-06-10) 1 commit
193
+ - git-blame.el: use mapc instead of mapcar
194
+
195
+Will merge to next after 1.7.11.
196
+
197
+* rs/ipv6-ssh-url (2012-06-13) 1 commit
198
+ - git: Wrong parsing of ssh urls with IPv6 literals ignores port
199
+
200
+Will merge to next after 1.7.11.
201
+
202
+* vr/use-our-perl-in-tests (2012-06-12) 3 commits
203
+ - t/README: add a bit more Don'ts
204
+ - tests: enclose $PERL_PATH in duoble quotes
205
+ - t: Replace 'perl' by $PERL_PATH
206
+
207
+Will merge to next after 1.7.11.
208
+
209
* jc/apply-3way (2012-06-13) 19 commits
210
- apply --3way: tests
211
- apply: document --3way option
@@ -217,6 +230,7 @@ not working :-(.
230
"git apply" learns to wiggle the base version and perform three-way merge
231
when a patch does not exactly apply to the version you have.
232
233
+Waiting for comments.
234
235
* nd/exclude-workaround-top-heavy (2012-06-07) 3 commits
236
- exclude: do strcmp as much as possible before fnmatch
@@ -236,14 +250,13 @@ history said "it requires these 0 commits".
250
251
Not urgent; probably early post 1.7.11.
252
239
-* lk/more-helpful-status-hints (2012-06-11) 5 commits
240
- - fixup! status: better advices when splitting a commit (during rebase -i)
253
+* lk/more-helpful-status-hints (2012-06-14) 4 commits
254
- status: better advices when splitting a commit (during rebase -i)
255
- status: don't suggest "git rm" or "git add" if not appropriate
256
- t7512-status-help.sh: better advices for git status
257
- wt-status.*: better advices for git status added
258
246
-Almost there, modulo minor details pointed out by Matthieu.
259
+Will merge to next after 1.7.11.
260
261
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
262
- pager: drop "wait for output to run less" hack
@@ -353,7 +366,8 @@ a large blob object in-core while running index-pack.
366
367
Will merge to next after 1.7.11.
368
356
-* js/submodule-relative (2012-06-06) 4 commits
369
+* js/submodule-relative (2012-06-14) 5 commits
370
+ - t7400: avoid path mangling issues
371
- submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
372
- submodule: fix sync handling of some relative superproject origin URLs
373
- submodule: document failure to handle relative superproject origin URLs
@@ -394,4 +408,3 @@ forwarded to; this came from a laziness of the implementation of
408
merging of signed tags in 1.7.9. People may have different opinion
409
on making signed and unsigned annotated tag behave differently, but
410
I tend to agree that it is probably not a good idea.
397
-