What's cooking (2009/12 #01)
Junio C Hamano committed
Dec 1, 2009 at 14:06 UTC
eac514604c80e2aa1fbae2d4e19d0c264845ed63
1 file changed
+110
-103
whats-cooking.txt
+110
-103
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2009, #07; Sun, 29)
3
-X-master-at: 66abce05dd5b9da9c889034781dc3de38b6e231b
4
-X-next-at: c4469778c3a4538c370b02fd190f6ed5a8139b58
2
+Subject: What's cooking in git.git (Dec 2009, #01; Tue, 01)
3
+X-master-at: c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e
4
+X-next-at: e913581093e7da8bef58b143c6da65c845d9fea3
5
6
-What's cooking in git.git (Nov 2009, #07; Sun, 29)
6
+What's cooking in git.git (Dec 2009, #01; Tue, 01)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -57,11 +57,11 @@ backward compatible. Currently planned changes are:
57
http://thread.gmane.org/gmane.comp.version-control.git/133256
58
59
--------------------------------------------------
60
-[New Topics]
60
+[Graduated to "master"]
61
62
* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.
63
- - format-patch: add test for parsing of "--"
64
- - format-patch: fix parsing of "--" on the command line
63
+ + format-patch: add test for parsing of "--"
64
+ + format-patch: fix parsing of "--" on the command line
65
66
* bw/diff-color-hunk-header (2009-11-27) 2 commits
67
(merged to 'next' on 2009-11-29 at c446977)
@@ -73,37 +73,74 @@ backward compatible. Currently planned changes are:
73
(merged to 'next' on 2009-11-27 at 7663874)
74
+ Remove dead code from "git am"
75
76
-* tr/http-updates (2009-11-27) 2 commits
77
- - Add an option for using any HTTP authentication scheme, not only basic
78
- - http: maintain curl sessions
76
+* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
77
+ + prepare send-email for smoother change of --chain-reply-to default
78
+ (this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
79
80
-* jc/diff-whitespace-prepare (2009-11-28) 2 commits
81
- - diff: flip the default diff.bwoutputonly to true
82
- - diff: optionally allow traditional "-b/-w affects only output" semantics
83
- (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
80
+This starts warning about the change to --no-chain-reply-to
81
+in 1.7.0 for smoother transition.
82
85
-This is to redo the two -b/-w semantic changes to prepare the migration of
86
-existing users before 1.7.0 happens.
83
+* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
84
+ - shortlog: respect commit encoding
85
88
-* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
89
- - diff: disable diff.bwoutputonly warning
90
- - diff: flip the diff.bwoutputonly default to false
91
- (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
86
+* fc/send-email-envelope (2009-11-26) 2 commits.
87
+ (merged to 'next' on 2009-11-27 at 2d0257d)
88
+ + send-email: automatic envelope sender
89
+ + t9001: test --envelope-sender option of send-email
90
93
-And this is to actually flip the default and eventually remove the warning.
91
+* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
92
+ (merged to 'next' on 2009-11-25 at 09d498f)
93
+ + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
94
95
-* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
96
- - prepare send-email for smoother change of --chain-reply-to default
97
- (this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
95
+Jim Meyering sent a patch to do a subset of what this does; to allow
96
+keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
97
+to also teach "am" to pass the new -b option, but that is independent of
98
+what Jim showed the need in real-world, so I think this can go in as-is.
99
99
-Similarly, this is to start warning about the change to --no-chain-reply-to
100
-in 1.7.0 for smoother transition.
100
+* jn/gitweb-blame (2009-11-24) 8 commits.
101
+ (merged to 'next' on 2009-11-25 at 0a5b649)
102
+ + gitweb.js: fix padLeftStr() and its usage
103
+ + gitweb.js: Harden setting blamed commit info in incremental blame
104
+ + gitweb.js: fix null object exception in initials calculation
105
+ + gitweb: Minify gitweb.js if JSMIN is defined
106
+ + gitweb: Create links leading to 'blame_incremental' using JavaScript
107
+ (merged to 'next' on 2009-10-11 at 73c4a83)
108
+ + gitweb: Colorize 'blame_incremental' view during processing
109
+ + gitweb: Incremental blame (using JavaScript)
110
+ + gitweb: Add optional "time to generate page" info in footer
111
102
-* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
103
- - send-email: make --no-chain-reply-to the default
104
- (this branch uses ns/send-email-no-chain-reply-to.)
112
+With two more changes to disable this by default to make it
113
+suitable as "new feature with known breakages" for 1.6.6
114
106
-And this is to actually flip the default in 1.7.0.
115
+* em/commit-claim (2009-11-04) 1 commit
116
+ (merged to 'next' on 2009-11-23 at b5df6fd)
117
+ + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
118
+
119
+* cc/bisect-doc (2009-11-08) 1 commit
120
+ (merged to 'next' on 2009-11-27 at c46d648)
121
+ + Documentation: add "Fighting regressions with git bisect" article
122
+
123
+* jc/pretty-lf (2009-10-04) 1 commit.
124
+ (merged to 'next' on 2009-11-27 at 73651c4)
125
+ + Pretty-format: %[+-]x to tweak inter-item newlines
126
+
127
+--------------------------------------------------
128
+[New Topics]
129
+
130
+* ap/merge-backend-opts (2008-07-18) 6 commits
131
+ - Document that merge strategies can now take their own options
132
+ - Extend merge-subtree tests to test -Xsubtree=dir.
133
+ - Make "subtree" part more orthogonal to the rest of merge-recursive.
134
+ - Teach git-pull to pass -X<option> to git-merge
135
+ - git merge -X<option>
136
+ - git-merge-file --ours, --theirs
137
+
138
+"git pull" patch needs sq-then-eval fix but otherwise seemed good.
139
+
140
+* mo/bin-wrappers (2009-11-29) 3 commits
141
+ - INSTALL: document a simpler way to run uninstalled builds
142
+ - run test suite without dashed git-commands in PATH
143
+ - build dashless "bin-wrappers" directory similar to installed bindir
144
145
--------------------------------------------------
146
[Stalled]
@@ -159,7 +196,8 @@ seems to think otherwise.
196
+ tests: move convenience regexp to match object names to test-lib.sh
197
198
This has some stupid bugs and reverted from 'next' until I can fix it, but
162
-the "temporarily" turned out to be very loooong. Sigh...
199
+the "temporarily" turned out to be very loooong. Sigh. We won't have a
200
+proper fix in 1.6.6.
201
202
* sr/gfi-options (2009-09-06) 6 commits.
203
- fast-import: test the new option command
@@ -174,6 +212,20 @@ Sverre is working on a re-roll to address comments from Shawn.
212
--------------------------------------------------
213
[Cooking]
214
215
+* tr/http-updates (2009-11-27) 2 commits
216
+ - Add an option for using any HTTP authentication scheme, not only basic
217
+ - http: maintain curl sessions
218
+
219
+It seems that this is still under discussion...
220
+
221
+* jc/diff-whitespace-prepare (2009-11-28) 2 commits
222
+ - diff: flip the default diff.bwoutputonly to true
223
+ - diff: optionally allow traditional "-b/-w affects only output" semantics
224
+ (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
225
+
226
+This is to redo the two -b/-w semantic changes to prepare the migration of
227
+existing users before 1.7.0 happens.
228
+
229
* sr/vcs-helper (2009-11-18) 12 commits
230
(merged to 'next' on 2009-11-27 at 83268ab)
231
+ Add Python support library for remote helpers
@@ -189,6 +241,8 @@ Sverre is working on a re-roll to address comments from Shawn.
241
+ Allow programs to not depend on remotes having urls
242
+ Fix memory leak in helper method for disconnect
243
244
+Should be among the first to graduate after 1.6.6 final.
245
+
246
* jc/grep-full-tree (2009-11-24) 1 commit.
247
- grep: --full-tree
248
@@ -196,33 +250,6 @@ The interaction with this option and pathspecs need to be worked out
250
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
251
all the header files in the tree, for example.
252
199
-* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
200
- - shortlog: respect commit encoding
201
-
202
-The fix is a maint material but the patch was against next, so I
203
-back-rebased it myself. I tried to be careful but please double check the
204
-result.
205
-
206
-Perhaps merge it to 'master' before 1.6.6-rc1?
207
-
208
-* fc/send-email-envelope (2009-11-26) 2 commits.
209
- (merged to 'next' on 2009-11-27 at 2d0257d)
210
- + send-email: automatic envelope sender
211
- + t9001: test --envelope-sender option of send-email
212
-
213
-Perhaps merge it to 'master' before 1.6.6-rc1?
214
-
215
-* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
216
- (merged to 'next' on 2009-11-25 at 09d498f)
217
- + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
218
-
219
-Jim Meyering sent a patch to do a subset of what this does; to allow
220
-keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
221
-to also teach "am" to pass the new -b option, but that is independent of
222
-what Jim showed the need in real-world, so I think this can go in as-is.
223
-
224
-Perhaps merge it to 'master' before 1.6.6-rc1?
225
-
253
* jc/checkout-merge-base (2009-11-20) 2 commits
254
- "rebase --onto A...B" replays history on the merge base between A and B
255
- "checkout A...B" switches to the merge base between A and B
@@ -235,41 +262,8 @@ want this (yet); the new feature is not urgent anyway.
262
+ {checkout,reset} -p: make patch direction configurable
263
264
I do not particularly like a configuration like this that changes the
238
-behaviour of a command in a drastic way---it will make helping others much
239
-harder.
240
-
241
-Perhaps merge it to 'master' before 1.6.6-rc1?
242
-
243
-* jn/gitweb-blame (2009-11-24) 8 commits.
244
- (merged to 'next' on 2009-11-25 at 0a5b649)
245
- + gitweb.js: fix padLeftStr() and its usage
246
- + gitweb.js: Harden setting blamed commit info in incremental blame
247
- + gitweb.js: fix null object exception in initials calculation
248
- + gitweb: Minify gitweb.js if JSMIN is defined
249
- + gitweb: Create links leading to 'blame_incremental' using JavaScript
250
- (merged to 'next' on 2009-10-11 at 73c4a83)
251
- + gitweb: Colorize 'blame_incremental' view during processing
252
- + gitweb: Incremental blame (using JavaScript)
253
- + gitweb: Add optional "time to generate page" info in footer
254
-
255
-Ajax-y blame, with further fixes. As this does not seem to break existing
256
-features, I am inclined to say that we push this out early, as a new
257
-feature with known breakages, to give it wider audience.
258
-
259
-* em/commit-claim (2009-11-04) 1 commit
260
- (merged to 'next' on 2009-11-23 at b5df6fd)
261
- + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
262
-
263
-I am not sure if the option name does a good job at explaining it to the
264
-end users, but I think the code and feature is solid.
265
-
266
-Perhaps merge it to 'master' before 1.6.6-rc1?
267
-
268
-* cc/bisect-doc (2009-11-08) 1 commit
269
- (merged to 'next' on 2009-11-27 at c46d648)
270
- + Documentation: add "Fighting regressions with git bisect" article
271
-
272
-Perhaps merge it to 'master' before 1.6.6-rc1?
265
+behaviour of a command in a drastic way---it will make helping others
266
+much harder.
267
268
* nd/sparse (2009-11-25) 20 commits.
269
(merged to 'next' on 2009-11-25 at 71380f5)
@@ -295,11 +289,9 @@ Perhaps merge it to 'master' before 1.6.6-rc1?
289
+ Add test-index-version
290
+ update-index: refactor mark_valid() in preparation for new options
291
298
-* jc/pretty-lf (2009-10-04) 1 commit.
299
- (merged to 'next' on 2009-11-27 at 73651c4)
300
- + Pretty-format: %[+-]x to tweak inter-item newlines
301
-
302
-Perhaps merge it to 'master' before 1.6.6-rc1?
292
+There were some test glitches reported and at least one test seems to
293
+be broken in the sense that it is not testing what it is trying to.
294
+Fix-up expected.
295
296
--------------------------------------------------
297
[For 1.7.0]
@@ -338,6 +330,13 @@ With this, "git status" is no longer "git commit --dry-run".
330
(merged to 'next' on 2009-10-11 at 043acdf)
331
+ send-email: make --no-chain-reply-to the default
332
333
+As the title says.
334
+
335
+* jc/1.7.0-push-safety (2009-02-09) 2 commits.
336
+ (merged to 'next' on 2009-10-11 at 81b8128)
337
+ + Refuse deleting the current branch via push
338
+ + Refuse updating the current branch in a non-bare repository via push
339
+
340
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
341
(merged to 'next' on 2009-10-11 at 546c74d)
342
+ diff.c: fix typoes in comments
@@ -355,12 +354,20 @@ and jc/diff-whitespace-prepare topic is meant to ease the transition.
354
+ No diff -b/-w output for all-whitespace changes
355
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
356
358
-Likewise.
357
+Likewise but for the output of "diff --git" headers.
358
+
359
+* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
360
+ - diff: disable diff.bwoutputonly warning
361
+ - diff: flip the diff.bwoutputonly default to false
362
+ (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
363
+
364
+And this is to actually flip the default and eventually remove the warning.
365
+
366
+* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
367
+ - send-email: make --no-chain-reply-to the default
368
+
369
+And this is to actually flip the default in 1.7.0.
370
360
-* jc/1.7.0-push-safety (2009-02-09) 2 commits.
361
- (merged to 'next' on 2009-10-11 at 81b8128)
362
- + Refuse deleting the current branch via push
363
- + Refuse updating the current branch in a non-bare repository via push
371
372
--------------------------------------------------
373
[Reverted from 'next']