What's cooking (2011/04 #03)
Junio C Hamano committed
Apr 8, 2011 at 22:21 UTC
d56f7e76bf5ad285af7488010ca3eee2f76a451e
1 file changed
+73
-68
whats-cooking.txt
+73
-68
@@ -1,77 +1,44 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2011, #02; Wed, 6)
3
-X-master-at: 6be0559183ac0b40680df314748141d1bdf28e41
4
-X-next-at: 00b8c7c14947fdc050aa2896ceffcc245873ec3e
2
+Subject: What's cooking in git.git (Apr 2011, #03; Fri, 8)
3
+X-master-at: c3f6163b0b6e2cfae1422050c9607db1130cded0
4
+X-next-at: 86d60b025fb96d44086c93b52801c971999e0b0f
5
6
-What's cooking in git.git (Apr 2011, #02; Wed, 6)
6
+What's cooking in git.git (Apr 2011, #03; Fri, 8)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-The tip of 'master' is at 1.7.5-rc1 now.
13
-
12
--------------------------------------------------
13
[New Topics]
14
17
-* dm/http-cleanup (2011-03-30) 2 commits
18
- - http-push: refactor curl_easy_setup madness
19
- - http: make curl callbacks match contracts from curl header
15
+* dm/stash-k-i-p (2011-04-07) 2 commits
16
+ - stash: ensure --no-keep-index and --patch can be used in any order
17
+ - stash: add two more tests for --no-keep-index
18
21
-* jc/pack-objects-bigfile (2011-04-05) 1 commit
22
- - Teach core.bigfilethreashold to pack-objects
19
+* jc/magic-pathspec (2011-04-06) 3 commits
20
+ (merged to 'next' on 2011-04-08 at c5247ce)
21
+ + magic pathspec: add ":(icase)path" to match case insensitively
22
+ + magic pathspec: futureproof shorthand form
23
+ + magic pathspec: add tentative ":/path/from/top/level" pathspec support
24
+ (this branch is tangled with jc/add-u-migration-2.)
25
24
-* jk/maint-stash-oob (2011-04-06) 2 commits
25
- - stash: fix false positive in the invalid ref test.
26
- - stash: fix accidental apply of non-existent stashes
26
+Thanks to Peff, Duy, and Michael for helping to whip the syntax and
27
+the basic semantics into a not-so-horrible shape. Will not merge until
28
+the 1.7.5 ships, though.
29
28
-* nk/blame-abbrev (2011-04-06) 1 commit
29
- - blame: add --abbrev command line option and make it honor core.abbrev
30
+* jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits
31
+ - "add -p": work-around an old laziness that does not coalesce hunks
32
+ - add--interactive.perl: factor out repeated --recount option
33
31
-* nm/submodule-update-force (2011-04-01) 1 commit
32
- - submodule: Add --force option for git submodule update
34
+* jc/merge-dash-previous (2011-04-07) 1 commit
35
+ - merge: allow "-" as a short-hand for "previous branch"
36
34
-* jk/maint-upload-pack-shallow (2011-04-04) 1 commit
35
- - [REVISIT] upload-pack deadlock during a shallow clone
36
-
37
-* jk/stash-loosen-safety (2011-04-05) 1 commit
38
- - stash: drop dirty worktree check on apply
39
-
40
---------------------------------------------------
41
-[Graduated to "master"]
42
-
43
-* jc/rev-list-options-fix (2011-04-01) 1 commit
44
- (merged to 'next' on 2011-04-03 at 91f19de)
45
- + "log --cherry-pick" documentation regression fix
46
-
47
-* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
48
- (merged to 'next' on 2011-04-03 at ccc9c1a)
49
- + remote: deprecate --mirror
50
- + remote: separate the concept of push and fetch mirrors
51
- + remote: disallow some nonsensical option combinations
52
-
53
-This avoids a nonsense configuration to be created to confuse unsuspecting
54
-users.
55
-
56
-* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
57
- (merged to 'next' on 2011-03-20 at a5e452d)
58
- + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
59
- + submodule update: Don't fetch when the submodule commit is already present
60
- + fetch/pull: Don't recurse into a submodule when commits are already present
61
- + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
62
- + config: teach the fetch.recurseSubmodules option the 'on-demand' value
63
- + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
64
- + fetch/pull: recurse into submodules when necessary
65
-
66
-* mg/doc-revisions-txt (2011-04-04) 3 commits
67
- (merged to 'next' on 2011-04-04 at ebf3612)
68
- + revisions.txt: language improvements
69
- + revisions.txt: structure with a labelled list
70
- + revisions.txt: consistent use of quotes
71
-
72
-* nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
73
- (merged to 'next' on 2011-04-03 at 40c5094)
74
- + submodule: process conflicting submodules only once
37
+* rr/doc-content-type (2011-04-07) 4 commits
38
+ - Documentation: Allow custom diff tools to be specified in 'diff.tool'
39
+ - Documentation: Add diff.<driver>.* to config
40
+ - Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
41
+ - Documentation: Add filter.<driver>.* to config
42
43
--------------------------------------------------
44
[Stalled]
@@ -115,6 +82,29 @@ current usage context.
82
--------------------------------------------------
83
[Cooking]
84
85
+* dm/http-cleanup (2011-03-30) 2 commits
86
+ - http-push: refactor curl_easy_setup madness
87
+ - http: make curl callbacks match contracts from curl header
88
+
89
+* jc/pack-objects-bigfile (2011-04-05) 1 commit
90
+ - Teach core.bigfilethreashold to pack-objects
91
+
92
+* jk/maint-stash-oob (2011-04-06) 2 commits
93
+ - stash: fix false positive in the invalid ref test.
94
+ - stash: fix accidental apply of non-existent stashes
95
+
96
+* nk/blame-abbrev (2011-04-06) 1 commit
97
+ - blame: add --abbrev command line option and make it honor core.abbrev
98
+
99
+* nm/submodule-update-force (2011-04-01) 1 commit
100
+ - submodule: Add --force option for git submodule update
101
+
102
+* jk/maint-upload-pack-shallow (2011-04-06) 1 commit
103
+ - upload-pack: start pack-objects before async rev-list
104
+
105
+* jk/stash-loosen-safety (2011-04-05) 1 commit
106
+ - stash: drop dirty worktree check on apply
107
+
108
* dm/color-palette (2011-04-05) 1 commit
109
(merged to 'next' on 2011-04-04 at 0244ef9)
110
+ Share color list between graph and show-branch
@@ -250,15 +240,6 @@ Will cook until 1.7.5 final.
240
241
Will cook until 1.7.5 final.
242
253
-* jc/add-u-migration (2011-03-22) 3 commits
254
- - add: make "add -u/-A" update full tree without pathspec (step 3)
255
- - add: make "add -u/-A" update full tree without pathspec (step 2)
256
- (merged to 'next' on 2011-03-31 at 962e058)
257
- + add: make "add -u/-A" update full tree without pathspec
258
-
259
-Need to redo the advice after the "this is from root of the working tree"
260
-magic pathspec.
261
-
243
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
244
(merged to 'next' on 2011-03-31 at 8d685d7)
245
+ diffcore-rename: fall back to -C when -C -C busts the rename limit
@@ -282,3 +263,27 @@ Don't see much point in this itself. Probably will drop.
263
+ t6022: New test checking for unnecessary updates of renamed+modified files
264
265
I am not happy with these magic band aids. Will hold.
266
+
267
+--------------------------------------------------
268
+[Discarded]
269
+
270
+* jc/add-u-migration (2011-03-22) 3 commits
271
+ . add: make "add -u/-A" update full tree without pathspec (step 3)
272
+ . add: make "add -u/-A" update full tree without pathspec (step 2)
273
+ (merged to 'next' on 2011-03-31 at 962e058)
274
+ + add: make "add -u/-A" update full tree without pathspec
275
+ (this branch is tangled with jc/add-u-migration-2.)
276
+
277
+* jc/add-u-migration-2 (2011-04-08) 5 commits
278
+ (merged to 'next' on 2011-04-08 at 524e365)
279
+ + Revert "add -u" default change plans
280
+ (merged to 'next' on 2011-04-06 at 4a6bb82)
281
+ + add -u: get rid of "treewideupdate" configuration
282
+ + Merge branch 'jc/magic-pathspec' into early parts of jc/add-u-migration
283
+ + magic pathspec: add tentative ":/path/from/top/level" pathspec support
284
+ (merged to 'next' on 2011-03-31 at 962e058)
285
+ + add: make "add -u/-A" update full tree without pathspec
286
+ (this branch is tangled with jc/add-u-migration and jc/magic-pathspec.)
287
+
288
+These attempt "add -u" migration plans (two versions), but then revert
289
+both of them at the end where they are merged to 'next'.