What's cooking (2010/03 #1)
Junio C Hamano committed
Mar 3, 2010 at 16:00 UTC
99d047e93f215963ceeaa79fb795976307dbb893
1 file changed
+319
-257
whats-cooking.txt
+319
-257
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2010, #06; Tue, 23)
3
-X-master-at: 0901d5a2ef80996cf64c8afeaec765e1bc09f795
4
-X-next-at: ac4ec8fb00b9defe6763ade89af32f420a97b5ed
2
+Subject: What's cooking in git.git (Mar 2010, #01; Wed, 03)
3
+X-master-at: 6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3
4
+X-next-at: d855a59a115b20c6483b87c1e71e287d1c7e8b6c
5
6
-What's cooking in git.git (Feb 2010, #06; Tue, 23)
6
+What's cooking in git.git (Mar 2010, #01; Wed, 03)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,173 +12,17 @@ marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
--------------------------------------------------
15
-[New Topics]
16
-
17
-* gb/submodule-env (2010-02-23) 2 commits
18
- - submodules: ensure clean environment when operating in a submodule
19
- - shell setup: clear_local_git_env() function
20
-
21
-This is a round before the round with hardcoded list on the C side. I
22
-think the idea of the new one is basically sound, but I do not think it
23
-should create a new source file nor call it cache.c which obviously this
24
-thing is not (environment.c might be a better home for it).
25
-
26
-* jl/maint-submodule-clear-env (2010-02-23) 1 commit
27
- - is_submodule_modified(): clear environment properly
28
-
29
-I'd prefer to rebuild this on top of rerolled gb/submodule-env before
30
-moving it forward.
31
-
32
-* il/loosen-remote-helper-names (2010-02-23) 1 commit
33
- - Allow '+', '-' and '.' in remote helper names
34
-
35
-Judging from the discussion, the conclusion seemed to be that Dscho was
36
-needlessly worried about using '+' in pathnames on DOS, and the patch is
37
-Ok. There also was a discussion on how to sanely deal with the need to
38
-have duplicated binaries with the current set-up, only to handle
39
-essentially the same svn+ssh:// and ssh+svn:// protocols; I however think
40
-that is pretty much orthogonal to the issue of what letters can be used in
41
-names.
42
-
43
-* jk/maint-add--interactive-delete (2010-02-22) 1 commit
44
- - add-interactive: fix bogus diff header line ordering
45
-
46
-Looked Ok for 'next'.
47
-
48
-* js/runtime-prefix-trace-not-warn (2010-02-23) 1 commit
49
- - Print RUNTIME_PREFIX warning only when GIT_TRACE is set
50
-
51
-Looked Ok for 'next'.
52
-
53
-* lt/deepen-builtin-source (2010-02-22) 1 commit
54
- - Move 'builtin-*' into a 'builtin/' subdirectory
55
-
56
-This is a painful one to keep out of 'master' for a long time, as any
57
-topic with new builtin commands will need evil merges to adjust to it.
58
-
59
-* tc/http-cleanup (2010-02-21) 7 commits
60
- - remote-curl: init walker only when needed
61
- - remote-curl: use http_fetch_ref() instead of walker wrapper
62
- - http: init and cleanup separately from http-walker
63
- - http-walker: cleanup more thoroughly
64
- - http-push: remove useless condition
65
- - t554[01]-http-push: refactor, add non-ff tests
66
- - t5541-http-push: check that ref is unchanged for non-ff test
67
-
68
-Didn't look; there was some discussion that may result in a reroll.
69
-
70
-* tr/notes-display (2010-02-23) 11 commits
71
- - notes: add shorthand --ref to override GIT_NOTES_REF
72
- - commit --amend: copy notes to the new commit
73
- - rebase: support automatic notes copying
74
- - notes: implement helpers needed for note copying during rewrite
75
- - notes: implement 'git notes copy --stdin'
76
- - rebase -i: invoke post-rewrite hook
77
- - rebase: invoke post-rewrite hook
78
- - commit --amend: invoke post-rewrite hook
79
- - Documentation: document post-rewrite hook
80
- - Support showing notes from more than one notes tree
81
- - test-lib: unset GIT_NOTES_REF to stop it from influencing tests
82
- (this branch uses jh/notes.)
83
-
84
-Didn't look too carefully except for the second one.
85
-
86
-* ts/svn-mergeinfo (2010-02-22) 3 commits
87
- - git-svn: Fix discarding of extra parents from svn:mergeinfo
88
- - t9151: Add two new svn:mergeinfo test cases
89
- - t9151: Fix a few commits in the SVN dump
90
-
91
-I won't pick up git-svn patches myself without Acks from Eric and/or Sam;
92
-there are here only so that they won't be forgotten.
93
-
94
-* cw/test-lib-relicense (2010-02-22) 1 commit
95
- . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
96
-
97
-I think a reasonable way forward would be to collect Acks from everybody
98
-who appears on "git blame" or "git shortlog" output. How do people feel
99
-about relicensing the whole (except for the obviously borrowed bits, such
100
-as xdiff/) under GPLv2 _or later_? I am not a big fan of GPLv3 and do not
101
-see a compelling reason to switch to v3 for the sake of v3 license per-se,
102
-but helping others that want to use our code might tip the balance.
103
-
104
---------------------------------------------------
105
-[Stalled]
106
-
107
-* ld/push-porcelain (2010-02-09) 4 commits
108
- - git-push: fix an error message so it goes to stderr
109
- - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected
110
- - git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
111
- - git-push: squelch advice message if in --porcelain mode
112
-
113
-This needs further simplification, judging from the previous discussion?
114
-
115
-* sd/format-patch-to (2010-02-17) 1 commit
116
- - Add 'git format-patch --to=' option and 'format.to' configuration variable.
117
-
118
-Shouldn't be too hard to add tests to t4014; other than that looked ready
119
-for 'next'.
120
-
121
-* sd/init-template (2010-02-17) 2 commits
122
- - Add a "TEMPLATE DIRECTORY" section to git-init[1].
123
- - Add `init.templatedir` configuration variable.
124
-
125
-Shouldn't be too hard to add tests to t0001; other than that looked ready
126
-for 'next'.
127
-
128
-* sd/log-decorate (2010-02-17) 3 commits
129
- - log.decorate: usability fixes
130
- - Add `log.decorate' configuration variable.
131
- - git_config_maybe_bool()
132
-
133
-Probably ready for 'next', except that people need to be warned about
134
-having to update their scripts to explicitly pass --no-decorate to keep
135
-them working. A good idea to disable this when --pretty was given, just
136
-like notes are disabled by default, was floated.
137
-
138
-* pb/log-first-parent-p-m (2010-02-10) 1 commit
139
- (merged to 'next' on 2010-02-17 at 2f8e5ae)
140
- + git log -p -m: document -m and honor --first-parent
141
-
142
-Needs tests but otherwise looked fine. We might want to teach "-m trumps
143
-implicit --cc" to "git show", but that is a totally separate topic.
144
-
145
-I actually care about this "log -p --first-parent" very much, but if Pasky
146
-is counting on that and procrastinating until I write the tests myself, he
147
-is in for a dissapointment. I don't have that much free time these days.
148
-Help is appreciated.
149
-
150
-* js/rebase-origin-x (2010-02-05) 1 commit
151
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
152
-
153
-I retract my objection against the idea of -x; needs polishing before
154
-moving forward.
155
-
156
---------------------------------------------------
157
-[Cooking]
15
+[Graduated to "master"]
16
17
* dp/read-not-mmap-small-loose-object (2010-02-21) 1 commit
18
(merged to 'next' on 2010-02-21 at fa39a9a)
19
+ hash-object: don't use mmap() for small files
20
163
-Will merge to 'master' after a few more days of cooking.
164
-
21
* np/compress-loose-object-memsave (2010-02-21) 2 commits
22
(merged to 'next' on 2010-02-21 at 1e558d6)
23
+ sha1_file: be paranoid when creating loose objects
24
+ sha1_file: don't malloc the whole compressed result when writing out objects
25
170
-Will merge to 'master' after a few more days of cooking.
171
-
172
-* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit
173
- - mailinfo: do not strip leading spaces even for a header line
174
-
175
-Ready for 'next', I think.
176
-
177
-* ne/pack-local-doc (2010-02-18) 1 commit
178
- - Documentation: pack-objects: Clarify --local's semantics.
179
-
180
-Comments from pack experts?
181
-
26
* ml/connect-refactor (2010-02-17) 1 commit
27
(merged to 'next' on 2010-02-21 at 7361651)
28
+ connect.c: move duplicated code to a new function 'get_host_and_port'
@@ -197,18 +41,6 @@ Comments from pack experts?
41
(merged to 'next' on 2010-02-21 at db276f4)
42
+ refactor duplicated code in builtin-send-pack.c and transport.c
43
200
-Will merge to 'master' soonish.
201
-
202
-* mm/mkstemps-mode-for-packfiles (2010-02-22) 6 commits
203
- - Use git_mkstemp_mode instead of plain mkstemp to create object files
204
- - git_mkstemps_mode: don't set errno to EINVAL on exit.
205
- - Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
206
- - git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
207
- - Move gitmkstemps to path.c
208
- - Add a testcase for ACL with restrictive umask.
209
-
210
-Looked Ok for 'next'.
211
-
44
* rs/optim-text-wrap (2010-02-19) 4 commits
45
(merged to 'next' on 2010-02-21 at 70ef189)
46
+ utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
@@ -216,41 +48,15 @@ Looked Ok for 'next'.
48
+ utf8.c: remove print_spaces()
49
+ utf8.c: remove print_wrapped_text()
50
219
-Will merge to 'master' soonish.
220
-
51
* tr/maint-cherry-pick-list (2010-02-20) 1 commit
52
(merged to 'next' on 2010-02-21 at 65fded0)
53
+ cherry_pick_list: quit early if one side is empty
54
225
-Will merge to 'master' soonish, and backmerge to 'maint'.
226
-
227
-* tc/transport-verbosity (2010-02-18) 9 commits
228
- - transport: update flags to be in running order
229
- - pull: learn --progress
230
- - fetch: learn --progress
231
- - push: learn --progress
232
- - transport->progress: use flag authoritatively
233
- - clone: support multiple levels of verbosity
234
- - push: support multiple levels of verbosity
235
- - fetch: refactor verbosity option handling into transport.[ch]
236
- - Documentation/git-push.txt: put --quiet before --verbose
237
-
238
-Didn't look very carefully. Comments from transport people are very much
239
-appreciated before moving this forward.
240
-
55
* ld/maint-diff-quiet-w (2010-02-21) 2 commits
56
(merged to 'next' on 2010-02-21 at 4701142)
57
+ git-diff: add a test for git diff --quiet -w
58
+ git diff --quiet -w: check and report the status
59
246
-Will merge to 'master' after a few more days of cooking.
247
-
248
-* cp/add-u-pathspec (2010-02-09) 2 commits
249
- - test for add with non-existent pathspec
250
- - git add -u: die on unmatched pathspec
251
-
252
-Will merge to 'next'.
253
-
60
* jc/for-each-ref (2010-02-13) 4 commits
61
(merged to 'next' on 2010-02-21 at c9a6c2f)
62
+ for-each-ref --format='%(flag)'
@@ -258,14 +64,10 @@ Will merge to 'next'.
64
+ builtin-for-each-ref.c: check if we need to peel onion while parsing the format
65
+ builtin-for-each-ref.c: comment fixes
66
261
-Will merge to 'master' soonish.
262
-
67
* jn/gitweb-config-error-die (2010-02-14) 1 commit
68
(merged to 'next' on 2010-02-21 at e3ecd65)
69
+ gitweb: Die if there are parsing errors in config file
70
267
-Will merge to 'master' soonish.
268
-
71
* jn/maint-fix-pager (2010-02-22) 8 commits
72
(merged to 'next' on 2010-02-23 at 575e0e4)
73
+ tests: Fix race condition in t7006-pager
@@ -278,61 +80,26 @@ Will merge to 'master' soonish.
80
+ Make 'git var GIT_PAGER' always print the configured pager
81
+ Fix 'git var' usage synopsis
82
281
-Will merge to 'master' after a few more days of cooking.
282
-
83
* ml/color-when (2010-02-16) 1 commit
84
(merged to 'next' on 2010-02-21 at d52c051)
85
+ Add an optional argument for --color options
86
287
-Will merge to 'master' soonish.
288
-
87
* hm/imap-send-cram-md5 (2010-02-15) 1 commit
88
(merged to 'next' on 2010-02-21 at de8f650)
89
+ imap-send: support CRAM-MD5 authentication
90
293
-Will merge to 'master' after a few more days of cooking.
294
-
295
-* jh/maint-submodule-status-in-void (2010-02-16) 1 commit
296
- (merged to 'next' on 2010-02-21 at 2e605c3)
297
- + submodule summary: Don't barf when invoked in an empty repo
298
-
299
-Will merge to 'master' after a few more days of cooking.
300
-
301
-* bg/apply-blank-at-eof (2010-02-17) 3 commits
302
- - t3417: Add test cases for "rebase --whitespace=fix"
303
- - t4124: Add additional tests of --whitespace=fix
304
- - apply: Allow blank context lines to match beyond EOF
305
-
306
-RFC.
307
-
91
* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit
92
(merged to 'next' on 2010-02-21 at aca55e6)
93
+ require_work_tree broken with NONGIT_OK
94
312
-Will merge to 'master' soonish, and backmerge to 'maint'.
313
-
95
* jc/maint-status-preload (2010-02-17) 1 commit
96
(merged to 'next' on 2010-02-21 at d79e163)
97
+ status: preload index to optimize lstat(2) calls
98
318
-Will merge to 'master' soonish, and backmerge to 'maint'.
319
-
320
-* nd/root-git (2010-02-14) 5 commits
321
- - Add test for using Git at root of file system
322
- - Support working directory located at root
323
- - Move offset_1st_component() to path.c
324
- - init-db, rev-parse --git-dir: do not append redundant slash
325
- - make_absolute_path(): Do not append redundant slash
326
-
327
-Will merge to 'next' unless I hear objections.
328
-
99
* ac/cvsimport-revision-mapping (2010-02-06) 1 commit
100
(merged to 'next' on 2010-02-17 at 6756446)
101
+ cvsimport: new -R option: generate .git/cvs-revisions mapping
102
333
-Will merge to 'master' shortly unless negative comments from CVSimport
334
-users comes.
335
-
103
* jn/maint-makedepend (2010-01-26) 5 commits
104
(merged to 'next' on 2010-02-21 at 34a3e48)
105
+ Makefile: drop dependency on $(wildcard */*.h)
@@ -345,9 +112,9 @@ users comes.
112
* jn/master-makedepend (2010-01-26) 0 commits
113
(this branch uses jn/maint-makedepend; is used by jn/makedepend.)
114
348
-This is to help merging the clean-up to "master".
349
-
350
-* jn/makedepend (2010-01-31) 9 commits
115
+* jn/makedepend (2010-02-28) 10 commits
116
+ (merged to 'next' on 2010-02-28 at 6604fd0)
117
+ + Makefile: clarify definition of TEST_OBJS
118
(merged to 'next' on 2010-02-21 at 34a3e48)
119
+ Makefile: always remove .depend directories on 'make clean'
120
+ Makefile: tuck away generated makefile fragments in .depend
@@ -360,9 +127,313 @@ This is to help merging the clean-up to "master".
127
+ Makefile: transport.o depends on branch.h now
128
(this branch uses jn/maint-makedepend and jn/master-makedepend.)
129
363
-Will merge to 'master' after a few more days of cooking.
130
+* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
131
+ (merged to 'next' on 2010-02-17 at 3b7be80)
132
+ + "log --author=me --grep=it" should find intersection, not union
133
+
134
+* jh/maint-submodule-status-in-void (2010-03-03) 1 commit
135
+ + submodule summary: Don't barf when invoked in an empty repo
136
+
137
+We might also want to enable showing the submodule change, which is
138
+currently queued in 'pu'.
139
+
140
+--------------------------------------------------
141
+[New Topics]
142
+
143
+* bg/apply-fix-blank-at-eof (2010-02-27) 5 commits
144
+ - t3417: Add test cases for "rebase --whitespace=fix"
145
+ - t4124: Add additional tests of --whitespace=fix
146
+ - apply: Allow blank context lines to match beyond EOF
147
+ - apply: Remove the quick rejection test
148
+ - apply: Don't unnecessarily update line lengths in the preimage
149
+
150
+Probably ready for 'next'.
151
+
152
+* gb/maint-submodule-env (2010-02-25) 5 commits
153
+ (merged to 'next' on 2010-02-25 at 8c22d03)
154
+ + is_submodule_modified(): clear environment properly
155
+ + submodules: ensure clean environment when operating in a submodule
156
+ + shell setup: clear_local_git_env() function
157
+ + rev-parse: --local-env-vars option
158
+ + Refactor list of of repo-local env vars
159
+
160
+Ready for 'master'.
161
+
162
+* jc/fetch-param (2010-02-24) 3 commits
163
+ (merged to 'next' on 2010-02-25 at e95e252)
164
+ + fetch --all/--multiple: keep all the fetched branch information
165
+ + builtin-fetch --all/--multi: propagate options correctly
166
+ + t5521: fix and modernize
167
+
168
+Ready for 'master'.
169
+
170
+* jk/maint-push-tracking-wo-remote (2010-02-24) 1 commit
171
+ (merged to 'next' on 2010-02-25 at da946ba)
172
+ + push: fix segfault for odd config
173
+
174
+Ready for 'master'.
175
+
176
+* mb/shortlog-nongit-stdin (2010-02-24) 1 commit
177
+ (merged to 'next' on 2010-02-25 at d17bb74)
178
+ + shortlog: warn the user when there is no input
179
+
180
+Ready for 'master'.
181
+
182
+* sg/bash-completion (2010-02-23) 4 commits
183
+ - bash: completion for gitk aliases
184
+ - bash: support user-supplied completion scripts for aliases
185
+ - bash: support user-supplied completion scripts for user's git commands
186
+ - bash: improve aliased command recognition
187
+
188
+Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
189
+
190
+* fn/maint-mkdtemp-compat (2010-02-25) 1 commit
191
+ (merged to 'next' on 2010-02-25 at 2899a47)
192
+ + Fix gitmkdtemp: correct test for mktemp() return value
193
+
194
+Ready for 'master'.
195
+
196
+* ml/maint-grep-doc (2010-02-25) 4 commits
197
+ (merged to 'next' on 2010-03-02 at a75dfe0)
198
+ + grep docs: document --no-index option
199
+ (merged to 'next' on 2010-02-25 at ec1faf8)
200
+ + grep docs: --cached and <tree>... are incompatible
201
+ + grep docs: use AsciiDoc literals consistently
202
+ + grep docs: pluralize "Example" section
203
+
204
+Ready for 'master'.
205
+
206
+* fl/askpass (2010-03-03) 2 commits
207
+ - git-core: Support retrieving passwords with GIT_ASKPASS
208
+ - git-svn: Support retrieving passwords with GIT_ASKPASS
209
+
210
+As we export GIT_ASKPASS when it is not set but SSH_ASKPASS is from "git"
211
+potty (the third patch in the series, which I applied to 'master'), I
212
+removed the first hunk that did that by hand.
213
+
214
+* as/maint-expire (2010-02-26) 2 commits
215
+ (merged to 'next' on 2010-03-02 at 4015ae4)
216
+ + reflog: honor gc.reflogexpire=never
217
+ + prune: honor --expire=never
218
+
219
+* jc/color-attrs (2010-02-27) 1 commit
220
+ - color: allow multiple attributes
221
+
222
+Perhaps I should remove the counting, extend COLOR_MAXLEN and remove the
223
+test that checks overlong color specification and then merge this to
224
+'next'.
225
+
226
+* jc/maint-add-ignored-dir (2010-02-28) 3 commits
227
+ - builtin-add: fix exclude handling
228
+ - tests for "git add ignored-dir/file" without -f
229
+ - t0050: mark non-working test as such
230
+
231
+Not quite happy.
232
+
233
+* ml/color-grep (2010-02-26) 3 commits
234
+ - grep: Colorize selected, context, and function lines
235
+ - grep: Colorize filename, line number, and separator
236
+ - Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
237
+
238
+There was a comment about not special casing filename coloring?
239
+
240
+* sb/notes-parse-opt (2010-02-27) 1 commit
241
+ - notes: rework subcommands and parse options
242
+ (this branch uses early parts of jh/notes and tr/notes-display.)
243
+
244
+* sh/am-keep-cr (2010-02-27) 4 commits
245
+ (merged to 'next' on 2010-03-02 at ffe3c5e)
246
+ + git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
247
+ + git-am: Add am.keepcr and --no-keep-cr to override it
248
+ + git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
249
+ + documentation: 'git-mailsplit --keep-cr' is not hidden anymore
250
+
251
+* bw/union-merge-refactor (2010-03-01) 4 commits
252
+ - merge-file: add option to select union merge favor
253
+ - merge-file: add option to specify the marker size
254
+ - refactor merge flags into xmparam_t
255
+ - make union merge an xdl merge favor
256
+
257
+The first two are ready for 'next'; the latter two are safe and perhaps
258
+useful.
259
+
260
+* mg/test-svn-info (2010-03-03) 2 commits
261
+ - t9119-git-svn-info.sh: test with svn 1.6.* as well
262
+ - git-svn: req_svn when needed
263
+
264
+--------------------------------------------------
265
+[Stalled]
266
+
267
+* sd/format-patch-to (2010-02-17) 1 commit
268
+ - Add 'git format-patch --to=' option and 'format.to' configuration variable.
269
+
270
+Shouldn't be too hard to add tests to t4014; other than that looked ready
271
+for 'next'.
272
+
273
+* sd/log-decorate (2010-02-17) 3 commits
274
+ - log.decorate: usability fixes
275
+ - Add `log.decorate' configuration variable.
276
+ - git_config_maybe_bool()
277
+
278
+Probably ready for 'next', except that people need to be warned about
279
+having to update their scripts to explicitly pass --no-decorate to keep
280
+them working. A good idea to disable this when --pretty was given, just
281
+like notes are disabled by default, was floated.
282
+
283
+* pb/log-first-parent-p-m (2010-02-10) 1 commit
284
+ (merged to 'next' on 2010-02-17 at 2f8e5ae)
285
+ + git log -p -m: document -m and honor --first-parent
286
+
287
+Needs tests but otherwise looked fine. We might want to teach "-m trumps
288
+implicit --cc" to "git show", but that is a totally separate topic.
289
+
290
+I actually care about this "log -p --first-parent" very much, but if Pasky
291
+is counting on that and procrastinating until I write the tests myself, he
292
+is in for a disappointment. I don't have that much free time these days.
293
+Help is appreciated.
294
+
295
+* js/rebase-origin-x (2010-02-05) 1 commit
296
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
297
+
298
+I retract my objection against the idea of -x; needs polishing before
299
+moving forward.
300
+
301
+--------------------------------------------------
302
+[Cooking]
303
+
304
+* ld/push-porcelain (2010-02-26) 4 commits
305
+ (merged to 'next' on 2010-03-02 at d15bb1e)
306
+ + git-push: add tests for git push --porcelain
307
+ + git-push: make git push --porcelain print "Done"
308
+ + git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
309
+ + git-push: fix an advice message so it goes to stderr
310
+
311
+* sd/init-template (2010-03-02) 5 commits
312
+ (merged to 'next' on 2010-03-02 at 2d87e3f)
313
+ + wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
314
+ + t/t0001-init.sh: add test for 'init with init.templatedir set'
315
+ + init: having keywords without value is not a global error.
316
+ + Add a "TEMPLATE DIRECTORY" section to git-init[1].
317
+ + Add `init.templatedir` configuration variable.
318
+
319
+* il/loosen-remote-helper-names (2010-02-23) 1 commit
320
+ (merged to 'next' on 2010-02-25 at 5c22a39)
321
+ + Allow '+', '-' and '.' in remote helper names
322
+
323
+Ready for 'master'.
324
+
325
+* jk/maint-add--interactive-delete (2010-02-22) 1 commit
326
+ (merged to 'next' on 2010-02-24 at 908cef8)
327
+ + add-interactive: fix bogus diff header line ordering
328
+
329
+Probably ready for 'master'.
330
+
331
+* js/runtime-prefix-trace-not-warn (2010-02-23) 1 commit
332
+ (merged to 'next' on 2010-02-24 at 8d9d305)
333
+ + Print RUNTIME_PREFIX warning only when GIT_TRACE is set
334
+
335
+Ready for 'master'.
336
+
337
+* lt/deepen-builtin-source (2010-02-22) 1 commit
338
+ (merged to 'next' on 2010-02-25 at 320aa74)
339
+ + Move 'builtin-*' into a 'builtin/' subdirectory
340
+
341
+This is a painful one to keep out of 'master' for a long time, as any
342
+topic with new builtin commands will need evil merges to adjust to it.
343
+
344
+* tc/http-cleanup (2010-03-02) 7 commits
345
+ - remote-curl: init walker only when needed
346
+ - remote-curl: use http_fetch_ref() instead of walker wrapper
347
+ - http: init and cleanup separately from http-walker
348
+ - http-walker: cleanup more thoroughly
349
+ - http-push: remove "|| 1" to enable verbose check
350
+ - t554[01]-http-push: refactor, add non-ff tests
351
+ - t5541-http-push: check that ref is unchanged for non-ff test
352
+
353
+Rerolled.
354
+
355
+* tr/notes-display (2010-02-23) 11 commits
356
+ - notes: add shorthand --ref to override GIT_NOTES_REF
357
+ - commit --amend: copy notes to the new commit
358
+ - rebase: support automatic notes copying
359
+ - notes: implement helpers needed for note copying during rewrite
360
+ - notes: implement 'git notes copy --stdin'
361
+ - rebase -i: invoke post-rewrite hook
362
+ - rebase: invoke post-rewrite hook
363
+ - commit --amend: invoke post-rewrite hook
364
+ - Documentation: document post-rewrite hook
365
+ - Support showing notes from more than one notes tree
366
+ - test-lib: unset GIT_NOTES_REF to stop it from influencing tests
367
+ (this branch uses early parts of jh/notes; is used by sb/notes-parse-opt.)
368
365
-* jh/notes (2010-02-13) 30 commits
369
+Didn't look too carefully except for the second one.
370
+
371
+* cw/test-lib-relicense (2010-02-22) 1 commit
372
+ . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
373
+
374
+Ack-collection in progress.
375
+
376
+* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit
377
+ (merged to 'next' on 2010-02-24 at 621fa3d)
378
+ + mailinfo: do not strip leading spaces even for a header line
379
+
380
+Ready for 'master'.
381
+
382
+* ne/pack-local-doc (2010-02-24) 3 commits
383
+ (merged to 'next' on 2010-02-25 at 75cfba5)
384
+ + pack-objects documentation: Fix --honor-pack-keep as well.
385
+ + pack-objects documentation: reword "objects that appear in the standard input"
386
+ + Documentation: pack-objects: Clarify --local's semantics.
387
+
388
+Ready for 'master'.
389
+
390
+* mm/mkstemps-mode-for-packfiles (2010-02-22) 6 commits
391
+ (merged to 'next' on 2010-02-24 at 31b5903)
392
+ + Use git_mkstemp_mode instead of plain mkstemp to create object files
393
+ + git_mkstemps_mode: don't set errno to EINVAL on exit.
394
+ + Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
395
+ + git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
396
+ + Move gitmkstemps to path.c
397
+ + Add a testcase for ACL with restrictive umask.
398
+
399
+Ready for 'master'.
400
+
401
+* tc/transport-verbosity (2010-02-24) 10 commits
402
+ - transport: update flags to be in running order
403
+ - fetch and pull: learn --progress
404
+ - push: learn --progress
405
+ - transport->progress: use flag authoritatively
406
+ - clone: support multiple levels of verbosity
407
+ - push: support multiple levels of verbosity
408
+ - fetch: refactor verbosity option handling into transport.[ch]
409
+ - Documentation/git-push: put --quiet before --verbose
410
+ - Documentation/git-pull: put verbosity options before merge/fetch ones
411
+ - Documentation/git-clone: mention progress in -v
412
+
413
+Didn't look very carefully. Comments from transport people are very much
414
+appreciated before moving this forward.
415
+
416
+* cp/add-u-pathspec (2010-02-09) 2 commits
417
+ (merged to 'next' on 2010-02-24 at 2f3f2bc)
418
+ + test for add with non-existent pathspec
419
+ + git add -u: die on unmatched pathspec
420
+
421
+Not quite happy, but will merge to 'master' shortly anyway.
422
+
423
+* nd/root-git (2010-02-14) 5 commits
424
+ (merged to 'next' on 2010-02-25 at bff4955)
425
+ + Add test for using Git at root of file system
426
+ + Support working directory located at root
427
+ + Move offset_1st_component() to path.c
428
+ + init-db, rev-parse --git-dir: do not append redundant slash
429
+ + make_absolute_path(): Do not append redundant slash
430
+
431
+Probably ready for 'master'.
432
+
433
+* jh/notes (2010-02-24) 32 commits
434
+ (merged to 'next' on 2010-02-24 at c88263d)
435
+ + notes: fix malformed tree entry
436
+ + builtin-notes: Minor (mostly parse_options-related) fixes
437
(merged to 'next' on 2010-02-21 at 75fc451)
438
+ builtin-notes: Add "copy" subcommand for copying notes between objects
439
+ builtin-notes: Misc. refactoring of argc and exit value handling
@@ -394,21 +465,9 @@ Will merge to 'master' after a few more days of cooking.
465
+ Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
466
+ Notes API: get_commit_notes() -> format_note() + remove the commit restriction
467
+ Minor cosmetic fixes to notes.c
397
- (this branch is used by tr/notes-display.)
398
-
399
-Will merge to 'master' after a few more days of cooking.
468
+ (this branch shares commits with sb/notes-parse-opt and tr/notes-display.)
469
401
-* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
402
- (merged to 'next' on 2010-02-17 at 3b7be80)
403
- + "log --author=me --grep=it" should find intersection, not union
404
-
405
-Will merge to 'master' after a few more days of cooking.
406
-
407
-* jh/gitweb-caching (2010-01-30) 1 commit
408
- - gitweb: Add an option to force version match
409
-
410
-The controversial one. Will probably drop this. RFC v3 of gitweb caching
411
-series needs to be queued but hasn't happened yet.
470
+Ready for 'master'.
471
472
* cc/reset-keep (2010-01-19) 5 commits
473
- reset: disallow using --keep when there are unmerged entries
@@ -416,3 +475,6 @@ series needs to be queued but hasn't happened yet.
475
- Documentation: reset: describe new "--keep" option
476
- reset: add test cases for "--keep" option
477
- reset: add option "--keep" to "git reset"
478
+
479
+I am not sure if this series is useful, and even less sure if the
480
+usefulness of it outweighs the confusion factor.