What's cooking (2010/03 #2)
Junio C Hamano committed
Mar 7, 2010 at 13:17 UTC
04291a89ec12df64f5df386d60d79b26a2458d58
1 file changed
+213
-278
whats-cooking.txt
+213
-278
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2010, #01; Wed, 03)
3
-X-master-at: 6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3
4
-X-next-at: d855a59a115b20c6483b87c1e71e287d1c7e8b6c
2
+Subject: What's cooking in git.git (Mar 2010, #02; Sun, 07)
3
+X-master-at: b7e7f6fb0005f861ca8aed80473a9809d646c403
4
+X-next-at: daec67978caa3f4d202ebee1e75c4bbb27fdc4ee
5
6
-What's cooking in git.git (Mar 2010, #01; Wed, 03)
6
+What's cooking in git.git (Mar 2010, #02; Sun, 07)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,143 +11,16 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
---------------------------------------------------
15
-[Graduated to "master"]
16
-
17
-* 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
-
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
-
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'
29
-
30
-* ml/encode-header-refactor (2010-02-23) 2 commits
31
- (merged to 'next' on 2010-02-23 at ac4ec8f)
32
- + move encode_in_pack_object_header() to a better place
33
- (merged to 'next' on 2010-02-21 at efe648b)
34
- + refactor duplicated encode_header in pack-objects and fast-import
35
-
36
-* ml/fill-mm-refactor (2010-02-16) 1 commit
37
- (merged to 'next' on 2010-02-21 at 2fc5570)
38
- + refactor duplicated fill_mm() in checkout and merge-recursive
39
-
40
-* ml/send-pack-transport-refactor (2010-02-16) 1 commit
41
- (merged to 'next' on 2010-02-21 at db276f4)
42
- + refactor duplicated code in builtin-send-pack.c and transport.c
43
-
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()
47
- + utf8.c: remove strbuf_write()
48
- + utf8.c: remove print_spaces()
49
- + utf8.c: remove print_wrapped_text()
50
-
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
-
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
-
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)'
63
- + for-each-ref --format='%(symref) %(symref:short)'
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
-
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
-
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
74
- (merged to 'next' on 2010-02-21 at 640e10c)
75
- + t7006-pager: if stdout is not a terminal, make a new one
76
- + tests: Add tests for automatic use of pager
77
- + am: Fix launching of pager
78
- + git svn: Fix launching of pager
79
- + git.1: Clarify the behavior of the --paginate option
80
- + Make 'git var GIT_PAGER' always print the configured pager
81
- + Fix 'git var' usage synopsis
82
-
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
-
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
-
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
-
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
-
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
-
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)
106
- + Makefile: clean up http-walker.o dependency rules
107
- + Makefile: remove wt-status.h from LIB_H
108
- + Makefile: make sure test helpers are rebuilt when headers change
109
- + Makefile: add missing header file dependencies
110
- (this branch is used by jn/makedepend and jn/master-makedepend.)
111
-
112
-* jn/master-makedepend (2010-01-26) 0 commits
113
- (this branch uses jn/maint-makedepend; is used by jn/makedepend.)
114
-
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
121
- + Teach Makefile to check header dependencies
122
- + Makefile: list standalone program object files in PROGRAM_OBJS
123
- + Makefile: lazily compute header dependencies
124
- + Makefile: list generated object files in OBJECTS
125
- + Makefile: disable default implicit rules
126
- + Makefile: rearrange dependency rules
127
- + Makefile: transport.o depends on branch.h now
128
- (this branch uses jn/maint-makedepend and jn/master-makedepend.)
129
-
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'.
14
+Let's start quieting things down on 'next' front.
15
16
--------------------------------------------------
141
-[New Topics]
17
+[Graduated to "master"]
18
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
19
+* mw/maint-gcc-warns-unused-write (2010-01-30) 1 commit
20
+ (merged to 'next' on 2010-03-04 at 17716c0)
21
+ + run-command.c: fix build warnings on Ubuntu
22
150
-Probably ready for 'next'.
23
+Ready for 'master'.
24
25
* gb/maint-submodule-env (2010-02-25) 5 commits
26
(merged to 'next' on 2010-02-25 at 8c22d03)
@@ -156,6 +29,7 @@ Probably ready for 'next'.
29
+ shell setup: clear_local_git_env() function
30
+ rev-parse: --local-env-vars option
31
+ Refactor list of of repo-local env vars
32
+ (this branch is used by jl/submodule-diff-dirtiness.)
33
34
Ready for 'master'.
35
@@ -179,14 +53,6 @@ Ready for 'master'.
53
54
Ready for 'master'.
55
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
-
56
* fn/maint-mkdtemp-compat (2010-02-25) 1 commit
57
(merged to 'next' on 2010-02-25 at 2899a47)
58
+ Fix gitmkdtemp: correct test for mktemp() return value
@@ -203,72 +69,122 @@ Ready for 'master'.
69
70
Ready for 'master'.
71
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
-
72
* as/maint-expire (2010-02-26) 2 commits
73
(merged to 'next' on 2010-03-02 at 4015ae4)
74
+ reflog: honor gc.reflogexpire=never
75
+ prune: honor --expire=never
76
219
-* jc/color-attrs (2010-02-27) 1 commit
220
- - color: allow multiple attributes
77
+Ready for 'master'.
78
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'.
79
+* il/loosen-remote-helper-names (2010-02-23) 1 commit
80
+ (merged to 'next' on 2010-02-25 at 5c22a39)
81
+ + Allow '+', '-' and '.' in remote helper names
82
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
83
+Ready for 'master'.
84
231
-Not quite happy.
85
+* jk/maint-add--interactive-delete (2010-02-22) 1 commit
86
+ (merged to 'next' on 2010-02-24 at 908cef8)
87
+ + add-interactive: fix bogus diff header line ordering
88
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_*
89
+Probably ready for 'master'.
90
238
-There was a comment about not special casing filename coloring?
91
+* js/runtime-prefix-trace-not-warn (2010-02-23) 1 commit
92
+ (merged to 'next' on 2010-02-24 at 8d9d305)
93
+ + Print RUNTIME_PREFIX warning only when GIT_TRACE is set
94
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.)
95
+Ready for 'master'.
96
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
97
+* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit
98
+ (merged to 'next' on 2010-02-24 at 621fa3d)
99
+ + mailinfo: do not strip leading spaces even for a header line
100
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
101
+Ready for 'master'.
102
257
-The first two are ready for 'next'; the latter two are safe and perhaps
258
-useful.
103
+* ne/pack-local-doc (2010-02-24) 3 commits
104
+ (merged to 'next' on 2010-02-25 at 75cfba5)
105
+ + pack-objects documentation: Fix --honor-pack-keep as well.
106
+ + pack-objects documentation: reword "objects that appear in the standard input"
107
+ + Documentation: pack-objects: Clarify --local's semantics.
108
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
109
+Ready for 'master'.
110
+
111
+* mm/mkstemps-mode-for-packfiles (2010-02-22) 6 commits
112
+ (merged to 'next' on 2010-02-24 at 31b5903)
113
+ + Use git_mkstemp_mode instead of plain mkstemp to create object files
114
+ + git_mkstemps_mode: don't set errno to EINVAL on exit.
115
+ + Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
116
+ + git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
117
+ + Move gitmkstemps to path.c
118
+ + Add a testcase for ACL with restrictive umask.
119
+
120
+Ready for 'master'.
121
+
122
+* nd/root-git (2010-02-14) 5 commits
123
+ (merged to 'next' on 2010-02-25 at bff4955)
124
+ + Add test for using Git at root of file system
125
+ + Support working directory located at root
126
+ + Move offset_1st_component() to path.c
127
+ + init-db, rev-parse --git-dir: do not append redundant slash
128
+ + make_absolute_path(): Do not append redundant slash
129
+
130
+Probably ready for 'master'.
131
132
--------------------------------------------------
265
-[Stalled]
133
+[New Topics]
134
267
-* sd/format-patch-to (2010-02-17) 1 commit
268
- - Add 'git format-patch --to=' option and 'format.to' configuration variable.
135
+* jl/submodule-diff-dirtiness (2010-03-05) 2 commits
136
+ - git status: Show detailed dirty status of submodules in long format
137
+ (merged to 'next' on 2010-03-04 at 58b2645)
138
+ + git diff --submodule: Show detailed dirty status of submodules
139
+
140
+The tip one may want to use flag bits from places different from "format",
141
+but otherwise I found the basic idea reasonably sound.
142
+
143
+* cc/cherry-pick-ff (2010-03-06) 7 commits
144
+ (merged to 'next' on 2010-03-07 at 5589b26)
145
+ + rebase -i: use new --ff cherry-pick option
146
+ + cherry-pick: add a no-op --no-ff option to future proof scripts
147
+ + Documentation: describe new cherry-pick --ff option
148
+ + cherry-pick: add tests for new --ff option
149
+ + revert: add --ff option to allow fast forward when cherry-picking
150
+ + builtin/merge: make checkout_fast_forward() non static
151
+ + parse-options: add parse_options_concat() to concat options
152
+
153
+* js/async-thread (2010-03-06) 6 commits
154
+ - Dying in an async procedure should only exit the thread, not the process.
155
+ - Reimplement async procedures using pthreads
156
+ - Windows: more pthreads functions
157
+ - Fix signature of fcntl() compatibility dummy
158
+ - Make report() from usage.c public as vreportf() and use it.
159
+ - Modernize t5530-upload-pack-error.
160
+
161
+Perhaps later we would want to enable async-by-thread on all threading
162
+capable platforms, if only to make sure we use the same code on major
163
+platforms to reduce chances of platform specific bugs.
164
+
165
+* nd/setup (2010-03-07) 18 commits
166
+ - merge-file: use RUN_SETUP_GENTLY
167
+ - var: use RUN_SETUP_GENTLY
168
+ - ls-remote: use RUN_SETUP_GENTLY
169
+ - help: use RUN_SETUP_GENTLY
170
+ - diff: use RUN_SETUP_GENTLY
171
+ - bundle: use RUN_SETUP_GENTLY
172
+ - apply: use RUN_SETUP_GENTLY
173
+ - verify-pack: use RUN_SETUP_GENTLY
174
+ - check-ref-format: use RUN_SETUP_GENTLY
175
+ - mailinfo: use RUN_SETUP_GENTLY
176
+ - archive: use RUN_SETUP_GENTLY
177
+ - builtin: USE_PAGER should not be used without RUN_SETUP*
178
+ - grep: use RUN_SETUP_GENTLY
179
+ - shortlog: use RUN_SETUP_GENTLY
180
+ - hash-object: use RUN_SETUP_GENTLY
181
+ - config: use RUN_SETUP_GENTLY
182
+ - builtin: Support RUN_SETUP_GENTLY to set up repository early if found
183
+ - builtin: introduce startup_info struct
184
+ (this branch uses lt/deepen-builtin-source.)
185
270
-Shouldn't be too hard to add tests to t4014; other than that looked ready
271
-for 'next'.
186
+--------------------------------------------------
187
+[Stalled]
188
189
* sd/log-decorate (2010-02-17) 3 commits
190
- log.decorate: usability fixes
@@ -301,6 +217,79 @@ moving forward.
217
--------------------------------------------------
218
[Cooking]
219
220
+* sd/format-patch-to (2010-02-17) 1 commit
221
+ (merged to 'next' on 2010-03-07 at ef7a18d)
222
+ + Add 'git format-patch --to=' option and 'format.to' configuration variable.
223
+
224
+Squashed tests by Stephen in; it seems we will have updates to add --no-{cc,to,...}
225
+to both format-patch and send-email but that is more or less independent clean-up.
226
+
227
+* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits
228
+ (merged to 'next' on 2010-03-07 at daec679)
229
+ + t3417: Add test cases for "rebase --whitespace=fix"
230
+ + t4124: Add additional tests of --whitespace=fix
231
+ + apply: Allow blank context lines to match beyond EOF
232
+ + apply: Remove the quick rejection test
233
+ + apply: Don't unnecessarily update line lengths in the preimage
234
+
235
+* sg/bash-completion (2010-02-23) 4 commits
236
+ - bash: completion for gitk aliases
237
+ - bash: support user-supplied completion scripts for aliases
238
+ - bash: support user-supplied completion scripts for user's git commands
239
+ - bash: improve aliased command recognition
240
+
241
+Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
242
+
243
+* fl/askpass (2010-03-04) 2 commits
244
+ (merged to 'next' on 2010-03-07 at 5ab370a)
245
+ + git-core: Support retrieving passwords with GIT_ASKPASS
246
+ + git-svn: Support retrieving passwords with GIT_ASKPASS
247
+
248
+* jc/color-attrs (2010-02-27) 1 commit
249
+ - color: allow multiple attributes
250
+
251
+As the output we generate is bounded, there is no need for checking
252
+overflows as long as we count the maximum correctly.
253
+
254
+* jc/maint-add-ignored-dir (2010-02-28) 3 commits
255
+ - builtin-add: fix exclude handling
256
+ - tests for "git add ignored-dir/file" without -f
257
+ - t0050: mark non-working test as such
258
+
259
+Not quite happy, but will merge to 'next' anyway.
260
+
261
+* ml/color-grep (2010-03-07) 3 commits
262
+ - grep: Colorize selected, context, and function lines
263
+ - grep: Colorize filename, line number, and separator
264
+ - Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
265
+
266
+Perhaps unoptimize the "reset" bit? Other than that looked Ok.
267
+
268
+* sb/notes-parse-opt (2010-02-27) 1 commit
269
+ - notes: rework subcommands and parse options
270
+ (this branch uses early parts of jh/notes and tr/notes-display.)
271
+
272
+* sh/am-keep-cr (2010-02-27) 4 commits
273
+ (merged to 'next' on 2010-03-02 at ffe3c5e)
274
+ + git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
275
+ + git-am: Add am.keepcr and --no-keep-cr to override it
276
+ + git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
277
+ + documentation: 'git-mailsplit --keep-cr' is not hidden anymore
278
+
279
+* bw/union-merge-refactor (2010-03-01) 4 commits
280
+ - merge-file: add option to select union merge favor
281
+ - merge-file: add option to specify the marker size
282
+ (merged to 'next' on 2010-03-07 at 9d1eff6)
283
+ + refactor merge flags into xmparam_t
284
+ + make union merge an xdl merge favor
285
+
286
+* mg/test-svn-info (2010-03-03) 2 commits
287
+ - t9119-git-svn-info.sh: test with svn 1.6.* as well
288
+ - git-svn: req_svn when needed
289
+
290
+* jh/maint-submodule-status-in-void (2010-03-03) 1 commit
291
+ - submodule summary: do not fail before the first commit
292
+
293
* ld/push-porcelain (2010-02-26) 4 commits
294
(merged to 'next' on 2010-03-02 at d15bb1e)
295
+ git-push: add tests for git push --porcelain
@@ -316,41 +305,23 @@ moving forward.
305
+ Add a "TEMPLATE DIRECTORY" section to git-init[1].
306
+ Add `init.templatedir` configuration variable.
307
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
-
308
* lt/deepen-builtin-source (2010-02-22) 1 commit
309
(merged to 'next' on 2010-02-25 at 320aa74)
310
+ Move 'builtin-*' into a 'builtin/' subdirectory
311
+ (this branch is used by nd/setup.)
312
313
This is a painful one to keep out of 'master' for a long time, as any
314
topic with new builtin commands will need evil merges to adjust to it.
315
316
* 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.
317
+ (merged to 'next' on 2010-03-07 at e92db25)
318
+ + remote-curl: init walker only when needed
319
+ + remote-curl: use http_fetch_ref() instead of walker wrapper
320
+ + http: init and cleanup separately from http-walker
321
+ + http-walker: cleanup more thoroughly
322
+ + http-push: remove "|| 1" to enable verbose check
323
+ + t554[01]-http-push: refactor, add non-ff tests
324
+ + t5541-http-push: check that ref is unchanged for non-ff test
325
326
* tr/notes-display (2010-02-23) 11 commits
327
- notes: add shorthand --ref to override GIT_NOTES_REF
@@ -366,52 +337,26 @@ Rerolled.
337
- test-lib: unset GIT_NOTES_REF to stop it from influencing tests
338
(this branch uses early parts of jh/notes; is used by sb/notes-parse-opt.)
339
369
-Didn't look too carefully except for the second one.
340
+Re-roll planned.
341
342
* cw/test-lib-relicense (2010-02-22) 1 commit
343
. test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
344
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'.
345
+Ack-collection stopped at the last three names. I am hoping Carl can take
346
+it from there without my keeping an eye on it?
347
348
* 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.
349
+ (merged to 'next' on 2010-03-07 at 898d6dd)
350
+ + transport: update flags to be in running order
351
+ + fetch and pull: learn --progress
352
+ + push: learn --progress
353
+ + transport->progress: use flag authoritatively
354
+ + clone: support multiple levels of verbosity
355
+ + push: support multiple levels of verbosity
356
+ + fetch: refactor verbosity option handling into transport.[ch]
357
+ + Documentation/git-push: put --quiet before --verbose
358
+ + Documentation/git-pull: put verbosity options before merge/fetch ones
359
+ + Documentation/git-clone: mention progress in -v
360
361
* cp/add-u-pathspec (2010-02-09) 2 commits
362
(merged to 'next' on 2010-02-24 at 2f3f2bc)
@@ -420,17 +365,9 @@ appreciated before moving this forward.
365
366
Not quite happy, but will merge to 'master' shortly anyway.
367
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
368
+* jh/notes (2010-03-04) 33 commits
369
+ (merged to 'next' on 2010-03-04 at 3bb921f)
370
+ + Documentation: fix a few typos in git-notes.txt
371
(merged to 'next' on 2010-02-24 at c88263d)
372
+ notes: fix malformed tree entry
373
+ builtin-notes: Minor (mostly parse_options-related) fixes
@@ -470,11 +407,9 @@ Probably ready for 'master'.
407
Ready for 'master'.
408
409
* cc/reset-keep (2010-01-19) 5 commits
473
- - reset: disallow using --keep when there are unmerged entries
474
- - reset: disallow "reset --keep" outside a work tree
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.
410
+ (merged to 'next' on 2010-03-07 at 5237d8e)
411
+ + reset: disallow using --keep when there are unmerged entries
412
+ + reset: disallow "reset --keep" outside a work tree
413
+ + Documentation: reset: describe new "--keep" option
414
+ + reset: add test cases for "--keep" option
415
+ + reset: add option "--keep" to "git reset"