What's cooking (2010/04 #02)
Junio C Hamano committed
Apr 4, 2010 at 11:48 UTC
09a7b808b2d10d18a0538a3848f6fa2063d16546
1 file changed
+224
-248
whats-cooking.txt
+224
-248
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2010, #01; Fri, 02)
3
-X-master-at: a50dec22f2800fd073aa6ca1d112f25b4f667a56
4
-X-next-at: 85b6122874e41c12f0cd6ae4744fb1b856d4a0ad
2
+Subject: What's cooking in git.git (Apr 2010, #02; Sun, 04)
3
+X-master-at: 11766ca4a89ba960271e94281463d1b44654ca3b
4
+X-next-at: c303c1b3242eaacf3f3c56ba3a93a3eba1aeb693
5
6
-What's cooking in git.git (Apr 2010, #01; Fri, 02)
6
+What's cooking in git.git (Apr 2010, #02; Sun, 04)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,42 +11,130 @@ 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
-Topics not in 'next' will have to wait until post 1.7.1 cycle. I expect
15
-that the changes still under discussion will be ready by the time the post
16
-1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2 that is
17
-shorter than usual to include them.
18
-
14
--------------------------------------------------
15
[Graduated to "master"]
16
22
-* sb/notes-parse-opt (2010-02-27) 1 commit
23
- (merged to 'next' on 2010-03-24 at 82eebc1)
24
- + notes: rework subcommands and parse options
25
-
26
-* cc/cherry-pick-ff (2010-03-20) 7 commits
27
- (merged to 'next' on 2010-03-20 at a1ae16b)
28
- + revert: fix tiny memory leak in cherry-pick --ff
29
- + rebase -i: use new --ff cherry-pick option
30
- (merged to 'next' on 2010-03-07 at 5589b26)
31
- + Documentation: describe new cherry-pick --ff option
32
- + cherry-pick: add tests for new --ff option
33
- + revert: add --ff option to allow fast forward when cherry-picking
34
- + builtin/merge: make checkout_fast_forward() non static
35
- + parse-options: add parse_options_concat() to concat options
17
+* mg/mailmap-update (2010-03-19) 1 commit
18
+ (merged to 'next' on 2010-03-28 at 8ac3436)
19
+ + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
20
+
21
+* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit
22
+ (merged to 'next' on 2010-03-28 at 7e8e58e)
23
+ + send-email: lazily assign editor variable
24
+
25
+* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit
26
+ (merged to 'next' on 2010-03-28 at d3e9f04)
27
+ + rev-list: use default abbrev length when abbrev-commit is in effect
28
+
29
+* rb/maint-python-path (2010-03-21) 1 commit
30
+ (merged to 'next' on 2010-03-28 at 58ba409)
31
+ + Correct references to /usr/bin/python which does not exist on FreeBSD
32
+
33
+* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit
34
+ (merged to 'next' on 2010-03-28 at fbedd77)
35
+ + imap-send: Remove limitation on message body
36
+
37
+* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit
38
+ (merged to 'next' on 2010-03-28 at bf02879)
39
+ + http-backend: Don't infinite loop during die()
40
+
41
+* bc/t5505-fix (2010-03-19) 3 commits
42
+ (merged to 'next' on 2010-03-28 at 1b097af)
43
+ + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
44
+ + t5505: add missing &&
45
+ + t5505: remove unnecessary subshell invocations
46
+
47
+* bw/template-tool-buildconfig (2010-03-20) 2 commits
48
+ (merged to 'next' on 2010-03-28 at 1e6fd8d)
49
+ + Modernize git calling conventions in hook templates
50
+ + Make templates honour SHELL_PATH and PERL_PATH
51
+
52
+* mb/rebase-i-no-ff (2010-03-24) 1 commit
53
+ (merged to 'next' on 2010-03-28 at b2c54cb)
54
+ + Teach rebase the --no-ff option.
55
+
56
+* jn/merge-diff3-label (2010-03-20) 14 commits
57
+ (merged to 'next' on 2010-03-20 at 26f1805)
58
+ + merge-recursive: add a label for ancestor
59
+ + cherry-pick, revert: add a label for ancestor
60
+ + revert: clarify label on conflict hunks
61
+ + compat: add mempcpy()
62
+ + checkout -m --conflict=diff3: add a label for ancestor
63
+ + merge_trees(): add ancestor label parameter for diff3-style output
64
+ + merge_file(): add comment explaining behavior wrt conflict style
65
+ + checkout --conflict=diff3: add a label for ancestor
66
+ + ll_merge(): add ancestor label parameter for diff3-style output
67
+ + merge-file --diff3: add a label for ancestor
68
+ + xdl_merge(): move file1 and file2 labels to xmparam structure
69
+ + xdl_merge(): add optional ancestor label to diff3-style output
70
+ + tests: document cherry-pick behavior in face of conflicts
71
+ + tests: document format of conflicts from checkout -m
72
+ (this branch is used by cc/revert-strategy.)
73
+
74
+* do/rebase-i-arbitrary (2010-03-14) 1 commit
75
+ (merged to 'next' on 2010-03-28 at 5ba9970)
76
+ + rebase--interactive: don't require what's rebased to be a branch
77
+
78
+* ja/send-email-ehlo (2010-03-14) 3 commits
79
+ (merged to 'next' on 2010-03-28 at 00964a8)
80
+ + git-send-email.perl - try to give real name of the calling host to HELO/EHLO
81
+ + git-send-email.perl: add option --smtp-debug
82
+ + git-send-email.perl: improve error message in send_message()
83
+
84
+* ak/everyday-git (2009-10-21) 1 commit
85
+ (merged to 'next' on 2010-03-28 at ae67548)
86
+ + everyday: fsck and gc are not everyday operations
87
+
88
+* bc/acl-test (2010-03-15) 5 commits
89
+ (merged to 'next' on 2010-03-28 at b40fa09)
90
+ + t/t1304: make a second colon optional in the mask ACL check
91
+ + t/t1304: set the ACL effective rights mask
92
+ + t/t1304: use 'test -r' to test readability rather than looking at mode bits
93
+ + t/t1304: set the Default ACL base entries
94
+ + t/t1304: avoid -d option to setfacl
95
+
96
+* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
97
+ (merged to 'next' on 2010-03-28 at 305ad0b)
98
+ + daemon.c: avoid accessing ss_family member of struct sockaddr_storage
99
+
100
+* ef/cherry-abbrev (2010-03-20) 2 commits
101
+ (merged to 'next' on 2010-03-28 at eb3825c)
102
+ + ls: remove redundant logic
103
+ + cherry: support --abbrev option
104
+
105
+* gh/maint-stash-show-error-message (2010-03-16) 1 commit
106
+ (merged to 'next' on 2010-03-28 at 61a5643)
107
+ + Improve error messages from 'git stash show'
108
+
109
+* rs/threaded-grep-context (2010-03-15) 1 commit
110
+ (merged to 'next' on 2010-03-28 at 1934af1)
111
+ + grep: enable threading for context line printing
112
113
--------------------------------------------------
114
[New Topics]
115
40
-* cw/ws-indent-with-tab (2010-04-01) 2 commits
41
- - whitespace: we cannot "catch all errors known to git" anymore
42
- - Add tab-in-indent whitespace error class
116
+* mh/status-optionally-refresh (2010-04-03) 3 commits
117
+ - t7508: add a test for "git status" in a read-only repository
118
+ - git status: refresh the index if possible
119
+ - t7508: add test for "git status" refreshing the index
120
44
-Not quite ready until "apply --whitespace=fix" gets a matching change.
121
+* jn/mailinfo-scissors (2010-04-03) 1 commit
122
+ - Teach mailinfo %< as an alternative scissors mark
123
46
-* ic/bash-completion-rpm (2010-03-26) 1 commit
47
- - RPM spec: include bash completion support
124
+* tr/word-diff (2010-04-04) 2 commits
125
+ - gitk: add the equivalent of diff --color-words
126
+ - diff: add --word-diff option that generalizes --color-words
127
+
128
+The tip "gitk" one I'd prefer to wait until we get Ack from Paulus.
129
+
130
+--------------------------------------------------
131
+[Stalled]
132
49
-This is needed in 'master' by -rc1 at the latest. Soon in 'next'.
133
+* js/rebase-origin-x (2010-02-05) 1 commit
134
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
135
+
136
+I retract my objection against the idea of -x; needs polishing before
137
+moving forward.
138
139
* js/grep-open (2010-03-26) 2 commits
140
- grep -O: allow optional argument specifying the pager (or editor)
@@ -54,6 +142,63 @@ This is needed in 'master' by -rc1 at the latest. Soon in 'next'.
142
143
Probably needs to support --no-index mode as well.
144
145
+* sd/log-decorate (2010-02-17) 3 commits
146
+ (merged to 'next' on 2010-03-08 at 58a6fba)
147
+ + log.decorate: usability fixes
148
+ + Add `log.decorate' configuration variable.
149
+ + git_config_maybe_bool()
150
+
151
+Needs squelching the configuration setting when "--pretty=raw" is given,
152
+at least, or possibly when any "--pretty" is explicitly given.
153
+
154
+* np/malloc-threading (2010-03-24) 1 commit
155
+ - Make xmalloc and xrealloc thread-safe
156
+
157
+Still has locking issues?
158
+
159
+* js/async-thread (2010-03-09) 7 commits
160
+ - Enable threaded async procedures whenever pthreads is available
161
+ (merged to 'next' on 2010-03-20 at 9939243)
162
+ + Dying in an async procedure should only exit the thread, not the process.
163
+ + Reimplement async procedures using pthreads
164
+ + Windows: more pthreads functions
165
+ + Fix signature of fcntl() compatibility dummy
166
+ + Make report() from usage.c public as vreportf() and use it.
167
+ + Modernize t5530-upload-pack-error.
168
+
169
+Waiting for resolution of locking issues in malloc-threading.
170
+
171
+--------------------------------------------------
172
+[Cooking]
173
+
174
+* sg/bash-completion (2010-02-23) 4 commits
175
+ (merged to 'next' on 2010-03-08 at bc59860)
176
+ + bash: completion for gitk aliases
177
+ + bash: support user-supplied completion scripts for aliases
178
+ + bash: support user-supplied completion scripts for user's git commands
179
+ + bash: improve aliased command recognition
180
+
181
+Nobody seems to care about "_git_frotz" that may potentially crash with
182
+whatever random things the end users is doing in their environment, and
183
+renaming them to "_git_complete_frotz" to avoid that. So let's not worry
184
+about that.
185
+
186
+* cw/ws-indent-with-tab (2010-04-03) 6 commits
187
+ - whitespace: tests for git-apply --whitespace=fix with tab-in-indent
188
+ - whitespace: add tab-in-indent support for --whitespace=fix
189
+ - whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
190
+ - whitespace: tests for git-diff --check with tab-in-indent error class
191
+ - whitespace: add tab-in-indent error class
192
+ - whitespace: we cannot "catch all errors known to git" anymore
193
+
194
+Looked sensible.
195
+
196
+* ic/bash-completion-rpm (2010-03-26) 1 commit
197
+ (merged to 'next' on 2010-04-02 at 0358304)
198
+ + RPM spec: include bash completion support
199
+
200
+This is needed in 'master' by -rc1 at the latest.
201
+
202
* mg/notes-reflog (2010-03-29) 2 commits
203
- refs.c: Write reflogs for notes just like for branch heads
204
- t3301-notes: Test the creation of reflog entries
@@ -88,12 +233,11 @@ this with a confidence than fast-tracking it.
233
- merge: refactor code that calls "git merge-STRATEGY"
234
- revert: refactor merge recursive code into its own function
235
- revert: use strbuf to refactor the code that writes the merge message
91
- (this branch uses jn/merge-diff3-label.)
236
237
May merge to 'next' soon, but this is more about debugging and we are not
238
in a great hurry.
239
96
-* mr/gitweb-jsmin (2010-04-01) 6 commits
240
+* mr/gitweb-jsmin (2010-04-02) 6 commits
241
- gitweb: update INSTALL to use shorter make target
242
- gitweb: add documentation to INSTALL regarding gitweb.js
243
- instaweb: add minification awareness
@@ -101,86 +245,27 @@ in a great hurry.
245
- Gitweb: add support for minifying gitweb.css
246
- Gitweb: add ignore and clean rules for minified files
247
104
-Soon in 'next' when minor rewording replacement patches come; otherwise
105
-felt solid.
248
+Soon in 'next', to iron out leftover issues if any.
249
250
* sc/http-late-auth (2010-04-01) 1 commit
108
- - Prompt for a username when an HTTP request 401s
251
+ (merged to 'next' on 2010-04-02 at c991acf)
252
+ + Prompt for a username when an HTTP request 401s
253
110
-May merge to 'next', but I would prefer waiting til 1.7.2 to have
111
-this with a confidence than fast-tracking it.
112
-
113
-* hg/convert (2010-03-29) 5 commits
114
- . convert: Added core.refilteronadd feature.
115
- . convert: Inhibit contraction of foreign $Id$ during stats.
116
- . convert: Use the enum constant SAFE_CRLF_FALSE.
117
- . convert: Keep foreign $Id$ on checkout.
118
- . convert: Safer handling of $Id$ contraction.
254
+I would prefer waiting til 1.7.2 to have this with a confidence than
255
+fast-tracking it.
256
257
* jk/cached-textconv (2010-04-01) 7 commits
121
- - diff: avoid useless filespec population
122
- - diff: cache textconv output
123
- - textconv: refactor calls to run_textconv
124
- - introduce notes-cache interface
125
- - make commit_tree a library function
126
- - fix textconv leak in emit_rewrite_diff
127
- - fix const-correctness of write_sha1_file
128
-
129
-May merge to 'next', but I would prefer waiting til 1.7.2 to have
130
-this with a confidence than fast-tracking it.
131
-
132
---------------------------------------------------
133
-[Stalled]
134
-
135
-* cw/test-lib-relicense (2010-02-22) 1 commit
136
- . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
137
-
138
-Ack-collection stopped at the last three names. I am hoping Carl can take
139
-it from there without my keeping an eye on it.
140
-
141
-* js/rebase-origin-x (2010-02-05) 1 commit
142
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
143
-
144
-I retract my objection against the idea of -x; needs polishing before
145
-moving forward.
146
-
147
-* sg/bash-completion (2010-02-23) 4 commits
148
- (merged to 'next' on 2010-03-08 at bc59860)
149
- + bash: completion for gitk aliases
150
- + bash: support user-supplied completion scripts for aliases
151
- + bash: support user-supplied completion scripts for user's git commands
152
- + bash: improve aliased command recognition
153
-
154
-Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
155
-
156
-* sd/log-decorate (2010-02-17) 3 commits
157
- (merged to 'next' on 2010-03-08 at 58a6fba)
158
- + log.decorate: usability fixes
159
- + Add `log.decorate' configuration variable.
160
- + git_config_maybe_bool()
161
-
162
-Needs squelching the configuration setting when "--pretty=raw" is given,
163
-at least, or possibly when any "--pretty" is explicitly given.
164
-
165
-* np/malloc-threading (2010-03-24) 1 commit
166
- - Make xmalloc and xrealloc thread-safe
167
-
168
-Still has locking issues?
169
-
170
-* js/async-thread (2010-03-09) 7 commits
171
- - Enable threaded async procedures whenever pthreads is available
172
- (merged to 'next' on 2010-03-20 at 9939243)
173
- + Dying in an async procedure should only exit the thread, not the process.
174
- + Reimplement async procedures using pthreads
175
- + Windows: more pthreads functions
176
- + Fix signature of fcntl() compatibility dummy
177
- + Make report() from usage.c public as vreportf() and use it.
178
- + Modernize t5530-upload-pack-error.
179
-
180
-Waiting for resolution of locking issues in malloc-threading.
181
-
182
---------------------------------------------------
183
-[Cooking]
258
+ (merged to 'next' on 2010-04-02 at a023e3c)
259
+ + diff: avoid useless filespec population
260
+ + diff: cache textconv output
261
+ + textconv: refactor calls to run_textconv
262
+ + introduce notes-cache interface
263
+ + make commit_tree a library function
264
+ + fix textconv leak in emit_rewrite_diff
265
+ + fix const-correctness of write_sha1_file
266
+
267
+I would prefer waiting til 1.7.2 to have this with a confidence than
268
+fast-tracking it.
269
270
* da/maint-python-startup (2010-03-27) 1 commit
271
(merged to 'next' on 2010-04-01 at ca6897a)
@@ -194,7 +279,8 @@ Hopefully will merge to 'master' by -rc0.
279
280
Hopefully will merge to 'master' by -rc0.
281
197
-* ld/discovery-limit-to-fs (2010-03-17) 3 commits
282
+* ld/discovery-limit-to-fs (2010-04-04) 4 commits
283
+ - GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
284
- Add support for GIT_ONE_FILESYSTEM
285
- truncate cwd string before printing error message
286
- config.c: remove static keyword from git_env_bool()
@@ -202,9 +288,11 @@ Hopefully will merge to 'master' by -rc0.
288
Linus made a good point of making this a default, and Erick Mattos
289
confirmed that it won't be a problem even on Windows.
290
205
-Will move to 'next' after such a "default on" change, keep it there until
206
-1.7.1 ships, warn about it in the release notes as an upcoming backward
207
-incompatibility, and then move to 'master' after 1.7.1.
291
+The tip one is my attempt to do just that, but I have a feeling that
292
+it is introducing a double-negation. ONE-FILESYSTEM that defaults to
293
+true but the user can flip it to false to trigger NOT-LIMITED-TO-ONE
294
+semantics. Perhaps it should be renamed to GIT_DISCOVER_REPOSITORY_XDEV
295
+or something that defaults to false.
296
297
* sb/fmt-merge-msg (2010-03-24) 7 commits
298
(merged to 'next' on 2010-04-01 at 5fcbec5)
@@ -219,12 +307,13 @@ incompatibility, and then move to 'master' after 1.7.1.
307
Hopefully will merge to 'master' by -rc0.
308
309
* pc/remove-warn (2010-03-26) 4 commits
222
- - Remove a redundant errno test in a usage of remove_path
223
- - Introduce remove_or_warn function
224
- - Implement the rmdir_or_warn function
225
- - Generalise the unlink_or_warn function
310
+ (merged to 'next' on 2010-04-02 at 52fc00d)
311
+ + Remove a redundant errno test in a usage of remove_path
312
+ + Introduce remove_or_warn function
313
+ + Implement the rmdir_or_warn function
314
+ + Generalise the unlink_or_warn function
315
227
-I cherry-picked only obviously sensible bits. Soon in 'next'.
316
+I cherry-picked only obviously sensible bits.
317
318
* ef/maint-empty-commit-log (2010-03-21) 1 commit
319
(merged to 'next' on 2010-03-28 at aa103e5)
@@ -239,42 +328,6 @@ Hopefully will merge to 'master' by -rc0.
328
Perhaps needs a bit of documentation updates, describing the "going open
329
source" scenario.
330
242
-* mg/mailmap-update (2010-03-19) 1 commit
243
- (merged to 'next' on 2010-03-28 at 8ac3436)
244
- + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
245
-
246
-Soon in 'master'.
247
-
248
-* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit
249
- (merged to 'next' on 2010-03-28 at 7e8e58e)
250
- + send-email: lazily assign editor variable
251
-
252
-Soon in 'master'.
253
-
254
-* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit
255
- (merged to 'next' on 2010-03-28 at d3e9f04)
256
- + rev-list: use default abbrev length when abbrev-commit is in effect
257
-
258
-Soon in 'master'.
259
-
260
-* rb/maint-python-path (2010-03-21) 1 commit
261
- (merged to 'next' on 2010-03-28 at 58ba409)
262
- + Correct references to /usr/bin/python which does not exist on FreeBSD
263
-
264
-Soon in 'master'.
265
-
266
-* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit
267
- (merged to 'next' on 2010-03-28 at fbedd77)
268
- + imap-send: Remove limitation on message body
269
-
270
-Soon in 'master'.
271
-
272
-* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit
273
- (merged to 'next' on 2010-03-28 at bf02879)
274
- + http-backend: Don't infinite loop during die()
275
-
276
-Soon in 'master'.
277
-
331
* ar/config-from-command-line (2010-03-26) 2 commits
332
- Use strbufs instead of open-coded string manipulation
333
- Allow passing of configuration parameters in the command line
@@ -282,102 +335,6 @@ Soon in 'master'.
335
May merge to 'next', but I would prefer waiting til 1.7.2 to have
336
this with a confidence than fast-tracking it.
337
285
-* bc/t5505-fix (2010-03-19) 3 commits
286
- (merged to 'next' on 2010-03-28 at 1b097af)
287
- + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
288
- + t5505: add missing &&
289
- + t5505: remove unnecessary subshell invocations
290
-
291
-Soon in 'master'.
292
-
293
-* bw/template-tool-buildconfig (2010-03-20) 2 commits
294
- (merged to 'next' on 2010-03-28 at 1e6fd8d)
295
- + Modernize git calling conventions in hook templates
296
- + Make templates honour SHELL_PATH and PERL_PATH
297
-
298
-Soon in 'master'.
299
-
300
-* mb/rebase-i-no-ff (2010-03-24) 1 commit
301
- (merged to 'next' on 2010-03-28 at b2c54cb)
302
- + Teach rebase the --no-ff option.
303
-
304
-Soon in 'master'.
305
-
306
-* jn/merge-diff3-label (2010-03-20) 14 commits
307
- (merged to 'next' on 2010-03-20 at 26f1805)
308
- + merge-recursive: add a label for ancestor
309
- + cherry-pick, revert: add a label for ancestor
310
- + revert: clarify label on conflict hunks
311
- + compat: add mempcpy()
312
- + checkout -m --conflict=diff3: add a label for ancestor
313
- + merge_trees(): add ancestor label parameter for diff3-style output
314
- + merge_file(): add comment explaining behavior wrt conflict style
315
- + checkout --conflict=diff3: add a label for ancestor
316
- + ll_merge(): add ancestor label parameter for diff3-style output
317
- + merge-file --diff3: add a label for ancestor
318
- + xdl_merge(): move file1 and file2 labels to xmparam structure
319
- + xdl_merge(): add optional ancestor label to diff3-style output
320
- + tests: document cherry-pick behavior in face of conflicts
321
- + tests: document format of conflicts from checkout -m
322
- (this branch is used by cc/revert-strategy.)
323
-
324
-Soon in 'master'.
325
-
326
-* do/rebase-i-arbitrary (2010-03-14) 1 commit
327
- (merged to 'next' on 2010-03-28 at 5ba9970)
328
- + rebase--interactive: don't require what's rebased to be a branch
329
-
330
-Soon in 'master'.
331
-
332
-* ja/send-email-ehlo (2010-03-14) 3 commits
333
- (merged to 'next' on 2010-03-28 at 00964a8)
334
- + git-send-email.perl - try to give real name of the calling host to HELO/EHLO
335
- + git-send-email.perl: add option --smtp-debug
336
- + git-send-email.perl: improve error message in send_message()
337
-
338
-Soon in 'master'.
339
-
340
-* ak/everyday-git (2009-10-21) 1 commit
341
- (merged to 'next' on 2010-03-28 at ae67548)
342
- + everyday: fsck and gc are not everyday operations
343
-
344
-Soon in 'master'.
345
-
346
-* bc/acl-test (2010-03-15) 5 commits
347
- (merged to 'next' on 2010-03-28 at b40fa09)
348
- + t/t1304: make a second colon optional in the mask ACL check
349
- + t/t1304: set the ACL effective rights mask
350
- + t/t1304: use 'test -r' to test readability rather than looking at mode bits
351
- + t/t1304: set the Default ACL base entries
352
- + t/t1304: avoid -d option to setfacl
353
-
354
-Soon in 'master'.
355
-
356
-* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
357
- (merged to 'next' on 2010-03-28 at 305ad0b)
358
- + daemon.c: avoid accessing ss_family member of struct sockaddr_storage
359
-
360
-Soon in 'master'.
361
-
362
-* ef/cherry-abbrev (2010-03-20) 2 commits
363
- (merged to 'next' on 2010-03-28 at eb3825c)
364
- + ls: remove redundant logic
365
- + cherry: support --abbrev option
366
-
367
-Soon in 'master'.
368
-
369
-* gh/maint-stash-show-error-message (2010-03-16) 1 commit
370
- (merged to 'next' on 2010-03-28 at 61a5643)
371
- + Improve error messages from 'git stash show'
372
-
373
-Soon in 'master'.
374
-
375
-* rs/threaded-grep-context (2010-03-15) 1 commit
376
- (merged to 'next' on 2010-03-28 at 1934af1)
377
- + grep: enable threading for context line printing
378
-
379
-Soon in 'master'.
380
-
338
* nd/setup (2010-03-25) 43 commits
339
- builtins: do not commit pager choice early
340
- builtins: reset startup_info->have_run_setup_gitdir when unsetting up repository
@@ -422,3 +379,22 @@ Soon in 'master'.
379
- config: use RUN_SETUP_GENTLY
380
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
381
- builtin: introduce startup_info struct
382
+
383
+--------------------------------------------------
384
+[Dropped]
385
+
386
+* cw/test-lib-relicense (2010-02-22) 1 commit
387
+ . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
388
+
389
+I am hoping Carl or Michal Sojka can take the topic to completion without
390
+my keeping an eye on it. Waiting for the one with full set of Acks.
391
+
392
+* hg/convert (2010-03-29) 5 commits
393
+ . convert: Added core.refilteronadd feature.
394
+ . convert: Inhibit contraction of foreign $Id$ during stats.
395
+ . convert: Use the enum constant SAFE_CRLF_FALSE.
396
+ . convert: Keep foreign $Id$ on checkout.
397
+ . convert: Safer handling of $Id$ contraction.
398
+
399
+The first two looked sensible but later one looked more like showing that
400
+it may not have been a good idea in the first place.