What's cooking (2010/08 #03)
Junio C Hamano committed
Aug 15, 2010 at 01:53 UTC
3c03212970b0e52ef6d09b586ba7ff4e1f2ffa6a
1 file changed
+252
-259
whats-cooking.txt
+252
-259
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2010, #02; Wed, 11)
3
-X-master-at: 7980e41746bc5de91eea775f9142ce44b1100361
4
-X-next-at: ca9fef0665a1958ac7895c60b29faa8be1e281e0
2
+Subject: What's cooking in git.git (Aug 2010, #03; Sun, 15)
3
+X-master-at: 3d045897585c4b1ca0dce6bb5a33331f1b48c2bf
4
+X-next-at: f2a27ee4a32784537ae739b7c6668eec567dd60c
5
6
-What's cooking in git.git (Aug 2010, #02; Wed, 11)
6
+What's cooking in git.git (Aug 2010, #03; Sun, 15)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,14 +11,148 @@ 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
-Has the rate of patch traffic increased markedly for the past few months?
15
-I am feeling perpetually behind these days...
16
-
14
--------------------------------------------------
15
[New Topics]
16
17
+* ab/perl-install (2010-08-03) 1 commit
18
+ (merged to 'next' on 2010-08-14 at f2a27ee)
19
+ + perl/Makefile: Unset INSTALL_BASE when making perl.mak
20
+
21
+* ab/test (2010-08-14) 6 commits
22
+ - t/Makefile: Create test-results dir for smoke target
23
+ - Merge branch 'ab/test-no-skip'
24
+ - Merge branch 'ab/test-coverage'
25
+ - Merge branch 'ab/test-smoke'
26
+ - Merge branch 'ab/test-prereq'
27
+ - Merge branch 'ab/omit-aggregate-test-result-under-tap-harness'
28
+ (this branch uses ab/omit-aggregate-test-result-under-tap-harness, ab/test-coverage, ab/test-no-skip, ab/test-prereq and ab/test-smoke.)
29
+
30
+All the test-related topics seem to be almost ready for 'next', so I made
31
+a single aggregate of them in preparation for merging (there is one fix-up
32
+already still on 'pu', which is good).
33
+
34
+* jc/maint-follow-rename-fix (2010-08-13) 2 commits
35
+ (merged to 'next' on 2010-08-14 at 16706d6)
36
+ + diff --follow: do call diffcore_std() as necessary
37
+ + diff --follow: do not waste cycles while recursing
38
+
39
+* dj/fetch-tagopt (2010-08-11) 1 commit
40
+ - fetch: allow command line --tags to override config
41
+
42
+* po/userdiff-csharp (2010-08-11) 1 commit
43
+ - Userdiff patterns for C#
44
+
45
+--------------------------------------------------
46
+[Graduated to "master"]
47
+
48
+* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits
49
+ (merged to 'next' on 2010-08-11 at 59dd30e)
50
+ + Makefile: make hard/symbolic links for non-builtins too
51
+ + Makefile: link builtins residing in bin directory to main git binary too
52
+
53
+* jc/sha1-name-find-fix (2010-08-02) 1 commit
54
+ (merged to 'next' on 2010-08-11 at 51106a5)
55
+ + sha1_name.c: fix parsing of ":/token" syntax
56
+
57
+* jn/doc-pull (2010-08-02) 1 commit
58
+ (merged to 'next' on 2010-08-11 at a223479)
59
+ + Documentation: flesh out “git pull” description
60
+
61
+* jn/maint-gitweb-dynconf (2010-07-30) 1 commit
62
+ (merged to 'next' on 2010-08-11 at a94ce85)
63
+ + gitweb: allow configurations that change with each request
64
+
65
+* jn/parse-date-basic (2010-07-15) 1 commit
66
+ (merged to 'next' on 2010-08-11 at ca9fef0)
67
+ + Export parse_date_basic() to convert a date string to timestamp
68
+ (this branch is used by rr/svn-export.)
69
+
70
+* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit
71
+ (merged to 'next' on 2010-08-11 at 0a6369e)
72
+ + smart-http: Don't deadlock on server failure
73
+
74
+Will merge to 'maint' later.
75
+
76
+* tr/rfc-reset-doc (2010-07-18) 5 commits
77
+ (merged to 'next' on 2010-08-11 at 8e7c8d1)
78
+ + Documentation/reset: move "undo permanently" example behind "make topic"
79
+ + Documentation/reset: reorder examples to match description
80
+ + Documentation/reset: promote 'examples' one section up
81
+ + Documentation/reset: separate options by mode
82
+ + Documentation/git-reset: reorder modes for soft-mixed-hard progression
83
+
84
+--------------------------------------------------
85
+[Stalled]
86
+
87
+* zl/mailinfo-recode-patch (2010-06-14) 2 commits
88
+ - add --recode-patch option to git-am
89
+ - add --recode-patch option to git-mailinfo
90
+
91
+I recall there was another round of re-roll planned for this one.
92
+
93
+* jk/tag-contains (2010-07-05) 4 commits
94
+ - Why is "git tag --contains" so slow?
95
+ - default core.clockskew variable to one day
96
+ - limit "contains" traversals based on commit timestamp
97
+ - tag: speed up --contains calculation
98
+
99
+* jn/commit-no-change-wo-status (2010-08-11) 10 commits
100
+ . t6040 (branch tracking): check “status” instead of “commit”
101
+ . commit: suppress status summary when no changes staged
102
+ . commit --dry-run: give advice on empty amend
103
+ . commit: give empty-commit avoidance code its own function
104
+ . t7508 (status): modernize style
105
+ . commit: split off the piece that writes status
106
+ . commit: split commit -s handling into its own function
107
+ . commit: split off a function to fetch the default log message
108
+ . wt-status: split off a function for printing submodule summary
109
+ . wt-status: split wt_status_print into digestible pieces
110
+
111
+There seemed to be some doubts on removal of the "no changes" line?
112
+
113
+--------------------------------------------------
114
+[Cooking]
115
+
116
+* jn/paginate-fix (2010-08-05) 13 commits
117
+ - merge-file: run setup_git_directory_gently() sooner
118
+ - var: run setup_git_directory_gently() sooner
119
+ - ls-remote: run setup_git_directory_gently() sooner
120
+ - index-pack: run setup_git_directory_gently() sooner
121
+ - Merge branch 'jn/maint-setup-fix' (early part) into HEAD
122
+ - config: run setup_git_directory_gently() sooner
123
+ - bundle: run setup_git_directory_gently() sooner
124
+ - apply: run setup_git_directory_gently() sooner
125
+ - grep: run setup_git_directory_gently() sooner
126
+ - shortlog: run setup_git_directory_gently() sooner
127
+ - git wrapper: allow setup_git_directory_gently() be called earlier
128
+ - setup: remember whether repository was found
129
+ - git wrapper: introduce startup_info struct
130
+ (this branch uses jn/maint-setup-fix.)
131
+
132
+Merging this to 'pu' seems to break some tests...
133
+
134
+* jn/merge-renormalize (2010-08-05) 12 commits
135
+ - merge-recursive --renormalize
136
+ - rerere: never renormalize
137
+ - rerere: migrate to parse-options API
138
+ - t4200 (rerere): modernize style
139
+ - ll-merge: let caller decide whether to renormalize
140
+ - ll-merge: make flag easier to populate
141
+ - Documentation/technical: document ll_merge
142
+ - merge-trees: let caller decide whether to renormalize
143
+ - merge-trees: push choice to renormalize away from low level
144
+ - t6038 (merge.renormalize): check that it can be turned off
145
+ - t6038 (merge.renormalize): try checkout -m and cherry-pick
146
+ - t6038 (merge.renormalize): style nitpicks
147
+ (this branch uses eb/double-convert-before-merge.)
148
+
149
+There were heavy merge conflicts in t4200; I tried to be careful when
150
+merging this, but extra sets of eyeballs from parties involved (Jonathan
151
+and Szeder) would always be a good idea.
152
+
153
* ab/omit-aggregate-test-result-under-tap-harness (2010-08-11) 1 commit
154
- test-lib: Don't write test-results when HARNESS_ACTIVE
155
+ (this branch is used by ab/test.)
156
157
* ab/test-prereq (2010-08-11) 5 commits
158
- test-lib: Multi-prereq support only checked the last prereq
@@ -26,18 +160,16 @@ I am feeling perpetually behind these days...
160
- t/README: Document the predefined test prerequisites
161
- test-lib: Print missing prerequisites in test output
162
- test-lib: Add support for multiple test prerequisites
163
+ (this branch is used by ab/test.)
164
165
* ab/test-smoke (2010-08-08) 4 commits
166
- t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
167
- t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
168
- t/README: Document the Smoke testing
169
- tests: Infrastructure for Git smoke testing
170
+ (this branch is used by ab/test.)
171
36
-Will merge the above three topics to 'next' together with other "test"
37
-topics from the same author shortly.
38
-
39
-* by/line-log (2010-08-11) 18 commits
40
- - line-log: minimum compilation fix
172
+* by/line-log (2010-08-11) 17 commits
173
- Document line history browser
174
- Add tests for line history browser
175
- Add --full-line-diff option
@@ -56,91 +188,44 @@ topics from the same author shortly.
188
- parse-options: add two helper functions
189
- parse-options: enhance STOP_AT_NON_OPTION
190
59
-Does not seem to pass the self test for me...
60
-
191
* dg/local-mod-error-messages (2010-08-11) 5 commits
62
- - t7609: test merge and checkout error messages
63
- - unpack_trees: group error messages by type
64
- - merge-recursive: distinguish "removed" and "overwritten" messages
65
- - merge-recursive: porcelain messages for checkout
66
- - Turn unpack_trees_options.msgs into an array + enum
67
-
68
-Looking good.
69
-
70
-* en/rebase-against-rebase-fix (2010-08-06) 2 commits
71
- - pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
72
- - t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
192
+ (merged to 'next' on 2010-08-14 at e684ca8)
193
+ + t7609: test merge and checkout error messages
194
+ + unpack_trees: group error messages by type
195
+ + merge-recursive: distinguish "removed" and "overwritten" messages
196
+ + merge-recursive: porcelain messages for checkout
197
+ + Turn unpack_trees_options.msgs into an array + enum
198
+
199
+* en/rebase-against-rebase-fix (2010-08-12) 2 commits
200
+ (merged to 'next' on 2010-08-14 at 1dea7b9)
201
+ + pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
202
+ + t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
203
204
* gb/split-cmdline-errmsg (2010-08-07) 1 commit
75
- - split_cmdline: Allow caller to access error string
76
-
77
-* jc/builtin-binsearch (2010-08-05) 2 commits
78
- . git.c: binary search in the built-in command list
79
- . git.c: sort the list of built-in command names
205
+ (merged to 'next' on 2010-08-14 at 41146ff)
206
+ + split_cmdline: Allow caller to access error string
207
208
* jl/submodule-ignore-diff (2010-08-06) 4 commits
82
- - Add tests for the diff.ignoreSubmodules config option
83
- - Add the 'diff.ignoreSubmodules' config setting
84
- - Submodules: Use "ignore" settings from .gitmodules too for diff and status
85
- - Submodules: Add the new "ignore" config option for diff and status
86
-
87
-Looking good.
88
-
89
-* jn/commit-no-change-wo-status (2010-07-24) 9 commits
90
- . commit: suppress status summary when no changes staged
91
- . commit --dry-run: give advice on empty amend
92
- . commit: give empty-commit avoidance code its own function
93
- . t7508 (status): modernize style
94
- . commit: split off the piece that writes status
95
- . commit: split commit -s handling into its own function
96
- . commit: split off a function to fetch the default log message
97
- . wt-status: split off a function for printing submodule summary
98
- . wt-status: split wt_status_print into digestible pieces
99
-
100
-* jn/merge-renormalize (2010-08-05) 12 commits
101
- . merge-recursive --renormalize
102
- . rerere: never renormalize
103
- . rerere: migrate to parse-options API
104
- . t4200 (rerere): modernize style
105
- . ll-merge: let caller decide whether to renormalize
106
- . ll-merge: make flag easier to populate
107
- . Documentation/technical: document ll_merge
108
- . merge-trees: let caller decide whether to renormalize
109
- . merge-trees: push choice to renormalize away from low level
110
- . t6038 (merge.renormalize): check that it can be turned off
111
- . t6038 (merge.renormalize): try checkout -m and cherry-pick
112
- . t6038 (merge.renormalize): style nitpicks
113
- (this branch uses eb/double-convert-before-merge.)
114
-
115
-* jn/paginate-fix (2010-08-05) 13 commits
116
- . merge-file: run setup_git_directory_gently() sooner
117
- . var: run setup_git_directory_gently() sooner
118
- . ls-remote: run setup_git_directory_gently() sooner
119
- . index-pack: run setup_git_directory_gently() sooner
120
- . Merge branch 'jn/maint-setup-fix' (early part) into HEAD
121
- . config: run setup_git_directory_gently() sooner
122
- . bundle: run setup_git_directory_gently() sooner
123
- . apply: run setup_git_directory_gently() sooner
124
- . grep: run setup_git_directory_gently() sooner
125
- . shortlog: run setup_git_directory_gently() sooner
126
- . git wrapper: allow setup_git_directory_gently() be called earlier
127
- . setup: remember whether repository was found
128
- . git wrapper: introduce startup_info struct
129
- (this branch uses jn/maint-setup-fix.)
130
-
131
-I had trouble merging these three topics to 'pu' and ran out of time my
132
-git Wednesday this week. I think the "no-change-wo-status" one had some
133
-unintended consequences discovered on the list?
209
+ (merged to 'next' on 2010-08-12 at ffe84bb)
210
+ + Add tests for the diff.ignoreSubmodules config option
211
+ + Add the 'diff.ignoreSubmodules' config setting
212
+ + Submodules: Use "ignore" settings from .gitmodules too for diff and status
213
+ + Submodules: Add the new "ignore" config option for diff and status
214
215
* jn/maint-plug-leak (2010-08-09) 3 commits
136
- - write-tree: Avoid leak when index refers to an invalid object
137
- - read-tree: stop leaking tree objects
138
- - core: Stop leaking ondisk_cache_entrys
139
-
140
-Will fast-track merging to 'next', 'master' and 'maint' after giving it
141
-another look.
142
-
143
-* jn/svn-fe (2010-08-09) 10 commits
216
+ (merged to 'next' on 2010-08-14 at ec2ba20)
217
+ + write-tree: Avoid leak when index refers to an invalid object
218
+ + read-tree: stop leaking tree objects
219
+ + core: Stop leaking ondisk_cache_entrys
220
+
221
+* jn/svn-fe (2010-08-13) 16 commits
222
+ - t9010 (svn-fe): avoid symlinks in test
223
+ - t9010 (svn-fe): use Unix-style path in URI
224
+ - vcs-svn: Avoid %z in format string
225
+ - vcs-svn: Rename dirent pool to build on Windows
226
+ - compat: add strtok_r()
227
+ - treap: style fix
228
+ - vcs-svn: remove build artifacts on "make clean"
229
- svn-fe manual: Clarify warning about deltas in dump files
230
- Update svn-fe manual
231
- SVN dump parser
@@ -150,11 +235,8 @@ another look.
235
- Add treap implementation
236
- Add memory pool library
237
- Introduce vcs-svn lib
153
- - Export parse_date_basic() to convert a date string to timestamp
238
155
-There was a screw-up on my part---I should have dropped the first one and
156
-branched this off of jn/parse-date-basic (I'll fix it up before merging
157
-this to 'next').
239
+Added patches to port to Windows.
240
241
* js/detached-stash (2010-08-10) 9 commits
242
- Documentation: git stash branch now tolerates non-stash references.
@@ -167,83 +249,23 @@ this to 'next').
249
- stash: extract stash-like check into its own function
250
- stash: refactor - create pop_stash function
251
170
-Haven't looked this new round closely yet.
171
-
172
-* mm/rebase-i-exec (2010-08-10) 2 commits
173
- - test-lib: user-friendly alternatives to test [-d|-f|-e]
174
- - rebase -i: add exec command to launch a shell command
252
+Sent out comments...
253
176
-Looking good.
254
+* mm/rebase-i-exec (2010-08-13) 4 commits
255
+ (merged to 'next' on 2010-08-14 at 17620dc)
256
+ + git-rebase--interactive.sh: use printf instead of echo to print commit message
257
+ + git-rebase--interactive.sh: rework skip_unnecessary_picks
258
+ (merged to 'next' on 2010-08-12 at 377e3f0)
259
+ + test-lib: user-friendly alternatives to test [-d|-f|-e]
260
+ + rebase -i: add exec command to launch a shell command
261
262
* so/http-user-agent (2010-08-11) 1 commit
179
- - Allow HTTP user agent string to be modified.
180
-
181
-Looking good.
182
-
183
-* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit
184
- (merged to 'next' on 2010-08-11 at 0a6369e)
185
- + smart-http: Don't deadlock on server failure
186
-
187
-Will fast-track merging to 'master' and 'maint' after giving it another
188
-look.
189
-
190
---------------------------------------------------
191
-[Ejected]
192
-
193
-* rr/svn-export (2010-07-29) 9 commits
194
- . vcs-svn: Remove stray calls to removed functions
195
- . Add SVN dump parser
196
- . Add infrastructure to write revisions in fast-export format
197
- . Add stream helper library
198
- . Add string-specific memory pool
199
- . vcs-svn: treap_search should return NULL for missing items
200
- . Add treap implementation
201
- . Add memory pool library
202
- . Introduce vcs-svn lib
203
- (this branch uses jn/parse-date-basic.)
204
-
205
-Replaced with Jonathan's reroll.
206
-
207
---------------------------------------------------
208
-[Stalled]
209
-
210
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
211
- - add --recode-patch option to git-am
212
- - add --recode-patch option to git-mailinfo
213
-
214
-I recall there was another round of re-roll planned for this one.
215
-
216
-* jk/tag-contains (2010-07-05) 4 commits
217
- - Why is "git tag --contains" so slow?
218
- - default core.clockskew variable to one day
219
- - limit "contains" traversals based on commit timestamp
220
- - tag: speed up --contains calculation
221
-
222
---------------------------------------------------
223
-[Cooking]
224
-
225
-* jc/sha1-name-find-fix (2010-08-02) 1 commit
226
- (merged to 'next' on 2010-08-11 at 51106a5)
227
- + sha1_name.c: fix parsing of ":/token" syntax
228
-
229
-Will merge to 'master' (and perhaps 'maint').
230
-
231
-* jn/doc-pull (2010-08-02) 1 commit
232
- (merged to 'next' on 2010-08-11 at a223479)
233
- + Documentation: flesh out “git pull” description
234
-
235
-Will merge to 'master'.
236
-
237
-* jn/maint-gitweb-dynconf (2010-07-30) 1 commit
238
- (merged to 'next' on 2010-08-11 at a94ce85)
239
- + gitweb: allow configurations that change with each request
240
-
241
-Will merge to 'master'.
263
+ (merged to 'next' on 2010-08-12 at 86cc5c4)
264
+ + Allow HTTP user agent string to be modified.
265
266
* sr/local-config (2010-08-03) 1 commit
244
- - config: add --local option
245
-
246
-Looked Ok. Will merge to 'next'.
267
+ (merged to 'next' on 2010-08-12 at 431f7af)
268
+ + config: add --local option
269
270
* ab/test-coverage (2010-07-26) 8 commits
271
- Makefile: make gcov invocation configurable
@@ -254,6 +276,7 @@ Looked Ok. Will merge to 'next'.
276
- Makefile: Split out the untested functions target
277
- Makefile: Include subdirectories in "make cover" reports
278
- gitignore: Ignore files generated by "make coverage"
279
+ (this branch is used by ab/test.)
280
281
* ab/test-no-skip (2010-08-10) 13 commits
282
- git-notes: Run partial expensive test everywhere
@@ -269,44 +292,37 @@ Looked Ok. Will merge to 'next'.
292
- t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
293
- t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
294
- tests: implicitly skip SYMLINKS tests using <prereq>
272
-
273
-* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits
274
- (merged to 'next' on 2010-08-11 at 59dd30e)
275
- + Makefile: make hard/symbolic links for non-builtins too
276
- + Makefile: link builtins residing in bin directory to main git binary too
277
-
278
-Will merge to 'master'.
295
+ (this branch is used by ab/test.)
296
297
* cc/find-commit-subject (2010-07-22) 6 commits
281
- - blame: use find_commit_subject() instead of custom code
282
- - merge-recursive: use find_commit_subject() instead of custom code
283
- - bisect: use find_commit_subject() instead of custom code
284
- - revert: rename variables related to subject in get_message()
285
- - revert: refactor code to find commit subject in find_commit_subject()
286
- - revert: fix off by one read when searching the end of a commit subject
287
-
288
-Looked Ok. Will merge to 'next'.
298
+ (merged to 'next' on 2010-08-12 at ce38436)
299
+ + blame: use find_commit_subject() instead of custom code
300
+ + merge-recursive: use find_commit_subject() instead of custom code
301
+ + bisect: use find_commit_subject() instead of custom code
302
+ + revert: rename variables related to subject in get_message()
303
+ + revert: refactor code to find commit subject in find_commit_subject()
304
+ + revert: fix off by one read when searching the end of a commit subject
305
306
* gb/shell-ext (2010-07-28) 3 commits
307
- Add sample commands for git-shell
308
- Add interactive mode to git-shell for user-friendliness
309
- Allow creation of arbitrary git-shell commands
310
311
+Replaced the first one with the version that uses getenv("HOME")
312
+
313
* jc/log-grep (2010-07-19) 1 commit
314
- git log: add -G<regexp> that greps in the patch text
315
316
This is broken, but haven't found any time to revisit it yet.
317
318
* jh/clean-exclude (2010-07-20) 2 commits
301
- - Add test for git clean -e.
302
- - Add -e/--exclude to git-clean.
303
-
304
-Looked Ok. Will merge to 'next'.
319
+ (merged to 'next' on 2010-08-12 at 9a63fd4)
320
+ + Add test for git clean -e.
321
+ + Add -e/--exclude to git-clean.
322
323
* jh/use-test-must-fail (2010-07-20) 1 commit
307
- - Convert "! git" to "test_must_fail git"
308
-
309
-Looked Ok. Will merge to 'next'.
324
+ (merged to 'next' on 2010-08-12 at 16d4e11)
325
+ + Convert "! git" to "test_must_fail git"
326
327
* jn/apply-filename-with-sp (2010-07-23) 4 commits
328
- apply: Handle traditional patches with space in filename
@@ -314,14 +330,13 @@ Looked Ok. Will merge to 'next'.
330
- tests: Test how well "git apply" copes with weird filenames
331
- apply: Split quoted filename handling into new function
332
317
-Looked Ok. Will merge to 'next'.
333
+prereq?
334
335
* jn/fix-abbrev (2010-07-27) 3 commits
320
- - examples/commit: use --abbrev for commit summary
321
- - checkout, commit: remove confusing assignments to rev.abbrev
322
- - archive: abbreviate substituted commit ids again
323
-
324
-Looked Ok. Will merge to 'next'.
336
+ (merged to 'next' on 2010-08-12 at 2cf70df)
337
+ + examples/commit: use --abbrev for commit summary
338
+ + checkout, commit: remove confusing assignments to rev.abbrev
339
+ + archive: abbreviate substituted commit ids again
340
341
* jn/maint-setup-fix (2010-07-24) 11 commits
342
- setup: split off a function to handle ordinary .git directories
@@ -338,42 +353,32 @@ Looked Ok. Will merge to 'next'.
353
(this branch is used by jn/paginate-fix.)
354
355
* jn/rebase-rename-am (2008-11-10) 5 commits
341
- - rebase: protect against diff.renames configuration
342
- - t3400 (rebase): whitespace cleanup
343
- - Teach "apply --index-info" to handle rename patches
344
- - t4150 (am): futureproof against failing tests
345
- - t4150 (am): style fix
346
-
347
-Will merge to 'next'.
356
+ (merged to 'next' on 2010-08-12 at a6d25c4)
357
+ + rebase: protect against diff.renames configuration
358
+ + t3400 (rebase): whitespace cleanup
359
+ + Teach "apply --index-info" to handle rename patches
360
+ + t4150 (am): futureproof against failing tests
361
+ + t4150 (am): style fix
362
363
* ml/rebase-x-strategy (2010-07-29) 1 commit
350
- - rebase: support -X to pass through strategy options
351
-
352
-Looked Ok. Will merge to 'next'.
364
+ (merged to 'next' on 2010-08-12 at 0aa2fdb)
365
+ + rebase: support -X to pass through strategy options
366
367
* mm/shortopt-detached (2010-08-05) 5 commits
355
- - log: parse separate option for --glob
356
- - log: parse separate options like git log --grep foo
357
- - diff: parse separate options --stat-width n, --stat-name-width n
358
- - diff: split off a function for --stat-* option parsing
359
- - diff: parse separate options like -S foo
360
-
361
-Looked Ok. Will merge to 'next'.
368
+ (merged to 'next' on 2010-08-12 at 35ceb98)
369
+ + log: parse separate option for --glob
370
+ + log: parse separate options like git log --grep foo
371
+ + diff: parse separate options --stat-width n, --stat-name-width n
372
+ + diff: split off a function for --stat-* option parsing
373
+ + diff: parse separate options like -S foo
374
375
* nd/fix-sparse-checkout (2010-07-31) 5 commits
364
- - unpack-trees: mark new entries skip-worktree appropriately
365
- - unpack-trees: do not check for conflict entries too early
366
- - unpack-trees: let read-tree -u remove index entries outside sparse area
367
- - unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
368
- - t1011 (sparse checkout): style nitpicks
369
-
370
-Looked Ok. Will merge to 'next'.
371
-
372
-* tr/ab-i18n-fix (2010-07-25) 1 commit
373
- - tests: locate i18n lib&data correctly under --valgrind
374
- (this branch uses ab/i18n.)
375
-
376
-Looked Ok. Will merge to 'next'.
376
+ (merged to 'next' on 2010-08-12 at 4f7a3b9)
377
+ + unpack-trees: mark new entries skip-worktree appropriately
378
+ + unpack-trees: do not check for conflict entries too early
379
+ + unpack-trees: let read-tree -u remove index entries outside sparse area
380
+ + unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
381
+ + t1011 (sparse checkout): style nitpicks
382
383
* tr/maint-no-unquote-plus (2010-07-24) 1 commit
384
- Do not unquote + into ' ' in URLs
@@ -383,49 +388,31 @@ Looked Ok. Will merge to 'next'.
388
+ xsize_t: check whether we lose bits
389
390
* vs/doc-spell (2010-07-20) 1 commit
386
- - Documentation: spelling fixes
387
-
388
-Looked Ok. Will merge to 'next'.
391
+ (merged to 'next' on 2010-08-12 at 3fbd06c)
392
+ + Documentation: spelling fixes
393
394
* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
391
- - sha1_file: Show the the type and path to corrupt objects
392
-
393
-Looked Ok. Will merge to 'next'.
395
+ (merged to 'next' on 2010-08-12 at 8a9e1d0)
396
+ + sha1_file: Show the the type and path to corrupt objects
397
398
* cc/revert (2010-07-21) 5 commits
396
- - t3508: add check_head_differs_from() helper function and use it
397
- - revert: improve success message by adding abbreviated commit sha1
398
- - revert: don't print "Finished one cherry-pick." if commit failed
399
- - revert: refactor commit code into a new run_git_commit() function
400
- - revert: report success when using option --strategy
399
+ (merged to 'next' on 2010-08-14 at a910d5a)
400
+ + t3508: add check_head_differs_from() helper function and use it
401
+ + revert: improve success message by adding abbreviated commit sha1
402
+ + revert: don't print "Finished one cherry-pick." if commit failed
403
+ + revert: refactor commit code into a new run_git_commit() function
404
+ + revert: report success when using option --strategy
405
406
* en/fast-export-fix (2010-07-17) 2 commits
407
- fast-export: Add a --full-tree option
408
- fast-export: Fix dropping of files with --import-marks and path limiting
409
406
-* jn/parse-date-basic (2010-07-15) 1 commit
407
- (merged to 'next' on 2010-08-11 at ca9fef0)
408
- + Export parse_date_basic() to convert a date string to timestamp
409
- (this branch is used by rr/svn-export.)
410
-
411
-Will merge to 'master'.
412
-
410
* kf/post-receive-sample-hook (2010-07-16) 1 commit
414
- - post-receive-email: optional message line count limit
411
+ (merged to 'next' on 2010-08-12 at 9b7e3c9)
412
+ + post-receive-email: optional message line count limit
413
414
I do not particularly like the idea of counting number of lines in a shell
415
loop but this is an opt-in feature to a contrib/ item so it should be ok.
418
-Will merge to 'next'.
419
-
420
-* tr/rfc-reset-doc (2010-07-18) 5 commits
421
- (merged to 'next' on 2010-08-11 at 8e7c8d1)
422
- + Documentation/reset: move "undo permanently" example behind "make topic"
423
- + Documentation/reset: reorder examples to match description
424
- + Documentation/reset: promote 'examples' one section up
425
- + Documentation/reset: separate options by mode
426
- + Documentation/git-reset: reorder modes for soft-mixed-hard progression
427
-
428
-Looked fine. Will merge to 'master'.
416
417
* hv/autosquash-config (2010-07-14) 1 commit
418
- add configuration variable for --autosquash option of interactive rebase
@@ -441,7 +428,9 @@ Looked fine. Will merge to 'master'.
428
+ Add a for_each_string_list_item macro
429
(this branch is used by tf/string-list-init.)
430
444
-* il/rfc-remote-fd-ext (2010-07-31) 4 commits
431
+* il/rfc-remote-fd-ext (2010-08-14) 6 commits
432
+ - Fix build on Windows
433
+ - Simplify send_git_request()
434
- Rewrite bidirectional traffic loop
435
- gitignore: Ignore the new /git-remote-{ext,fd} helpers
436
- New remote helper: git-remote-ext
@@ -462,10 +451,13 @@ Looked fine. Will merge to 'master'.
451
- mingw_utime(): handle NULL times parameter
452
453
* tf/string-list-init (2010-07-04) 1 commit
465
- - string_list: Add STRING_LIST_INIT macro and make use of it.
454
+ (merged to 'next' on 2010-08-14 at 193b4db)
455
+ + string_list: Add STRING_LIST_INIT macro and make use of it.
456
(this branch uses ar/string-list-foreach.)
457
468
-* en/d-f-conflict-fix (2010-07-27) 7 commits
458
+* en/d-f-conflict-fix (2010-08-12) 8 commits
459
+ (merged to 'next' on 2010-08-14 at 1c9b0f5)
460
+ + Mark tests that use symlinks as needing SYMLINKS prerequisite
461
(merged to 'next' on 2010-08-03 at 7f78604)
462
+ t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
463
+ fast-import: Improve robustness when D->F changes provided in wrong order
@@ -475,10 +467,11 @@ Looked fine. Will merge to 'master'.
467
+ Add a rename + D/F conflict testcase
468
+ Add additional testcases for D/F conflicts
469
478
-* ab/i18n (2010-07-19) 2 commits
470
+* ab/i18n (2010-07-25) 4 commits
471
+ - tests: locate i18n lib&data correctly under --valgrind
472
+ - gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
473
- tests: rename test to work around GNU gettext bug
474
- Add infrastructure for translating Git with gettext
481
- (this branch is used by tr/ab-i18n-fix.)
475
476
* tc/checkout-B (2010-08-10) 4 commits
477
(merged to 'next' on 2010-08-11 at 5433b51)