What's cooking (2010/07 #01)
Junio C Hamano committed
Jul 7, 2010 at 16:50 UTC
548c6e7e3a979d5902427b289a4fff820694ec7e
1 file changed
+152
-142
whats-cooking.txt
+152
-142
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2010, #05; Sun, 27)
3
-X-master-at: 492b10766f499b60bdc867c253f36d274ac51538
4
-X-next-at: 3336145a668a798c0dd3f7363f53ae788d35dcc9
2
+Subject: What's cooking in git.git (Jul 2010, #01; Wed, 7)
3
+X-master-at: 9918285fb10d81af9021dae99c5f4de88ded497c
4
+X-next-at: d2de19aa28e5ced283c67ce145b26a327a88acd4
5
6
-What's cooking in git.git (Jun 2010, #05; Sun, 27)
6
+What's cooking in git.git (Jul 2010, #01; Wed, 7)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,64 +11,57 @@ 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
-I'd like to have most of the topics still cooking in 'next' in upcoming 1.7.2
15
-while I don't think any of the ones out of 'next' is ready; that makes
16
-today the perfect time to tag 1.7.2-rc0 ;-)
17
-
14
--------------------------------------------------
15
[Graduated to "master"]
16
21
-* ab/blame-textconv (2010-06-07) 3 commits
22
- (merged to 'next' on 2010-06-23 at a7da5af)
23
- + t/t8006: test textconv support for blame
24
- + textconv: support for blame
25
- + textconv: make the API public
26
- (this branch is used by cp/textconv-cat-file.)
27
-
28
-* cp/textconv-cat-file (2010-06-09) 5 commits
29
- + git-cat-file.txt: Document --textconv
30
- (merged to 'next' on 2010-06-23 at eb6f216)
31
- + t/t8007: test textconv support for cat-file
32
- + textconv: support for cat_file
33
- + sha1_name: add get_sha1_with_context()
34
-
35
-* jn/show-num-walks (2010-06-01) 1 commit
36
- (merged to 'next' on 2010-06-23 at e61649c)
37
- + DWIM 'git show -5' to 'git show --do-walk -5'
38
-
39
-* js/maint-am-rebase-invalid-author (2010-06-16) 1 commit
40
- (merged to 'next' on 2010-06-23 at b345ad5)
41
- + am: use get_author_ident_from_commit instead of mailinfo when rebasing
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
43
-* pb/maint-perl-errmsg-no-dir (2010-06-18) 1 commit
44
- (merged to 'next' on 2010-06-23 at 990ea67)
45
- + Git.pm: better error message
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
47
-* tr/send-email-8bit (2010-06-17) 1 commit
48
- (merged to 'next' on 2010-06-23 at be75199)
49
- + send-email: ask about and declare 8bit mails
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
51
---------------------------------------------------
52
-[New Topics]
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
55
- - url_decode: URL scheme ends with a colon and does not require a slash
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
58
- - git submodule: ignore dirty submodules for summary and status
59
- (this branch is used by jl/status-ignore-submodules and jl/status-ignore-submodules; uses jl/maint-diff-ignore-submodules.)
60
+ + git submodule: ignore dirty submodules for summary and status
61
62
* jl/status-ignore-submodules (2010-06-25) 1 commit
62
- - Add the option "--ignore-submodules" to "git status"
63
- (this branch uses jl/maint-diff-ignore-submodules, jl/maint-submodule-ignore-dirty-submodules and jl/maint-submodule-ignore-dirty-submodules.)
64
-
65
-These two looked sane; will merge to 'next' shortly.
66
-
67
-* mg/doc-rev-parse-treepath-syntax (2010-06-27) 1 commit
68
- - git-rev-parse.txt: Document ":path" specifier
69
-
70
-Swapping the two bullets in the existing documentation without anything
71
-else may be a simpler and easier-to-read alternative.
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)
@@ -78,18 +71,116 @@ else may be a simpler and easier-to-read alternative.
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
81
- (this branch is used by jn/grep-open.)
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
88
-Resurrects the tests from discarded mg/rev-parse-option-sifter-deprecation.
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
89
+
90
+--------------------------------------------------
91
+[New Topics]
92
+
93
+* jn/paginate-fix (2010-06-26) 4 commits
94
+ - git --paginate: do not commit pager choice too early
95
+ - tests: local config file should be honored from subdirs of toplevel
96
+ - t7006: test pager configuration for several git commands
97
+ - t7006 (pager): introduce helper for parameterized tests
98
+
99
+* ar/string-list-foreach (2010-07-03) 2 commits
100
+ - Convert the users of for_each_string_list to for_each_string_list_item macro
101
+ - Add a for_each_string_list_item macro
102
+ (this branch is used by tf/string-list-init.)
103
+
104
+* il/rfc-remote-fd-ext (2010-06-28) 2 commits
105
+ - New remote helper: git-remote-ext
106
+ - New remote helper git-remote-fd
107
+
108
+* ab/submodule-add-f (2010-07-05) 1 commit
109
+ - git submodule: add submodules with git add -f <path>
110
+
111
+* 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
114
+
115
+* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
116
+ - pack-refs: remove newly empty directories
117
+
118
+* hv/submodule-find-ff-merge (2010-07-07) 3 commits
119
+ - Implement automatic fast-forward merge for submodules
120
+ - setup_revisions(): Allow walking history in a submodule
121
+ - Teach ref iteration module about submodules
122
+
123
+* 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
126
+
127
+* 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
135
+
136
+* jn/fast-import-subtree (2010-06-30) 1 commit
137
+ - Teach fast-import to import subtrees named by tree id
138
+
139
+* 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
143
+
144
+* sg/rerere-gc-old-still-used (2010-07-01) 2 commits
145
+ . rerere: fix overeager gc
146
+ . mingw_utime(): handle NULL times parameter
147
+
148
+* tf/string-list-init (2010-07-04) 1 commit
149
+ - string_list: Add STRING_LIST_INIT macro and make use of it.
150
+ (this branch uses ar/string-list-foreach.)
151
+
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
@@ -100,7 +191,7 @@ moving forward.
191
- add --recode-patch option to git-am
192
- add --recode-patch option to git-mailinfo
193
103
-Perhaps another round is coming?
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
@@ -113,102 +204,21 @@ Perhaps another round is coming?
204
205
I recall there was another round of re-roll planned for this one.
206
116
-* ab/i18n (2010-06-15) 3 commits
117
- . Add initial C, Shell and Perl gettext translations
118
- . fixup! Add infrastructure
119
- . Add infrastructure for translating Git with gettext
120
-
121
-The parts that touch other topics in flight probably need to be split into
122
-separate patches; otherwise it is unmanageable.
123
-
207
--------------------------------------------------
208
[Cooking]
209
127
-* ps/gitweb-soc (2010-06-02) 2 commits
128
- (merged to 'next' on 2010-06-13 at 92245ae)
129
- + git-instaweb: Add option to reuse previous config file
130
- + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
131
-
132
-If we are going to have a configuration variable to control this, I
133
-strongly suspect that --reuse-config should be renamed so that the
134
-variable can be named more sanely and in line with whatever option
135
-that replaces it.
136
-
137
-* ab/tap (2010-06-26) 6 commits
138
- (merged to 'next' on 2010-06-27 at a761d14)
139
- + t9700: Use Test::More->builder, not $Test::Builder::Test
140
- + tests: Say "pass" rather than "ok" on empty lines for TAP
141
- + tests: Skip tests in a way that makes sense under TAP
142
- + test-lib: output a newline before "ok" under a TAP harness
143
- + test-lib: Make the test_external_* functions TAP-aware
144
- + test-lib: Adjust output to be valid TAP format
145
-
146
-Updated with a newer round with support for older Test::More before 0.94
147
-version.
148
-
149
-* ar/decorate-color (2010-06-24) 4 commits
150
- - Allow customizable commit decorations colors
151
- - log --decorate: Colorize commit decorations
152
- - log-tree.c: Use struct name_decoration's type for classifying decoration
153
- - commit.h: add 'type' to struct name_decoration
210
+* jn/grep-open (2010-07-02) 1 commit
211
+ - grep -O: Do not pass color sequences as filenames to pager
212
155
-Tests, perhaps? Otherwise looked sane.
213
+* ab/i18n (2010-06-23) 1 commit
214
+ - Add infrastructure for translating Git with gettext
215
216
* tc/checkout-B (2010-06-24) 3 commits
217
- builtin/checkout: learn -B
218
- builtin/checkout: reword hint for -b
219
- add tests for checkout -b
220
162
-* as/maint-completion-set-u-fix (2010-06-17) 1 commit
163
- (merged to 'next' on 2010-06-27 at 24ce8c2)
164
- + bash-completion: Fix __git_ps1 to work with "set -u"
165
-
166
-* tr/rev-list-count (2010-06-17) 2 commits
167
- (merged to 'next' on 2010-06-27 at 0525b63)
168
- + bash completion: Support "divergence from upstream" messages in __git_ps1
169
- + rev-list: introduce --count option
170
-
171
-* jl/maint-diff-ignore-submodules (2010-06-25) 3 commits
172
- (merged to 'next' on 2010-06-25 at d75dbf1)
173
- + t4027,4041: Use test -s to test for an empty file
174
- (merged to 'next' on 2010-06-23 at 057acb7)
175
- + Add optional parameters to the diff option "--ignore-submodules"
176
- + git diff: rename test that had a conflicting name
177
- (this branch is used by jl/maint-submodule-ignore-dirty-submodules and jl/status-ignore-submodules.)
178
-
179
-* jn/grep-open (2010-06-26) 8 commits
180
- (merged to 'next' on 2010-06-27 at 84c0976)
181
- + Merge branch 'jp/string-list-api-cleanup' into jn/grep-open
182
- (merged to 'next' on 2010-06-22 at 8edca58)
183
- + t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
184
- + t/t7811-grep-open.sh: ensure fake "less" is made executable
185
- + t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
186
- (merged to 'next' on 2010-06-18 at cf96ea8)
187
- + grep -O: allow optional argument specifying the pager (or editor)
188
- + grep: Add the option '--open-files-in-pager'
189
- + Unify code paths of threaded greps
190
- + grep: refactor grep_objects loop into its own function
191
- (this branch uses jp/string-list-api-cleanup.)
192
-
193
-* eb/double-convert-before-merge (2010-06-16) 1 commit
194
- - ll-merge: Normalize files before merging
195
-
196
-* cc/cherry-pick-stdin (2010-06-14) 2 commits
197
- (merged to 'next' on 2010-06-27 at 3af0bba)
198
- + revert: accept arbitrary rev-list options
199
- + t3508 (cherry-pick): futureproof against unmerged files
200
-
201
---------------------------------------------------
202
-[Discarded]
203
-
204
-* mg/rev-parse-lrbranches-locals (2010-05-14) 1 commit
205
- . revlist: Introduce --lrbranches and --locals revision specifiers
206
- (this branch uses mg/rev-parse-option-sifter-deprecation.)
207
-
208
-* mg/rev-parse-option-sifter-deprecation (2010-05-14) 3 commits
209
- . t6018: make sure all tested symbolic names are different revs
210
- . t6018: add tests for rev-list's --branches and --tags
211
- . rev-parse: deprecate use as an option sifter
212
-
213
-The tests are resurrected in a separate branch, though.
214
-
221
+* eb/double-convert-before-merge (2010-07-02) 3 commits
222
+ - Don't expand CRLFs when normalizing text during merge
223
+ - Try normalizing files to avoid delete/modify conflicts when merging
224
+ - Avoid conflicts when merging branches with mixed normalization