What's cooking in git.git (Jul 2008, issue #08; Sat, 19)
Junio C Hamano committed
Jul 20, 2008 at 22:59 UTC
f9b24f2ce2af3c7e30479fc3c00e7b7a264c3bb7
1 file changed
+83
-136
whatscooking.txt
+83
-136
@@ -1,4 +1,4 @@
1
-What's cooking in git.git (Jul 2008, issue #07; Thu, 17)
1
+What's cooking in git.git (Jul 2008, issue #08; Sat, 19)
2
--------------------------------------------------------
3
4
Here are the topics that have been cooking. Commits prefixed
@@ -8,10 +8,6 @@ in 'next'.
8
The topics list the commits in reverse chronological order. The topics
9
meant to be merged to the maintenance series have "maint-" in their names.
10
11
-Right now 'next' is very thin. After today's new topics, perhaps except
12
-for the submodule stuff by Pasky, are merged to 'master', we will have the
13
-1.6.0-rc0, and from there the usual pre-release freeze begins.
14
-
11
Due to increased activity level from people including GSoC students, I
12
expect 'next' to stay somewhat more active than previous rounds during the
13
1.6.0-rc cycle. The request for people who usually follow 'next' is the
@@ -27,11 +23,20 @@ Tentative schedule, my wishful thinking:
23
- 1.6.0-rc3 (Aug 6)
24
- 1.6.0 (Aug 10)
25
26
+No real activity on 'next', as I was busy tending bugfixes and pushing out
27
+v1.5.6.4 today.
28
+
29
----------------------------------------------------------------
31
-[New Topics]
30
+[Will merge to "master" soon]
31
+
32
+* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
33
+ + git am --abort
34
+
35
+This one is for Ted; builds on top of the recent "am and rebase leaves
36
+ORIG_HEAD just like reset, merge and pull does" rather nicely.
37
38
* jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit
34
- - rerere.autoupdate: change the message when autoupdate is in effect
39
+ + rerere.autoupdate: change the message when autoupdate is in effect
40
41
This one is for Ingo.
42
@@ -47,86 +52,10 @@ future. When that happens, these messages will make the distinction
52
clearer.
53
54
* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit
50
- - Reword "your branch has diverged..." lines to reduce line length
51
-
52
-You saw the exchange on the list. Queued is my "make it shorter and make
53
-sure variable parts are closer to left edge of the screen" version but
54
-better alternatives are welcome. I suspect not many people would care too
55
-much about details, as long as the message fits and does not waste screen
56
-real estate.
57
-
58
-* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
59
- - git am --abort
60
-
61
-This one is for Ted; builds on top of the recent "am and rebase leaves
62
-ORIG_HEAD just like reset, merge and pull does" rather nicely.
63
-
64
-* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits
65
- - t7403: Submodule git mv, git rm testsuite
66
- - git rm: Support for removing submodules
67
- - git mv: Support moving submodules
68
- - submodule.*: Introduce simple C interface for submodule lookup by
69
- path
70
- - git submodule add: Fix naming clash handling
71
- - t7400: Add short "git submodule add" testsuite
72
- - git-mv: Remove dead code branch
73
-
74
-Long overdue usability improvement series for submodule. Very much
75
-welcomed. It would be nice to have some submodule improvements in 1.6.0.
76
-Realistically speaking, however, I predict that it would take us a few
77
-more rounds to hit 'next' with this, and it will not be in 'master' when
78
-1.6.0 ships.
55
+ + Reword "your branch has diverged..." lines to reduce line length
56
57
----------------------------------------------------------------
81
-[Graduated to "master"]
82
-
83
-* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits
84
- + index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
85
- + index-pack: Track the object_entry that creates each base_data
86
- + index-pack: Chain the struct base_data on the stack for traversal
87
- + index-pack: Refactor base arguments of resolve_delta into a struct
88
-
89
-* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit
90
- + git-rebase: report checkout failure
91
-
92
-* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits
93
- + Do not try to detect move/copy for entries below threshold.
94
- + Avoid rescanning unchanged entries in search for copies.
95
-
96
-This gives a drastic performance improvement to "git-blame -C -C" with
97
-quite straightforward and obvious code change.
98
-
99
-* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits
100
- + archive: remove extra arguments parsing code
101
- + archive: unify file attribute handling
102
- + archive: centralize archive entry writing
103
- + archive: add baselen member to struct archiver_args
104
- + add context pointer to read_tree_recursive()
105
- + archive: remove args member from struct archiver
106
-
107
-* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
108
- + Make usage strings dash-less
109
- + t/: Use "test_must_fail git" instead of "! git"
110
- + t/test-lib.sh: exit with small negagive int is ok with
111
- test_must_fail
112
-
113
-* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
114
- + make remove-dashes: apply to scripts and programs as well, not
115
- just to builtins
116
- + git-bisect: use dash-less form on git bisect log
117
- + t1007-hash-object.sh: use quotes for the test description
118
- + t0001-init.sh: change confusing directory name
119
-
120
-* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
121
- + git-mailinfo: use strbuf's instead of fixed buffers
122
- + Add some useful functions for strbuf manipulation.
123
- + Make some strbuf_*() struct strbuf arguments const.
124
-
125
-This actually had a tiny regression I did not discover until I merged it
126
-to 'master', where a fixup has already been applied.
127
-
128
-----------------------------------------------------------------
129
-[On Hold]
58
+[Stalled/Needs more work]
59
60
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
61
- Documentation: Improve documentation for git-imap-send(1)
@@ -141,57 +70,6 @@ with gnutls. If such a patch materializes soon, that would be good, but
70
otherwise I'll merge this as-is to 'next'. Such an enhancement can be
71
done in-tree on top of this series." Anybody?
72
144
-* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
145
- + Teach git-merge -X<option> again.
146
- + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
147
- + builtin-merge.c: use parse_options_step() "incremental parsing"
148
- machinery
149
- + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
150
-
151
-This needs to be merged to master iff/when merge-theirs gets merged,
152
-but I do not think this series is widely supported, so both are on hold.
153
-
154
-* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
155
- + Make "subtree" part more orthogonal to the rest of merge-
156
- recursive.
157
- + Teach git-pull to pass -X<option> to git-merge
158
- + Teach git-merge to pass -X<option> to the backend strategy module
159
- + git-merge-recursive-{ours,theirs}
160
- + git-merge-file --ours, --theirs
161
-
162
-Punting a merge by discarding your own work in conflicting parts but still
163
-salvaging the parts that are cleanly automerged. It is likely that this
164
-will result in nonsense mishmash, but somehow often people want this, so
165
-here they are. The interface to the backends is updated so that you can
166
-say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
167
-
168
-* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
169
- + merge: remove deprecated summary and diffstat options and config
170
- variables
171
-
172
-This was previously in "will be in master soon" category, but it turns out
173
-that the synonyms to the ones this one deletes are fairly new invention
174
-that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
175
-in 1.7.0.
176
-
177
-* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
178
- + Revert "Make clients ask for "git program" over ssh and local
179
- transport"
180
- + Make clients ask for "git program" over ssh and local transport
181
-
182
-This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
183
-timeframe.
184
-
185
-* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
186
- - diff: enable "too large a rename" warning when -M/-C is explicitly
187
- asked for
188
-
189
-This would be the right thing to do for command line use, but gitk will be
190
-hit due to tcl/tk's limitation, so I am holding this back for now.
191
-
192
-----------------------------------------------------------------
193
-[Stalled/Needs more work]
194
-
73
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
74
. cherry: cache patch-ids to avoid repeating work
75
@@ -213,6 +91,21 @@ I haven't looked at the updated series yet. I should, but nobody else
91
seems to be looking at these patches, which is somewhat depressing but
92
understandable. Summer is slower ;-)
93
94
+* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits
95
+ . t7403: Submodule git mv, git rm testsuite
96
+ . git rm: Support for removing submodules
97
+ . git mv: Support moving submodules
98
+ . submodule.*: Introduce simple C interface for submodule lookup by
99
+ path
100
+ . git submodule add: Fix naming clash handling
101
+ . t7400: Add short "git submodule add" testsuite
102
+ . git-mv: Remove dead code branch
103
+
104
+Long overdue usability improvement series for submodule. Very much
105
+welcomed. It would be nice to have some submodule improvements in 1.6.0,
106
+but it would take us a few more rounds to hit 'next' with this, and it
107
+will not be in 'master' when 1.6.0 ships.
108
+
109
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
110
- [BROKEN wrt shallow clones] Ignore graft during object transfer
111
@@ -231,3 +124,57 @@ commits that are mentioned in grafts as reachable.
124
This is for peeling the line from the blamed version to see what's behind
125
it, which may or may not help applications like gitweb.
126
127
+----------------------------------------------------------------
128
+[Will drop]
129
+
130
+* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
131
+ + Teach git-merge -X<option> again.
132
+ + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
133
+ + builtin-merge.c: use parse_options_step() "incremental parsing"
134
+ machinery
135
+ + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
136
+
137
+* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
138
+ - Document that merge strategies can now take their own options
139
+ + Make "subtree" part more orthogonal to the rest of merge-
140
+ recursive.
141
+ + Teach git-pull to pass -X<option> to git-merge
142
+ + Teach git-merge to pass -X<option> to the backend strategy module
143
+ + git-merge-recursive-{ours,theirs}
144
+ + git-merge-file --ours, --theirs
145
+
146
+It appears nobody wants "theirs" nor "ours", so I'll soon apply a
147
+wholesale revert for these series to 'next', and then these will be
148
+dropped when we rewind 'next' after 1.6.0 final.
149
+
150
+Please make sure next time somebody asks "ours/theirs" merge on the list
151
+and #git s/he is quickly told that it was unanimously rejected so that
152
+people do not have to waste time rehashing the topic ever again.
153
+
154
+----------------------------------------------------------------
155
+[On Hold]
156
+
157
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
158
+ + merge: remove deprecated summary and diffstat options and config
159
+ variables
160
+
161
+This was previously in "will be in master soon" category, but it turns out
162
+that the synonyms to the ones this one deletes are fairly new invention
163
+that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
164
+in 1.7.0.
165
+
166
+* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
167
+ + Revert "Make clients ask for "git program" over ssh and local
168
+ transport"
169
+ + Make clients ask for "git program" over ssh and local transport
170
+
171
+This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
172
+timeframe.
173
+
174
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
175
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
176
+ asked for
177
+
178
+This would be the right thing to do for command line use, but gitk will be
179
+hit due to tcl/tk's limitation, so I am holding this back for now.
180
+