What's cooking (2012/02 #03)
Junio C Hamano committed
Feb 9, 2012 at 16:02 UTC
5c8e8d619dce2533f3931ccd03f0333be270cd81
1 file changed
+237
-162
whats-cooking.txt
+237
-162
@@ -1,14 +1,13 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2012, #02; Sun, 5)
3
-X-master-at: f3fb07509c2e0b21b12a598fcd0a19a92fc38a9d
4
-X-next-at: 055e4466df114c65a2c210423938673373746f3e
2
+Subject: What's cooking in git.git (Feb 2012, #03; Thu, 9)
3
+X-master-at: 12766861cdf10fbbfda1023fd65aaf864eb8136a
4
+X-next-at: 35cc89d1e2c66d6b01c986f1d2eb3248ee5667f1
5
6
-What's cooking in git.git (Feb 2012, #02; Sun, 5)
6
+What's cooking in git.git (Feb 2012, #03; Thu, 9)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
-only in 'pu' (proposed updates) while commits prefixed with '+' are in
11
-'next'.
10
+only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
Compared to the recent activity level on discussions of new features on
13
the list, some people may be wondering if the rate of advancement of the
@@ -25,73 +24,196 @@ adding them to 'pu' only "as time and attention permit" basis, and this
24
mode of operation probably will continue throughout the second week of the
25
post v1.7.9 cycle (cf. http://tinyurl.com/gitcal).
26
28
-Here are the repositories that have my integration branches:
27
+You can find the changes described here in the integration branches of the
28
+repositories listed at
29
30
-With maint, master, next, pu, todo:
30
+ http://git-blame.blogspot.com/p/git-public-repositories.html
31
32
- git://git.kernel.org/pub/scm/git/git.git
33
- git://repo.or.cz/alt-git.git
34
- https://code.google.com/p/git-core/
35
- https://github.com/git/git
32
+--------------------------------------------------
33
+[Graduated to "master"]
34
+
35
+* bl/gitweb-project-filter (2012-02-01) 8 commits
36
+ (merged to 'next' on 2012-02-01 at 2c96ce7)
37
+ + gitweb: Make project search respect project_filter
38
+ + gitweb: improve usability of projects search form
39
+ + gitweb: place links to parent directories in page header
40
+ + gitweb: show active project_filter in project_list page header
41
+ + gitweb: limit links to alternate forms of project_list to active project_filter
42
+ + gitweb: add project_filter to limit project list to a subdirectory
43
+ + gitweb: prepare git_get_projects_list for use outside 'forks'.
44
+ + gitweb: move hard coded .git suffix out of git_get_projects_list
45
+
46
+"gitweb" allows intermediate entries in the directory hierarchy that leads
47
+to a projects to be clicked, which in turn shows the list of projects
48
+inside that directory.
49
+
50
+* jc/maint-request-pull-for-tag (2012-01-31) 1 commit
51
+ (merged to 'next' on 2012-02-01 at 7649f18)
52
+ + request-pull: explicitly ask tags/$name to be pulled
53
+
54
+When asking for a tag to be pulled, "request-pull" shows the name of the
55
+tag prefixed with "tags/"
56
+
57
+* jn/svn-fe (2012-02-02) 47 commits
58
+ (merged to 'next' on 2012-02-05 at e9d3917)
59
+ + vcs-svn: suppress a -Wtype-limits warning
60
+ + vcs-svn: allow import of > 4GiB files
61
+ + vcs-svn: rename check_overflow arguments for clarity
62
+ (merged to 'next' on 2012-02-01 at 9288c95)
63
+ + vcs-svn/svndiff.c: squelch false "unused" warning from gcc
64
+ + Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
65
+ + vcs-svn: reset first_commit_done in fast_export_init
66
+ + Merge branch 'db/text-delta' into svn-fe
67
+ + vcs-svn: do not initialize report_buffer twice
68
+ + Merge branch 'db/text-delta' into svn-fe
69
+ + vcs-svn: avoid hangs from corrupt deltas
70
+ + vcs-svn: guard against overflow when computing preimage length
71
+ + Merge branch 'db/delta-applier' into db/text-delta
72
+ + vcs-svn: implement text-delta handling
73
+ + Merge branch 'db/delta-applier' into db/text-delta
74
+ + Merge branch 'db/delta-applier' into svn-fe
75
+ + vcs-svn: cap number of bytes read from sliding view
76
+ + test-svn-fe: split off "test-svn-fe -d" into a separate function
77
+ + vcs-svn: let deltas use data from preimage
78
+ + vcs-svn: let deltas use data from postimage
79
+ + vcs-svn: verify that deltas consume all inline data
80
+ + vcs-svn: implement copyfrom_data delta instruction
81
+ + vcs-svn: read instructions from deltas
82
+ + vcs-svn: read inline data from deltas
83
+ + vcs-svn: read the preimage when applying deltas
84
+ + vcs-svn: parse svndiff0 window header
85
+ + vcs-svn: skeleton of an svn delta parser
86
+ + vcs-svn: make buffer_read_binary API more convenient
87
+ + vcs-svn: learn to maintain a sliding view of a file
88
+ + Makefile: list one vcs-svn/xdiff object or header per line
89
+ + Merge branch 'db/svn-fe-code-purge' into svn-fe
90
+ + vcs-svn: drop obj_pool
91
+ + vcs-svn: drop treap
92
+ + vcs-svn: drop string_pool
93
+ + vcs-svn: pass paths through to fast-import
94
+ + Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
95
+ + Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge
96
+ + Merge branch 'db/vcs-svn-incremental' into svn-fe
97
+ + vcs-svn: avoid using ls command twice
98
+ + vcs-svn: use mark from previous import for parent commit
99
+ + vcs-svn: handle filenames with dq correctly
100
+ + vcs-svn: quote paths correctly for ls command
101
+ + vcs-svn: eliminate repo_tree structure
102
+ + vcs-svn: add a comment before each commit
103
+ + vcs-svn: save marks for imported commits
104
+ + vcs-svn: use higher mark numbers for blobs
105
+ + vcs-svn: set up channel to read fast-import cat-blob response
106
+ + Merge commit 'v1.7.5' into svn-fe
107
37
-With only maint and master:
108
+Originally merged to 'next' on 2012-01-29.
109
39
- git://git.sourceforge.jp/gitroot/git-core/git.git
40
- git://git-core.git.sourceforge.net/gitroot/git-core/git-core
110
+"vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support
111
+incremental imports.
112
42
-With all the topics and integration branches:
113
+* jx/i18n-more-marking (2012-02-01) 2 commits
114
+ (merged to 'next' on 2012-02-05 at 44e8cf6)
115
+ + i18n: format_tracking_info "Your branch is behind" message
116
+ + i18n: git-commit whence_s "merge/cherry-pick" message
117
44
- https://github.com/gitster/git
118
+Marks a few more messages we forgot to mark for i18n.
119
46
-The preformatted documentation in HTML and man format are found in:
120
+* rt/completion-branch-edit-desc (2012-01-29) 1 commit
121
+ (merged to 'next' on 2012-02-01 at 0627ebf)
122
+ + completion: --edit-description option for git-branch
123
48
- git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/
49
- git://repo.or.cz/git-{htmldocs,manpages}.git/
50
- https://code.google.com/p/git-{htmldocs,manpages}.git/
51
- https://github.com/gitster/git-{htmldocs,manpages}.git/
124
+Originally merged to 'next' on 2012-01-31.
125
126
--------------------------------------------------
127
[New Topics]
128
56
-* bw/inet-pton-ntop-compat (2012-02-05) 1 commit
57
- - Drop system includes from inet_pton/inet_ntop compatibility wrappers
129
+* jk/config-include (2012-02-06) 2 commits
130
+ - config: add include directive
131
+ - docs: add a basic description of the config API
132
59
-The inclusion order of header files bites Solaris again and this fixes it.
133
+An assignment to the include.path pseudo-variable causes the named file
134
+to be included in-place when Git looks up configuration variables.
135
61
-Will merge to 'next'.
136
+* jk/maint-tag-show-fixes (2012-02-08) 3 commits
137
+ (merged to 'next' on 2012-02-08 at 18459c4)
138
+ + tag: do not show non-tag contents with "-n"
139
+ + tag: die when listing missing or corrupt objects
140
+ + tag: fix output of "tag -n" when errors occur
141
63
-* jc/branch-desc-typoavoidance (2012-02-05) 2 commits
64
- - branch --edit-description: protect against mistyped branch name
65
- + tests: add write_script helper function
66
- (this branch is tangled with jk/tests-write-script.)
142
+Bugfixes to "git tag -n" that lacked much error checking.
143
68
-Typo in "git branch --edit-description my-tpoic" was not diagnosed.
144
+* mm/empty-loose-error-message (2012-02-06) 1 commit
145
+ (merged to 'next' on 2012-02-07 at f119cac)
146
+ + fsck: give accurate error message on empty loose object files
147
70
-Will merge to 'next'.
148
+Updates the error message emitted when we see an empty loose object.
149
72
-* jc/checkout-out-of-unborn (2012-02-05) 1 commit
73
- - git checkout -b: allow switching out of an unborn branch
150
+* nd/columns (2012-02-08) 15 commits
151
+ - column: Fix some compiler and sparse warnings
152
+ - column: add a corner-case test to t3200
153
+ - columns: minimum coding style fixes
154
+ - tag: add --column
155
+ - column: support piping stdout to external git-column process
156
+ - status: add --column
157
+ - branch: add --column
158
+ - help: reuse print_columns() for help -a
159
+ - column: add column.ui for default column output settings
160
+ - column: support columns with different widths
161
+ - column: add columnar layout
162
+ - Stop starting pager recursively
163
+ - Add git-column and column mode parsing
164
+ - column: add API to print items in columns
165
+ - Save terminal width before setting up pager
166
75
-I am fairly negative on this one, as I think it is just shifting the
76
-problem around.
167
+The "show list of ..." mode of a handful of commands learn to produce
168
+column-oriented output.
169
78
-* jc/maint-mailmap-output (2012-02-05) 1 commit
79
- - mailmap: do not leave '>' in the output when answering "we did something"
170
+Expecting a reroll.
171
81
-map_user() was not rewriting its output correctly, which resulted in the
82
-user visible symptom that "git blame -e" sometimes showed excess '>' at
83
-the end of email addresses.
172
+* jc/maint-commit-ignore-i-t-a (2012-02-07) 1 commit
173
+ - commit: ignore intent-to-add entries instead of refusing
174
85
-* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit
86
- - merge: do not create a signed tag merge under --ff-only option
175
+Replaces the nd/commit-ignore-i-t-a series that was made unnecessary
176
+complicated by bad suggestions I made earlier.
177
88
-"git merge --ff-only $tag" failed because it cannot record the required
89
-mergetag without creating a merge, but this is so common operation for
90
-branch that is used _only_ to follow the upstream, so it is allowed to
91
-fast-forward without recording the mergetag.
178
+* jk/userdiff-config-simplify (2012-02-07) 1 commit
179
+ - drop odd return value semantics from userdiff_config
180
+
181
+Code cleanup.
182
+
183
+* js/add-e-submodule-fix (2012-02-07) 1 commit
184
+ (merged to 'next' on 2012-02-08 at c8e2d28)
185
+ + add -e: do not show difference in a submodule that is merely dirty
186
93
-* tt/profile-build-fix (2012-02-05) 1 commit
94
- - Fix build problems related to profile-directed optimization
187
+"add -e" learned not to show a diff for an otherwise unmodified submodule
188
+that only has uncommitted local changes in the patch prepared by for the
189
+user to edit.
190
+
191
+* nd/cache-tree-api-refactor (2012-02-07) 1 commit
192
+ (merged to 'next' on 2012-02-08 at a9abbca)
193
+ + cache-tree: update API to take abitrary flags
194
+
195
+Code cleanup.
196
+
197
+* tg/tag-points-at (2012-02-08) 1 commit
198
+ - tag: add --points-at list option
199
+
200
+Will merge to 'next'.
201
+
202
+* jl/maint-submodule-relative (2012-02-09) 2 commits
203
+ - submodules: always use a relative path from gitdir to work tree
204
+ - submodules: always use a relative path to gitdir
205
+
206
+* jn/merge-no-edit-fix (2012-02-09) 1 commit
207
+ - merge: do not launch an editor on "--no-edit $tag"
208
+ (this branch uses jc/merge-ff-only-stronger-than-signed-merge.)
209
+
210
+* ld/git-p4-expanded-keywords (2012-02-09) 2 commits
211
+ - git-p4: initial demonstration of possible RCS keyword fixup
212
+ - git-p4: add test case for RCS keywords
213
+
214
+* mp/make-cleanse-x-for-exe (2012-02-09) 1 commit
215
+ (merged to 'next' on 2012-02-09 at 35cc89d)
216
+ + Explicitly set X to avoid potential build breakage
217
218
--------------------------------------------------
219
[Stalled]
@@ -112,13 +234,6 @@ The bottom one has been replaced with a rewrite based on comments from
234
Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
235
give precedence to tty over SSH_ASKPASS when terminal is available.
236
115
-* nd/commit-ignore-i-t-a (2012-01-16) 2 commits
116
- - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees
117
- - cache-tree: update API to take abitrary flags
118
-
119
-May want to consider this as fixing an earlier UI mistake, and not as a
120
-feature that devides the userbase.
121
-
237
* jc/split-blob (2012-01-24) 6 commits
238
- chunked-object: streaming checkout
239
- chunked-object: fallback checkout codepaths
@@ -150,6 +265,52 @@ out. The plan is not working :-(.
265
--------------------------------------------------
266
[Cooking]
267
268
+* bw/inet-pton-ntop-compat (2012-02-05) 1 commit
269
+ (merged to 'next' on 2012-02-06 at 61303e6)
270
+ + Drop system includes from inet_pton/inet_ntop compatibility wrappers
271
+
272
+The inclusion order of header files bites Solaris again and this fixes it.
273
+
274
+* jc/branch-desc-typoavoidance (2012-02-05) 2 commits
275
+ (merged to 'next' on 2012-02-06 at 9fb0568)
276
+ + branch --edit-description: protect against mistyped branch name
277
+ + tests: add write_script helper function
278
+ (this branch is tangled with jk/tests-write-script.)
279
+
280
+Typo in "git branch --edit-description my-tpoic" was not diagnosed.
281
+
282
+* jc/checkout-out-of-unborn (2012-02-06) 1 commit
283
+ (merged to 'next' on 2012-02-07 at 60eb328)
284
+ + git checkout -b: allow switching out of an unborn branch
285
+
286
+I was fairly negative on this one, but Michael Haggerty and Peff convinced
287
+me that selling this as "'checkout -b' that lack the <start point> is
288
+about creating a new branch from my current state" is perfectly fine.
289
+
290
+* jc/maint-mailmap-output (2012-02-06) 1 commit
291
+ (merged to 'next' on 2012-02-06 at 0a21425)
292
+ + mailmap: always return a plain mail address from map_user()
293
+
294
+map_user() was not rewriting its output correctly, which resulted in the
295
+user visible symptom that "git blame -e" sometimes showed excess '>' at
296
+the end of email addresses.
297
+
298
+* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit
299
+ (merged to 'next' on 2012-02-06 at 0fabf12)
300
+ + merge: do not create a signed tag merge under --ff-only option
301
+ (this branch is used by jn/merge-no-edit-fix.)
302
+
303
+"git merge --ff-only $tag" failed because it cannot record the required
304
+mergetag without creating a merge, but this is so common operation for
305
+branch that is used _only_ to follow the upstream, so it is allowed to
306
+fast-forward without recording the mergetag.
307
+
308
+* tt/profile-build-fix (2012-02-09) 2 commits
309
+ (merged to 'next' on 2012-02-09 at 1c183af)
310
+ + Makefile: fix syntax for older make
311
+ (merged to 'next' on 2012-02-07 at c8c5f3f)
312
+ + Fix build problems related to profile-directed optimization
313
+
314
* nd/diffstat-gramnum (2012-02-03) 1 commit
315
(merged to 'next' on 2012-02-05 at 7335ecc)
316
+ Use correct grammar in diffstat summary line
@@ -159,13 +320,6 @@ the number of files changed and the number of lines inserted/deleted have
320
been updated to match the output from "diffstat". This also opens the
321
door to i18n this line.
322
162
-* jx/i18n-more-marking (2012-02-01) 2 commits
163
- (merged to 'next' on 2012-02-05 at 44e8cf6)
164
- + i18n: format_tracking_info "Your branch is behind" message
165
- + i18n: git-commit whence_s "merge/cherry-pick" message
166
-
167
-Marks a few more messages we forgot to mark for i18n.
168
-
323
* jk/grep-binary-attribute (2012-02-02) 9 commits
324
(merged to 'next' on 2012-02-05 at 9dffa7e)
325
+ grep: pre-load userdiff drivers when threaded
@@ -184,14 +338,13 @@ attributes system. Now "git grep" honors the same "binary" (or "-diff")
338
attribute.
339
340
* jc/parse-date-raw (2012-02-03) 2 commits
187
- - parse_date(): '@' prefix forces git-timestamp
188
- - parse_date(): allow ancient git-timestamp
341
+ (merged to 'next' on 2012-02-07 at 486ae6e)
342
+ + parse_date(): '@' prefix forces git-timestamp
343
+ + parse_date(): allow ancient git-timestamp
344
345
"rebase" and "commit --amend" failed to work on commits with ancient
346
timestamps near year 1970.
347
193
-Waiting for comments.
194
-
348
* jk/git-dir-lookup (2012-02-02) 1 commit
349
(merged to 'next' on 2012-02-05 at 1856d74)
350
+ standardize and improve lookup rules for external local repos
@@ -200,15 +353,14 @@ When you have both .../foo and .../foo.git, "git clone .../foo" did not
353
favor the former but the latter.
354
355
* jk/prompt-fallback-to-tty (2012-02-03) 2 commits
203
- - prompt: fall back to terminal if askpass fails
204
- - prompt: clean up strbuf usage
356
+ (merged to 'next' on 2012-02-06 at c0c995a)
357
+ + prompt: fall back to terminal if askpass fails
358
+ + prompt: clean up strbuf usage
359
360
The code to ask for password did not fall back to the terminal input when
361
GIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass
362
helper).
363
210
-Will merge to 'next'.
211
-
364
* jk/tests-write-script (2012-02-03) 2 commits
365
(merged to 'next' on 2012-02-05 at 4264ffa)
366
+ t0300: use write_script helper
@@ -228,22 +380,14 @@ Search box in "gitweb" did not accept non-ASCII characters correctly.
380
Fix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but
381
installed *.mo file and fails.
382
231
-* fc/zsh-completion (2012-02-03) 3 commits
232
- - completion: simplify __gitcomp and __gitcomp_nl implementations
233
- - completion: use ls -1 instead of rolling a loop to do that ourselves
234
- - completion: work around zsh option propagation bug
383
+* fc/zsh-completion (2012-02-06) 3 commits
384
+ (merged to 'next' on 2012-02-06 at c94dd12)
385
+ + completion: simplify __gitcomp and __gitcomp_nl implementations
386
+ + completion: use ls -1 instead of rolling a loop to do that ourselves
387
+ + completion: work around zsh option propagation bug
388
389
Fix git subcommand completion for zsh (in contrib/completion).
390
238
-Will merge to 'next'.
239
-
240
-* jc/maint-request-pull-for-tag (2012-01-31) 1 commit
241
- (merged to 'next' on 2012-02-01 at 7649f18)
242
- + request-pull: explicitly ask tags/$name to be pulled
243
-
244
-When asking for a tag to be pulled, "request-pull" shows the name of the
245
-tag prefixed with "tags/"
246
-
391
* nd/find-pack-entry-recent-cache-invalidation (2012-02-01) 2 commits
392
(merged to 'next' on 2012-02-01 at e26aed0)
393
+ find_pack_entry(): do not keep packed_git pointer locally
@@ -258,83 +402,14 @@ tag prefixed with "tags/"
402
"pack-objects" learned use parse-options, losing custom command line
403
parsing code.
404
261
-* bl/gitweb-project-filter (2012-02-01) 8 commits
262
- (merged to 'next' on 2012-02-01 at 2c96ce7)
263
- + gitweb: Make project search respect project_filter
264
- + gitweb: improve usability of projects search form
265
- + gitweb: place links to parent directories in page header
266
- + gitweb: show active project_filter in project_list page header
267
- + gitweb: limit links to alternate forms of project_list to active project_filter
268
- + gitweb: add project_filter to limit project list to a subdirectory
269
- + gitweb: prepare git_get_projects_list for use outside 'forks'.
270
- + gitweb: move hard coded .git suffix out of git_get_projects_list
271
-
272
-"gitweb" allows intermediate entries in the directory hierarchy that leads
273
-to a projects to be clicked, which in turn shows the list of projects
274
-inside that directory.
275
-
276
-* rt/completion-branch-edit-desc (2012-01-29) 1 commit
277
- (merged to 'next' on 2012-02-01 at 0627ebf)
278
- + completion: --edit-description option for git-branch
279
-
280
-Originally merged to 'next' on 2012-01-31.
281
-Will merge to 'master'.
282
-
283
-* jn/svn-fe (2012-02-02) 47 commits
284
- (merged to 'next' on 2012-02-05 at e9d3917)
285
- + vcs-svn: suppress a -Wtype-limits warning
286
- + vcs-svn: allow import of > 4GiB files
287
- + vcs-svn: rename check_overflow arguments for clarity
288
- (merged to 'next' on 2012-02-01 at 9288c95)
289
- + vcs-svn/svndiff.c: squelch false "unused" warning from gcc
290
- + Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
291
- + vcs-svn: reset first_commit_done in fast_export_init
292
- + Merge branch 'db/text-delta' into svn-fe
293
- + vcs-svn: do not initialize report_buffer twice
294
- + Merge branch 'db/text-delta' into svn-fe
295
- + vcs-svn: avoid hangs from corrupt deltas
296
- + vcs-svn: guard against overflow when computing preimage length
297
- + Merge branch 'db/delta-applier' into db/text-delta
298
- + vcs-svn: implement text-delta handling
299
- + Merge branch 'db/delta-applier' into db/text-delta
300
- + Merge branch 'db/delta-applier' into svn-fe
301
- + vcs-svn: cap number of bytes read from sliding view
302
- + test-svn-fe: split off "test-svn-fe -d" into a separate function
303
- + vcs-svn: let deltas use data from preimage
304
- + vcs-svn: let deltas use data from postimage
305
- + vcs-svn: verify that deltas consume all inline data
306
- + vcs-svn: implement copyfrom_data delta instruction
307
- + vcs-svn: read instructions from deltas
308
- + vcs-svn: read inline data from deltas
309
- + vcs-svn: read the preimage when applying deltas
310
- + vcs-svn: parse svndiff0 window header
311
- + vcs-svn: skeleton of an svn delta parser
312
- + vcs-svn: make buffer_read_binary API more convenient
313
- + vcs-svn: learn to maintain a sliding view of a file
314
- + Makefile: list one vcs-svn/xdiff object or header per line
315
- + Merge branch 'db/svn-fe-code-purge' into svn-fe
316
- + vcs-svn: drop obj_pool
317
- + vcs-svn: drop treap
318
- + vcs-svn: drop string_pool
319
- + vcs-svn: pass paths through to fast-import
320
- + Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
321
- + Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge
322
- + Merge branch 'db/vcs-svn-incremental' into svn-fe
323
- + vcs-svn: avoid using ls command twice
324
- + vcs-svn: use mark from previous import for parent commit
325
- + vcs-svn: handle filenames with dq correctly
326
- + vcs-svn: quote paths correctly for ls command
327
- + vcs-svn: eliminate repo_tree structure
328
- + vcs-svn: add a comment before each commit
329
- + vcs-svn: save marks for imported commits
330
- + vcs-svn: use higher mark numbers for blobs
331
- + vcs-svn: set up channel to read fast-import cat-blob response
332
- + Merge commit 'v1.7.5' into svn-fe
333
-
334
-Originally merged to 'next' on 2012-01-29.
335
-
336
-"vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support
337
-incremental imports.
405
+--------------------------------------------------
406
+[Discarded]
407
339
-Will merge to 'master'.
408
+* nd/commit-ignore-i-t-a (2012-02-06) 4 commits
409
+ . commit: remove commit.ignoreIntentToAdd, assume it's always true
410
+ . commit: turn commit.ignoreIntentToAdd to true by default
411
+ . commit: introduce a config key to allow as-is commit with i-t-a entries
412
+ . cache-tree: update API to take abitrary flags
413
414
+Instead of using configuration to selectively delay bugfixes like this
415
+series does, let's sell it as a pure bugfix.