What's cooiking (2010/07 #02)
Junio C Hamano committed
Jul 14, 2010 at 15:21 UTC
7b2eca862cff860c7607b3152e3df082341b3e48
1 file changed
+136
-157
whats-cooking.txt
+136
-157
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2010, #01; Wed, 7)
3
-X-master-at: 9918285fb10d81af9021dae99c5f4de88ded497c
4
-X-next-at: d2de19aa28e5ced283c67ce145b26a327a88acd4
2
+Subject: What's cooking in git.git (Jul 2010, #02; Wed, 14)
3
+X-master-at: fc051572a3fe171286f10761bd33946c48de3f7f
4
+X-next-at: 910a0b50db9dba6767ac37e4782912a006093248
5
6
-What's cooking in git.git (Jul 2010, #01; Wed, 7)
6
+What's cooking in git.git (Jul 2010, #02; Wed, 14)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,85 +11,112 @@ 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
---------------------------------------------------
15
-[Graduated to "master"]
16
-
17
-* ab/tap (2010-06-28) 7 commits
18
- (merged to 'next' on 2010-06-29 at c73dc30)
19
- + t/t9700/test.pl: don't access private object members, use public access methods
20
- (merged to 'next' on 2010-06-27 at a761d14)
21
- + t9700: Use Test::More->builder, not $Test::Builder::Test
22
- + tests: Say "pass" rather than "ok" on empty lines for TAP
23
- + tests: Skip tests in a way that makes sense under TAP
24
- + test-lib: output a newline before "ok" under a TAP harness
25
- + test-lib: Make the test_external_* functions TAP-aware
26
- + test-lib: Adjust output to be valid TAP format
27
-
28
-* ar/decorate-color (2010-06-29) 5 commits
29
- (merged to 'next' on 2010-06-30 at 2d72999)
30
- + Add test for correct coloring of git log --decoration
31
- + Allow customizable commit decorations colors
32
- + log --decorate: Colorize commit decorations
33
- + log-tree.c: Use struct name_decoration's type for classifying decoration
34
- + commit.h: add 'type' to struct name_decoration
35
-
36
-* as/maint-completion-set-u-fix (2010-06-17) 1 commit
37
- (merged to 'next' on 2010-06-27 at 24ce8c2)
38
- + bash-completion: Fix __git_ps1 to work with "set -u"
39
-
40
-* cc/cherry-pick-stdin (2010-06-14) 4 commits
41
- (merged to 'next' on 2010-06-29 at ee7a28a)
42
- + revert: do not rebuild argv on heap
43
- + Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin
44
- (merged to 'next' on 2010-06-27 at 3af0bba)
45
- + revert: accept arbitrary rev-list options
46
- + t3508 (cherry-pick): futureproof against unmerged files
47
-
48
-* jk/url-decode (2010-06-24) 1 commit
49
- (merged to 'next' on 2010-06-28 at 5144a8f)
50
- + url_decode: URL scheme ends with a colon and does not require a slash
51
-
52
-* jl/maint-diff-ignore-submodules (2010-06-25) 3 commits
53
- (merged to 'next' on 2010-06-25 at d75dbf1)
54
- + t4027,4041: Use test -s to test for an empty file
55
- (merged to 'next' on 2010-06-23 at 057acb7)
56
- + Add optional parameters to the diff option "--ignore-submodules"
57
- + git diff: rename test that had a conflicting name
58
-
59
-* jl/maint-submodule-ignore-dirty-submodules (2010-06-25) 1 commit
60
- + git submodule: ignore dirty submodules for summary and status
61
-
62
-* jl/status-ignore-submodules (2010-06-25) 1 commit
63
- (merged to 'next' on 2010-06-28 at bd9ae9e)
64
- + Add the option "--ignore-submodules" to "git status"
65
-
66
-* jp/string-list-api-cleanup (2010-06-26) 6 commits
67
- (merged to 'next' on 2010-06-27 at b1e8b97)
68
- + string_list: Fix argument order for string_list_append
69
- + string_list: Fix argument order for string_list_lookup
70
- + string_list: Fix argument order for string_list_insert_at_index
71
- + string_list: Fix argument order for string_list_insert
72
- + string_list: Fix argument order for for_each_string_list
73
- + string_list: Fix argument order for print_string_list
74
-
75
-* mg/doc-rev-parse-treepath-syntax (2010-06-28) 2 commits
76
- (merged to 'next' on 2010-06-30 at be16ac8)
77
- + git-rev-parse.txt: Add more examples for caret and colon
78
- + git-rev-parse.txt: Document ":path" specifier
79
-
80
-* mg/rev-parse-tests (2010-05-14) 2 commits
81
- (merged to 'next' on 2010-06-27 at 3336145)
82
- + t6018: make sure all tested symbolic names are different revs
83
- + t6018: add tests for rev-list's --branches and --tags
84
-
85
-* tr/rev-list-count (2010-06-17) 2 commits
86
- (merged to 'next' on 2010-06-27 at 0525b63)
87
- + bash completion: Support "divergence from upstream" messages in __git_ps1
88
- + rev-list: introduce --count option
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.
17
18
--------------------------------------------------
19
[New Topics]
20
21
+* by/log-range-diff (2010-07-12) 18 commits
22
+ . Minimum fix to make by/log-range-diff topic at least compile
23
+ . add test cases for '--graph' of line level log
24
+ . line.c output the '--graph' padding before each line
25
+ . add parent rewrite feature to line level log
26
+ . make rewrite_parents an external function
27
+ . some document update
28
+ . add two test cases
29
+ . add --always-print option
30
+ . map/print ranges along traversing the history topologically
31
+ . print the line log
32
+ . map/take range to parent
33
+ . add range clone functions
34
+ . export three functions from diff.c
35
+ . parse the -L options
36
+ . refactor parse_loc
37
+ . add the basic data structure for line level history
38
+ . parse-options: add two helper functions
39
+ . parse-options: stop when encounter a non-option
40
+
41
+Seems to break some tests in t403X range but we are not in a hurry.
42
+
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
+
78
+* ps/gitweb-soc (2010-06-02) 2 commits
79
+ (merged to 'next' on 2010-06-13 at 92245ae)
80
+ + git-instaweb: Add option to reuse previous config file
81
+ + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
82
+
83
+If we are going to have a configuration variable to control this, I
84
+strongly suspect that --reuse-config should be renamed so that the
85
+variable can be named more sanely and in line with whatever option
86
+that replaces it.
87
+
88
+* js/rebase-origin-x (2010-02-05) 1 commit
89
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
90
+
91
+I retract my objection against the idea of -x; needs polishing before
92
+moving forward.
93
+
94
+* zl/mailinfo-recode-patch (2010-06-14) 2 commits
95
+ - add --recode-patch option to git-am
96
+ - add --recode-patch option to git-mailinfo
97
+
98
+I recall there was another round of re-roll planned for this one.
99
+
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
+
111
+* jk/tag-contains (2010-07-05) 4 commits
112
+ - Why is "git tag --contains" so slow?
113
+ - default core.clockskew variable to one day
114
+ - limit "contains" traversals based on commit timestamp
115
+ - tag: speed up --contains calculation
116
+
117
+--------------------------------------------------
118
+[Cooking]
119
+
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
@@ -106,14 +133,17 @@ still holding onto them.
133
- New remote helper git-remote-fd
134
135
* ab/submodule-add-f (2010-07-05) 1 commit
109
- - git submodule: add submodules with git add -f <path>
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
112
- - Makefile: work around ksh's failure to handle missing list argument to for loop
113
- - Makefile: remove some unnecessary curly braces
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
144
* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
116
- - pack-refs: remove newly empty directories
145
+ (merged to 'next' on 2010-07-14 at 7d25131)
146
+ + pack-refs: remove newly empty directories
147
148
* hv/submodule-find-ff-merge (2010-07-07) 3 commits
149
- Implement automatic fast-forward merge for submodules
@@ -121,96 +151,45 @@ still holding onto them.
151
- Teach ref iteration module about submodules
152
153
* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
124
- - rebase-i: do not get fooled by a log message ending with backslash
125
- - rebase-i: style fix
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
128
- - do not write out index when status does not have to
129
-
130
-* jk/tag-contains (2010-07-05) 4 commits
131
- - Why is "git tag --contains" so slow?
132
- - default core.clockskew variable to one day
133
- - limit "contains" traversals based on commit timestamp
134
- - tag: speed up --contains calculation
159
+ (merged to 'next' on 2010-07-14 at 43cc5ef)
160
+ + do not write out index when status does not have to
161
162
* jn/fast-import-subtree (2010-06-30) 1 commit
163
- Teach fast-import to import subtrees named by tree id
164
165
* mg/revision-doc (2010-07-05) 3 commits
140
- - Documentation: link to gitrevisions rather than git-rev-parse
141
- - Documentation: gitrevisions
142
- - Documentation: split off rev doc into include file
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
144
-* sg/rerere-gc-old-still-used (2010-07-01) 2 commits
145
- . rerere: fix overeager gc
146
- . mingw_utime(): handle NULL times parameter
171
+* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
172
+ - rerere: fix overeager gc
173
+ - mingw_utime(): handle NULL times parameter
174
175
* tf/string-list-init (2010-07-04) 1 commit
176
- string_list: Add STRING_LIST_INIT macro and make use of it.
177
(this branch uses ar/string-list-foreach.)
178
152
-* en/d-f-conflict-fix (2010-07-07) 9 commits
153
- - Merge branch 'jc/d-f-conflict-fix-fixup' into en/d-f-conflict-fix
154
- - fast-import: Improve robustness when D->F changes provided in wrong order
155
- - Fixup (5)
156
- - fast-export: Fix output order of D/F changes
157
- - Fixup (4)
158
- - merge_recursive: Fix renames across paths below D/F conflicts
159
- - Fixup (3)
160
- - merge-recursive: Fix D/F conflicts
161
- - Add a rename + D/F conflict testcase
162
- (this branch uses jc/d-f-conflict-fix-fixup.)
163
-
164
-* jc/d-f-conflict-fix-fixup (2010-07-07) 4 commits
165
- - Fixup (2)
166
- - Add a rename + D/F conflict testcase
167
- - Fixup (1)
168
- - Add additional testcases for D/F conflicts
169
- (this branch is used by en/d-f-conflict-fix.)
170
-
171
---------------------------------------------------
172
-[Stalled -- would discard unless there are some movements soon]
173
-
174
-* ps/gitweb-soc (2010-06-02) 2 commits
175
- (merged to 'next' on 2010-06-13 at 92245ae)
176
- + git-instaweb: Add option to reuse previous config file
177
- + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
178
-
179
-If we are going to have a configuration variable to control this, I
180
-strongly suspect that --reuse-config should be renamed so that the
181
-variable can be named more sanely and in line with whatever option
182
-that replaces it.
183
-
184
-* js/rebase-origin-x (2010-02-05) 1 commit
185
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
186
-
187
-I retract my objection against the idea of -x; needs polishing before
188
-moving forward.
189
-
190
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
191
- - add --recode-patch option to git-am
192
- - add --recode-patch option to git-mailinfo
193
-
194
-I recall there was another round of re-roll planned for this one.
195
-
196
-* rr/svn-export (2010-06-10) 7 commits
197
- - Add LICENSE
198
- - Add SVN dump parser
199
- - Add infrastructure to write revisions in fast-export format
200
- - Add stream helper library
201
- - Add library for string-specific memory pool
202
- - Add cpp macro implementation of treaps
203
- - Add memory pool library
204
-
205
-I recall there was another round of re-roll planned for this one.
206
-
207
---------------------------------------------------
208
-[Cooking]
179
+* en/d-f-conflict-fix (2010-07-09) 6 commits
180
+ (merged to 'next' on 2010-07-14 at 2b2a810)
181
+ + fast-import: Improve robustness when D->F changes provided in wrong order
182
+ + fast-export: Fix output order of D/F changes
183
+ + merge_recursive: Fix renames across paths below D/F conflicts
184
+ + merge-recursive: Fix D/F conflicts
185
+ + Add a rename + D/F conflict testcase
186
+ + Add additional testcases for D/F conflicts
187
188
* jn/grep-open (2010-07-02) 1 commit
211
- - grep -O: Do not pass color sequences as filenames to pager
189
+ (merged to 'next' on 2010-07-14 at c057fd6)
190
+ + grep -O: Do not pass color sequences as filenames to pager
191
213
-* ab/i18n (2010-06-23) 1 commit
192
+* ab/i18n (2010-07-10) 1 commit
193
- Add infrastructure for translating Git with gettext
194
195
* tc/checkout-B (2010-06-24) 3 commits