What's cooking (2010/07 #03)
Junio C Hamano committed
Jul 16, 2010 at 22:12 UTC
2a20a45b0ddade59612cc44c613e46aa5ae9d211
1 file changed
+119
-86
whats-cooking.txt
+119
-86
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2010, #02; Wed, 14)
3
-X-master-at: fc051572a3fe171286f10761bd33946c48de3f7f
4
-X-next-at: 910a0b50db9dba6767ac37e4782912a006093248
2
+Subject: What's cooking in git.git (Jul 2010, #03; Fri, 16)
3
+X-master-at: 24e7a5be373c95f977bab4f0f41f736bb1d25075
4
+X-next-at: 917297fa2312cb1baef4b7467153f116c1850589
5
6
-What's cooking in git.git (Jul 2010, #02; Wed, 14)
6
+What's cooking in git.git (Jul 2010, #03; Fri, 16)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,13 +11,105 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-v1.7.2-rc3 has been tagged and hopefully we can have the final release
15
-this weekend. I've moved some fixes from 'pu' to 'next' but I'd like to
16
-defer them for a bit longer.
14
+I've ended up merging a few more fixes to 'master'; please give it a good
15
+final round of testing so that we can have the real thing mid next week.
16
+
17
+Thanks.
18
19
--------------------------------------------------
20
[New Topics]
21
22
+* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
23
+ - sha1_file: Show the the type and path to corrupt objects
24
+
25
+* cc/revert (2010-07-14) 4 commits
26
+ - revert: improve success message by adding abbreviated commit sha1
27
+ - revert: don't print "Finished one cherry-pick." if commit failed
28
+ - revert: refactor commit code into a new run_git_commit() function
29
+ - revert: report success when using option --strategy
30
+
31
+* en/fast-export-fix (2010-07-07) 2 commits
32
+ . fast-export: Add a --full-tree option
33
+ . fast-export: Fix dropping of files with --import-marks and path limiting
34
+
35
+Seems to have breakage in test 9350 (possibly others but I didn't look).
36
+
37
+* jn/parse-date-basic (2010-07-15) 1 commit
38
+ - Export parse_date_basic() to convert a date string to timestamp
39
+ (this branch is used by rr/svn-export.)
40
+
41
+* kf/post-receive-sample-hook (2010-07-16) 1 commit
42
+ - post-receive-email: optional message line count limit
43
+
44
+* tr/rfc-reset-doc (2010-07-16) 5 commits
45
+ - Documentation/reset: move "undo permanently" example behind "make topic"
46
+ - Documentation/reset: reorder examples to match description
47
+ - Documentation/reset: promote 'examples' one section up
48
+ - Documentation/reset: separate options by mode
49
+ - Documentation/git-reset: reorder modes for soft-mixed-hard progression
50
+
51
+--------------------------------------------------
52
+[Graduated to "master"]
53
+
54
+* ab/submodule-add-f (2010-07-05) 1 commit
55
+ (merged to 'next' on 2010-07-14 at 4ab3d00)
56
+ + git submodule: add submodules with git add -f <path>
57
+
58
+* bc/maint-makefile-fixes (2010-07-06) 2 commits
59
+ (merged to 'next' on 2010-07-14 at 294ab08)
60
+ + Makefile: work around ksh's failure to handle missing list argument to for loop
61
+ + Makefile: remove some unnecessary curly braces
62
+
63
+* eb/doc-log-manpage (2010-07-07) 1 commit
64
+ (merged to 'next' on 2010-07-14 at d073ef2)
65
+ + Reorganize `git-log' man page to clarify common diff options.
66
+
67
+* jc/diff-merge-base-multi (2010-07-16) 2 commits
68
+ + diff A...B: do not limit the syntax too narrowly
69
+ + diff A...B: give one possible diff when there are more than one merge-base
70
+
71
+* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
72
+ (merged to 'next' on 2010-07-14 at 2273bd2)
73
+ + rebase-i: do not get fooled by a log message ending with backslash
74
+ + rebase-i: style fix
75
+
76
+* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit
77
+ (merged to 'next' on 2010-07-14 at 43cc5ef)
78
+ + do not write out index when status does not have to
79
+
80
+* jn/grep-open (2010-07-02) 1 commit
81
+ (merged to 'next' on 2010-07-14 at c057fd6)
82
+ + grep -O: Do not pass color sequences as filenames to pager
83
+
84
+* jn/paginate-fix (2010-06-26) 4 commits
85
+ + git --paginate: do not commit pager choice too early
86
+ + tests: local config file should be honored from subdirs of toplevel
87
+ + t7006: test pager configuration for several git commands
88
+ + t7006 (pager): introduce helper for parameterized tests
89
+
90
+* jn/tests (2010-07-10) 1 commit
91
+ (merged to 'next' on 2010-07-14 at 390c1f6)
92
+ + t3000 (ls-files -o): modernize style
93
+
94
+* js/merge-rr-fix (2010-07-14) 1 commit
95
+ + MERGE_RR is in .git, not .git/rr-cache
96
+
97
+* mg/revision-doc (2010-07-05) 3 commits
98
+ (merged to 'next' on 2010-07-14 at 416a2ad)
99
+ + Documentation: link to gitrevisions rather than git-rev-parse
100
+ + Documentation: gitrevisions
101
+ + Documentation: split off rev doc into include file
102
+
103
+* ns/merge-recursive-uptodate (2010-07-09) 1 commit
104
+ + merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
105
+
106
+* wp/merge-tree-fix (2010-07-14) 2 commits
107
+ + merge-tree: fix where two branches share no changes
108
+ + add basic tests for merge-tree
109
+
110
+--------------------------------------------------
111
+[Stalled -- would discard unless there are some movements soon]
112
+
113
* by/log-range-diff (2010-07-12) 18 commits
114
. Minimum fix to make by/log-range-diff topic at least compile
115
. add test cases for '--graph' of line level log
@@ -40,41 +132,6 @@ defer them for a bit longer.
132
133
Seems to break some tests in t403X range but we are not in a hurry.
134
43
-* eb/doc-log-manpage (2010-07-07) 1 commit
44
- (merged to 'next' on 2010-07-14 at d073ef2)
45
- + Reorganize `git-log' man page to clarify common diff options.
46
-
47
-* hv/autosquash-config (2010-07-14) 1 commit
48
- - add configuration variable for --autosquash option of interactive rebase
49
-
50
-* jh/graph-next-line (2010-07-13) 2 commits
51
- - Enable custom schemes for column colors in the graph API
52
- - Make graph_next_line() available in the graph.h API
53
-
54
-* jl/add-n-ignore-missing (2010-07-10) 1 commit
55
- - git add: Add the "--ignore-missing" option for the dry run
56
-
57
-* jn/tests (2010-07-10) 1 commit
58
- (merged to 'next' on 2010-07-14 at 390c1f6)
59
- + t3000 (ls-files -o): modernize style
60
-
61
-* ns/merge-recursive-uptodate (2010-07-09) 1 commit
62
- - merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
63
-
64
-* jc/diff-merge-base-multi (2010-07-12) 1 commit
65
- (merged to 'next' on 2010-07-14 at 910a0b5)
66
- + diff A...B: give one possible diff when there are more than one merge-base
67
-
68
-* js/merge-rr-fix (2010-07-14) 1 commit
69
- - MERGE_RR is in .git, not .git/rr-cache
70
-
71
-* wp/merge-tree-fix (2010-07-14) 2 commits
72
- - merge-tree: fix where two branches share no changes
73
- - add basic tests for merge-tree
74
-
75
---------------------------------------------------
76
-[Stalled -- would discard unless there are some movements soon]
77
-
135
* ps/gitweb-soc (2010-06-02) 2 commits
136
(merged to 'next' on 2010-06-13 at 92245ae)
137
+ git-instaweb: Add option to reuse previous config file
@@ -97,17 +154,6 @@ moving forward.
154
155
I recall there was another round of re-roll planned for this one.
156
100
-* rr/svn-export (2010-06-10) 7 commits
101
- - Add LICENSE
102
- - Add SVN dump parser
103
- - Add infrastructure to write revisions in fast-export format
104
- - Add stream helper library
105
- - Add library for string-specific memory pool
106
- - Add cpp macro implementation of treaps
107
- - Add memory pool library
108
-
109
-I recall there was another round of re-roll planned for this one.
110
-
157
* jk/tag-contains (2010-07-05) 4 commits
158
- Why is "git tag --contains" so slow?
159
- default core.clockskew variable to one day
@@ -117,11 +163,26 @@ I recall there was another round of re-roll planned for this one.
163
--------------------------------------------------
164
[Cooking]
165
120
-* jn/paginate-fix (2010-06-26) 4 commits
121
- - git --paginate: do not commit pager choice too early
122
- - tests: local config file should be honored from subdirs of toplevel
123
- - t7006: test pager configuration for several git commands
124
- - t7006 (pager): introduce helper for parameterized tests
166
+* rr/svn-export (2010-07-15) 8 commits
167
+ - Add SVN dump parser
168
+ - Add infrastructure to write revisions in fast-export format
169
+ - Add stream helper library
170
+ - Add string-specific memory pool
171
+ - vcs-svn: treap_search should return NULL for missing items
172
+ - Add treap implementation
173
+ - Add memory pool library
174
+ - Introduce vcs-svn lib
175
+ (this branch uses jn/parse-date-basic.)
176
+
177
+* hv/autosquash-config (2010-07-14) 1 commit
178
+ - add configuration variable for --autosquash option of interactive rebase
179
+
180
+* jh/graph-next-line (2010-07-13) 2 commits
181
+ - Enable custom schemes for column colors in the graph API
182
+ - Make graph_next_line() available in the graph.h API
183
+
184
+* jl/add-n-ignore-missing (2010-07-10) 1 commit
185
+ - git add: Add the "--ignore-missing" option for the dry run
186
187
* ar/string-list-foreach (2010-07-03) 2 commits
188
- Convert the users of for_each_string_list to for_each_string_list_item macro
@@ -132,15 +193,6 @@ I recall there was another round of re-roll planned for this one.
193
- New remote helper: git-remote-ext
194
- New remote helper git-remote-fd
195
135
-* ab/submodule-add-f (2010-07-05) 1 commit
136
- (merged to 'next' on 2010-07-14 at 4ab3d00)
137
- + git submodule: add submodules with git add -f <path>
138
-
139
-* bc/maint-makefile-fixes (2010-07-06) 2 commits
140
- (merged to 'next' on 2010-07-14 at 294ab08)
141
- + Makefile: work around ksh's failure to handle missing list argument to for loop
142
- + Makefile: remove some unnecessary curly braces
143
-
196
* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
197
(merged to 'next' on 2010-07-14 at 7d25131)
198
+ pack-refs: remove newly empty directories
@@ -150,24 +202,9 @@ I recall there was another round of re-roll planned for this one.
202
- setup_revisions(): Allow walking history in a submodule
203
- Teach ref iteration module about submodules
204
153
-* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
154
- (merged to 'next' on 2010-07-14 at 2273bd2)
155
- + rebase-i: do not get fooled by a log message ending with backslash
156
- + rebase-i: style fix
157
-
158
-* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit
159
- (merged to 'next' on 2010-07-14 at 43cc5ef)
160
- + do not write out index when status does not have to
161
-
205
* jn/fast-import-subtree (2010-06-30) 1 commit
206
- Teach fast-import to import subtrees named by tree id
207
165
-* mg/revision-doc (2010-07-05) 3 commits
166
- (merged to 'next' on 2010-07-14 at 416a2ad)
167
- + Documentation: link to gitrevisions rather than git-rev-parse
168
- + Documentation: gitrevisions
169
- + Documentation: split off rev doc into include file
170
-
208
* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
209
- rerere: fix overeager gc
210
- mingw_utime(): handle NULL times parameter
@@ -185,10 +222,6 @@ I recall there was another round of re-roll planned for this one.
222
+ Add a rename + D/F conflict testcase
223
+ Add additional testcases for D/F conflicts
224
188
-* jn/grep-open (2010-07-02) 1 commit
189
- (merged to 'next' on 2010-07-14 at c057fd6)
190
- + grep -O: Do not pass color sequences as filenames to pager
191
-
225
* ab/i18n (2010-07-10) 1 commit
226
- Add infrastructure for translating Git with gettext
227