What's cooking (2012/09 #08)
Junio C Hamano committed
Sep 24, 2012 at 14:27 UTC
d20819096cfc0b53fc1a4edc3599094e73746f0c
1 file changed
+249
-276
whats-cooking.txt
+249
-276
@@ -1,19 +1,18 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2012, #07; Fri, 21)
4
-X-master-at: 16eed7c9938a65022010c3d95ada911b2fd46d25
5
-X-next-at: 68bd821eac8800bddb2213d2b7e4065e3e082059
3
+Subject: What's cooking in git.git (Sep 2012, #08; Mon, 24)
4
+X-master-at: b5d156c3622fa522966034c78fd6ed9a15504d46
5
+X-next-at: 95625d7562adfba98aa40d9772312bb3c2d92b7f
6
7
-What's cooking in git.git (Sep 2012, #07; Fri, 21)
7
+What's cooking in git.git (Sep 2012, #08; Mon, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-Today's tip of 'pu' has breakage in t0007 for people whose shell is
15
-not bash; a topic queued there needs to be fixed before moving
16
-forward.
14
+Feedback from contributors and reviewers involved in topics in the
15
+"stalled" category is sorely needed to help them get unstuck.
16
17
I'm planning to keep this cycle reasonably short and aim for tagging
18
the result as 1.8.0 at the end of 9th week, on October 21st, after
@@ -25,117 +24,64 @@ repositories listed at
24
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
28
---------------------------------------------------
29
-[Graduated to "master"]
30
-
31
-* er/doc-fast-import-done (2012-08-22) 1 commit
32
- (merged to 'next' on 2012-09-17 at bb8709a)
33
- + fast-import: document the --done option
34
-
35
- I got tired of waiting for ESR to respond with S-o-b for a trivial
36
- documentation updates, so I'll be moving this forward.
37
-
38
-
39
-* jc/maint-log-grep-all-match (2012-09-15) 10 commits
40
- (merged to 'next' on 2012-09-17 at 3c10a18)
41
- + t7810-grep: test --all-match with multiple --grep and --author options
42
- + t7810-grep: test interaction of multiple --grep and --author options
43
- + t7810-grep: test multiple --author with --all-match
44
- + t7810-grep: test multiple --grep with and without --all-match
45
- + t7810-grep: bring log --grep tests in common form
46
- (merged to 'next' on 2012-09-15 at 73fad40)
47
- + grep.c: mark private file-scope symbols as static
48
- (merged to 'next' on 2012-09-14 at 86b848c)
49
- + log: document use of multiple commit limiting options
50
- + log --grep/--author: honor --all-match honored for multiple --grep patterns
51
- + grep: show --debug output only once
52
- + grep: teach --debug option to dump the parse tree
53
-
54
- Fix a long-standing bug in "git log --grep" when multiple "--grep"
55
- are used together with "--all-match" and "--author" or "--committer".
56
-
57
-
58
-* jc/maint-log-grep-all-match-1 (2012-09-20) 1 commit
59
- (merged to 'next' on 2012-09-20 at 6bf192f)
60
- + grep.c: make two symbols really file-scope static this time
61
-
62
- A finishing touch to the "log --all-match --grep" topic.
63
-
64
-
65
-* jc/make-static (2012-09-15) 14 commits
66
- (merged to 'next' on 2012-09-17 at 3a7d87a)
67
- + sequencer.c: mark a private file-scope symbol as static
68
- + ident.c: mark private file-scope symbols as static
69
- + trace.c: mark a private file-scope symbol as static
70
- + wt-status.c: mark a private file-scope symbol as static
71
- + read-cache.c: mark a private file-scope symbol as static
72
- + strbuf.c: mark a private file-scope symbol as static
73
- + sha1-array.c: mark a private file-scope symbol as static
74
- + symlinks.c: mark private file-scope symbols as static
75
- + notes.c: mark a private file-scope symbol as static
76
- + rerere.c: mark private file-scope symbols as static
77
- + graph.c: mark private file-scope symbols as static
78
- + diff.c: mark a private file-scope symbol as static
79
- + commit.c: mark a file-scope private symbol as static
80
- + builtin/notes.c: mark file-scope private symbols as static
81
-
82
- Turn many file-scope private symbols to static to reduce the
83
- global namespace contamination.
84
-
85
-
86
-* mh/fetch-filter-refs (2012-09-18) 1 commit
87
- (merged to 'next' on 2012-09-18 at 5dd77d8)
88
- + string_list API: document what "sorted" means
89
-
90
-
91
-* mv/cherry-pick-s (2012-09-14) 1 commit
92
- (merged to 'next' on 2012-09-14 at 2d143e1)
93
- + cherry-pick: don't forget -s on failure
94
-
95
- After "git cherry-pick -s" gave control back to the user asking
96
- help to resolve conflicts, concluding "git commit" needs to be run
97
- with "-s" if the user wants to sign it off, but people often forgot
98
- to do so.
99
-
100
-
101
-* nd/fetch-status-alignment (2012-09-14) 1 commit
102
- (merged to 'next' on 2012-09-14 at 34237db)
103
- + fetch: align per-ref summary report in UTF-8 locales
104
-
105
- The status report from "git fetch", when messages like 'up-to-date'
106
- are translated, did not align the branch names well.
107
-
108
-
109
-* pw/p4-submit-conflicts (2012-09-16) 12 commits
110
- (merged to 'next' on 2012-09-17 at 7e57551)
111
- + git-p4: add submit --conflict option and config varaiable
112
- + git p4: add submit --prepare-p4-only option
113
- + git p4: add submit --dry-run option
114
- + git p4: accept -v for --verbose
115
- + git p4: revert deleted files after submit cancel
116
- + git p4: rearrange submit template construction
117
- + git p4: test clean-up after failed submit, fix added files
118
- + git p4: standardize submit cancel due to unchanged template
119
- + git p4: move conflict prompt into run, add [q]uit input
120
- + git p4: remove submit failure options [a]pply and [w]rite
121
- + git p4: gracefully fail if some commits could not be applied
122
- + git p4 test: remove bash-ism of combined export/assignment
123
-
27
--------------------------------------------------
28
[New Topics]
29
127
-* js/rebase-exec-command-not-found (2012-09-18) 1 commit
128
- - rebase -i: fix misleading error message after 'exec no-such' instruction
30
+* jc/blame-no-follow (2012-09-21) 2 commits
31
+ - blame: pay attention to --no-follow
32
+ - diff: accept --no-follow option
33
+ (this branch uses jc/blame-follows-renames.)
34
130
- Will merge to 'next'.
35
+ Teaches "--no-follow" option to "git blame" to disable its
36
+ whole-file rename detection.
37
38
+ Any comments?
39
133
-* rr/test-make-sure-we-have-git (2012-09-18) 1 commit
134
- - t/test-lib: make sure Git has already been built
40
+
41
+* os/commit-submodule-ignore (2012-09-24) 1 commit
42
+ - commit: pay attention to submodule.$name.ignore in .gitmodules
43
+
44
+ "git status" honored the ignore=dirty settings in .gitmodules but
45
+ "git commit" didn't.
46
+
47
+
48
+* rc/maint-complete-git-p4 (2012-09-24) 1 commit
49
+ - Teach git-completion about git p4
50
51
Will merge to 'next'.
52
53
54
+* rr/maint-submodule-unknown-cmd (2012-09-24) 2 commits
55
+ - [SQUASH] adjust test and doc to "git submodule no-such-subcommand"
56
+ - submodule: if $command was not matched, don't parse other args
57
+
58
+ Will merge to 'next' after squashing the tip.
59
+
60
+--------------------------------------------------
61
+[Stalled]
62
+
63
+* as/check-ignore (2012-09-24) 16 commits
64
+ - [SQUASH-FIX] 283d072 (Add git-check-ignore sub-command, 2012-09-20)
65
+ - [REROLL NEEDED] minimum compilation fix
66
+ - Add git-check-ignore sub-command
67
+ - dir.c: provide free_directory() for reclaiming dir_struct memory
68
+ - pathspec.c: move reusable code from builtin/add.c
69
+ - dir.c: refactor treat_gitlinks()
70
+ - dir.c: keep track of where patterns came from
71
+ - dir.c: refactor is_path_excluded()
72
+ - dir.c: refactor is_excluded()
73
+ - dir.c: refactor is_excluded_from_list()
74
+ - dir.c: rename excluded() to is_excluded()
75
+ - dir.c: rename excluded_from_list() to is_excluded_from_list()
76
+ - dir.c: rename path_excluded() to is_path_excluded()
77
+ - dir.c: rename cryptic 'which' variable to more consistent name
78
+ - Improve documentation and comments regarding directory traversal API
79
+ - Update directory listing API doc to match code
80
+
81
+ Rerolled.
82
+ Expecting a further reroll to follow-up review comments.
83
+
84
+
85
* as/test-tweaks (2012-09-20) 7 commits
86
- tests: paint unexpectedly fixed known breakages in bold red
87
- tests: test the test framework more thoroughly
@@ -151,84 +97,6 @@ repositories listed at
97
Has the "is this really blue?" issue Peff raised resolved???
98
99
154
-* db/doc-custom-xmlto (2012-09-19) 1 commit
155
- - Documentation/Makefile: Allow custom XMLTO binary
156
-
157
- Will merge to 'next'.
158
-
159
-
160
-* js/hp-nonstop (2012-09-19) 1 commit
161
- - Port to HP NonStop
162
- (this branch uses js/poll-emu.)
163
-
164
- Will merge to 'next'.
165
-
166
-
167
-* po/maint-docs (2012-09-19) 5 commits
168
- - Doc branch: show -vv option and alternative
169
- - Doc clean: add See Also link
170
- - Doc add: link gitignore
171
- - Doc: separate gitignore pattern sources
172
- - Doc: shallow clone deepens _to_ new depth
173
-
174
- Various documentation fixups.
175
-
176
- Will merge to 'next'.
177
-
178
-
179
-* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit
180
- - Revert "retry request without query when info/refs?query fails"
181
- (this branch is used by jk/smart-http-switch.)
182
-
183
- Kills an old workaround for a unlikely server misconfiguration that
184
- hurts debuggability.
185
-
186
- Will merge to 'next'.
187
-
188
-
189
-* jk/smart-http-switch (2012-09-21) 2 commits
190
- - remote-curl: let users turn off smart http
191
- - remote-curl: rename is_http variable
192
- (this branch uses sp/maint-http-info-refs-no-retry.)
193
-
194
- Will merge to 'next'.
195
-
196
-
197
-* sp/maint-http-enable-gzip (2012-09-20) 1 commit
198
- - Enable info/refs gzip decompression in HTTP client
199
-
200
- Allows a more common 'gzip' Accept-Encoding to be used.
201
-
202
- Will merge to 'next'.
203
-
204
-
205
-* nd/pretty-placeholder-with-color-option (2012-09-20) 4 commits
206
- - [SQUASH] do not use real-sb without initializing
207
- - pretty: support right alignment
208
- - pretty: support placeholders %C+ and %C-
209
- - pretty: share code between format_decoration and show_decorations
210
-
211
- The feature might be great, but the interface is iffy.
212
-
213
-
214
-* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
215
- - receive-pack: drop "n/a" on unpacker errors
216
- - receive-pack: send pack-processing stderr over sideband
217
- - receive-pack: redirect unpack-objects stdout to /dev/null
218
-
219
- Send errors from "unpack-objects" and "index-pack" back to the "git
220
- push" over the git and smart-http protocols, just like it is done
221
- for a push over the ssh protocol.
222
-
223
- Will merge to 'next'.
224
-
225
-
226
-* jc/blame-follows-renames (2012-09-21) 1 commit
227
- - git blame: document that it always follows origin across whole-file renames
228
-
229
---------------------------------------------------
230
-[Stalled]
231
-
100
* fa/remote-svn (2012-09-19) 16 commits
101
- Add a test script for remote-svn
102
- remote-svn: add marks-file regeneration
@@ -248,7 +116,7 @@ repositories listed at
116
- Implement a remote helper for svn in C
117
(this branch is used by fa/vcs-svn.)
118
251
- A GSoC project. Looked promising.
119
+ A GSoC project.
120
Waiting for comments from mentors and stakeholders.
121
122
@@ -259,10 +127,24 @@ repositories listed at
127
- svndump: move struct definitions to .h
128
(this branch uses fa/remote-svn.)
129
262
- A GSoC project. Looked promising.
130
+ A GSoC project.
131
Waiting for comments from mentors and stakeholders.
132
133
134
+* jl/submodule-rm (2012-08-27) 1 commit
135
+ - Teach rm to remove submodules unless they contain a git directory
136
+
137
+ "git rm submodule" cannot blindly remove a submodule directory as
138
+ its working tree may have local changes, and worse yet, it may even
139
+ have its repository embedded in it. Teach it some special cases
140
+ where it is safe to remove a submodule, specifically, when there is
141
+ no local changes in the submodule working tree, and its repository
142
+ is not embedded in its working tree but is elsewhere and uses the
143
+ gitfile mechanism to point at it.
144
+
145
+ Replacement sent but was still iffy around conflicted merge cases.
146
+
147
+
148
* ph/credential-refactor (2012-09-02) 5 commits
149
- wincred: port to generic credential helper
150
- Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
@@ -327,41 +209,6 @@ repositories listed at
209
Otherwise may discard.
210
211
330
-* tg/index-v5 (2012-08-17) 13 commits
331
- . p0002-index.sh: add perf test for the index formats
332
- . update-index.c: rewrite index when index-version is given
333
- . Write resolve-undo data for index-v5
334
- . Write index-v5 cache-tree data
335
- . Write index-v5
336
- . Read cache-tree in index-v5
337
- . Read resolve-undo data
338
- . Read index-v5
339
- . Make in-memory format aware of stat_crc
340
- . Add documentation of the index-v5 file format
341
- . t2104: Don't fail for index versions other than [23]
342
- . read-cache.c: Re-read index if index file changed
343
- . Move index v2 specific functions to their own file
344
-
345
- A GSoC project. Was waiting for comments from mentors and
346
- stakeholders, but nothing seems to be happening, other than breakage
347
- fixes on Cygwin. May discard.
348
-
349
-
350
-* mz/rebase-range (2012-07-18) 7 commits
351
- . rebase (without -p): correctly calculate patches to rebase
352
- . rebase -p: don't request --left-right only to ignore left side
353
- . rebase -p: use --cherry-mark for todo file
354
- . git-rebase--interactive.sh: look up subject in add_pick_line
355
- . git-rebase--interactive: group all $preserve_merges code
356
- . git-rebase--interactive.sh: extract function for adding "pick" line
357
- . git-rebase--am.sh: avoid special-casing --keep-empty
358
-
359
- Expecting a reroll.
360
-
361
- Performance concerns from Windows folks. Also the series lacks
362
- proper sign-offs.
363
-
364
-
212
* mb/remote-default-nn-origin (2012-07-11) 6 commits
213
- Teach get_default_remote to respect remote.default.
214
- Test that plain "git fetch" uses remote.default when on a detached HEAD.
@@ -413,25 +260,113 @@ repositories listed at
260
--------------------------------------------------
261
[Cooking]
262
416
-* as/check-ignore (2012-09-21) 15 commits
417
- - [REROLL NEEDED] minimum compilation fix
418
- - Add git-check-ignore sub-command
419
- - dir.c: provide free_directory() for reclaiming dir_struct memory
420
- - pathspec.c: move reusable code from builtin/add.c
421
- - dir.c: refactor treat_gitlinks()
422
- - dir.c: keep track of where patterns came from
423
- - dir.c: refactor is_path_excluded()
424
- - dir.c: refactor is_excluded()
425
- - dir.c: refactor is_excluded_from_list()
426
- - dir.c: rename excluded() to is_excluded()
427
- - dir.c: rename excluded_from_list() to is_excluded_from_list()
428
- - dir.c: rename path_excluded() to is_path_excluded()
429
- - dir.c: rename cryptic 'which' variable to more consistent name
430
- - Improve documentation and comments regarding directory traversal API
431
- - Update directory listing API doc to match code
263
+* js/rebase-exec-command-not-found (2012-09-18) 1 commit
264
+ (merged to 'next' on 2012-09-24 at ed5b048)
265
+ + rebase -i: fix misleading error message after 'exec no-such' instruction
266
433
- Rerolled.
434
- Expecting a further reroll to follow-up review comments.
267
+ Will merge to 'master'.
268
+
269
+
270
+* rr/test-make-sure-we-have-git (2012-09-18) 1 commit
271
+ (merged to 'next' on 2012-09-24 at 9e8d28d)
272
+ + t/test-lib: make sure Git has already been built
273
+
274
+ Only the first test t0000 in the test suite made sure we have built
275
+ Git to be tested; move the check to test-lib so that it applies to
276
+ all tests equally.
277
+
278
+ Will merge to 'master'.
279
+
280
+
281
+* db/doc-custom-xmlto (2012-09-19) 1 commit
282
+ (merged to 'next' on 2012-09-24 at efcfec1)
283
+ + Documentation/Makefile: Allow custom XMLTO binary
284
+
285
+ Will merge to 'master'.
286
+
287
+
288
+* js/hp-nonstop (2012-09-19) 1 commit
289
+ (merged to 'next' on 2012-09-24 at 283ac87)
290
+ + Port to HP NonStop
291
+ (this branch uses js/poll-emu.)
292
+
293
+ Port to HP NonStop aka Tandem.
294
+
295
+ Will merge to 'master'.
296
+
297
+
298
+* po/maint-docs (2012-09-19) 5 commits
299
+ (merged to 'next' on 2012-09-24 at 9df3935)
300
+ + Doc branch: show -vv option and alternative
301
+ + Doc clean: add See Also link
302
+ + Doc add: link gitignore
303
+ + Doc: separate gitignore pattern sources
304
+ + Doc: shallow clone deepens _to_ new depth
305
+
306
+ Various documentation fixups.
307
+
308
+ Will merge to 'master'.
309
+
310
+
311
+* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit
312
+ (merged to 'next' on 2012-09-24 at ebcce8e)
313
+ + Revert "retry request without query when info/refs?query fails"
314
+ (this branch is used by jk/smart-http-switch.)
315
+
316
+ Kills an old workaround for a unlikely server misconfiguration that
317
+ hurts debuggability.
318
+
319
+ Will merge to 'master'.
320
+
321
+
322
+* jk/smart-http-switch (2012-09-21) 2 commits
323
+ (merged to 'next' on 2012-09-24 at b2a2777)
324
+ + remote-curl: let users turn off smart http
325
+ + remote-curl: rename is_http variable
326
+ (this branch uses sp/maint-http-info-refs-no-retry.)
327
+
328
+ Allows users to turn off smart-http when talking to dumb-only
329
+ servers.
330
+
331
+ Will merge to 'master'.
332
+
333
+
334
+* sp/maint-http-enable-gzip (2012-09-20) 1 commit
335
+ (merged to 'next' on 2012-09-24 at 1d05142)
336
+ + Enable info/refs gzip decompression in HTTP client
337
+
338
+ Allows a more common 'gzip' Accept-Encoding to be used.
339
+
340
+ Will merge to 'master'.
341
+
342
+
343
+* nd/pretty-placeholder-with-color-option (2012-09-20) 4 commits
344
+ - [SQUASH] do not use real-sb without initializing
345
+ - pretty: support right alignment
346
+ - pretty: support placeholders %C+ and %C-
347
+ - pretty: share code between format_decoration and show_decorations
348
+
349
+ Rerolled, but haven't picked it up yet.
350
+
351
+
352
+* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
353
+ - receive-pack: drop "n/a" on unpacker errors
354
+ - receive-pack: send pack-processing stderr over sideband
355
+ - receive-pack: redirect unpack-objects stdout to /dev/null
356
+
357
+ Send errors from "unpack-objects" and "index-pack" back to the "git
358
+ push" over the git and smart-http protocols, just like it is done
359
+ for a push over the ssh protocol.
360
+
361
+ Will merge to 'next'.
362
+
363
+
364
+* jc/blame-follows-renames (2012-09-21) 1 commit
365
+ - git blame: document that it always follows origin across whole-file renames
366
+ (this branch is used by jc/blame-no-follow.)
367
+
368
+ Clarify the "blame" documentation to tell the users that there is
369
+ no need to ask for "--follow".
370
371
372
* rt/maint-clone-single (2012-09-20) 1 commit
@@ -444,45 +379,53 @@ repositories listed at
379
380
381
* ep/malloc-check-perturb (2012-09-17) 2 commits
447
- - MALLOC_CHECK: various clean-ups
448
- - Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
382
+ (merged to 'next' on 2012-09-24 at c490ea5)
383
+ + MALLOC_CHECK: various clean-ups
384
+ + Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
385
386
Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
387
built-in memory access checking facility GNU libc has.
388
453
- Will merge to 'next'.
389
+ Will merge to 'master'.
390
391
392
* aj/xfuncname-ada (2012-09-16) 1 commit
457
- - Add userdiff patterns for Ada
393
+ (merged to 'next' on 2012-09-24 at 99fcbb3)
394
+ + Add userdiff patterns for Ada
395
459
- Will merge to 'next'.
396
+ Will merge to 'master'.
397
398
399
* aw/rebase-i-edit-todo (2012-09-19) 5 commits
463
- - rebase -i: suggest using --edit-todo to fix an unknown instruction
464
- - rebase -i: Add tests for "--edit-todo"
465
- - rebase -i: Teach "--edit-todo" action
466
- - rebase -i: Refactor help messages for todo file
467
- - rebase usage: subcommands can not be combined with -i
400
+ (merged to 'next' on 2012-09-24 at 95625d7)
401
+ + rebase -i: suggest using --edit-todo to fix an unknown instruction
402
+ + rebase -i: Add tests for "--edit-todo"
403
+ + rebase -i: Teach "--edit-todo" action
404
+ + rebase -i: Refactor help messages for todo file
405
+ + rebase usage: subcommands can not be combined with -i
406
469
- Will merge to 'next'.
407
+ Will merge to 'master'.
408
409
410
* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit
473
- - mailinfo: do not concatenate charset= attribute values from mime headers
411
+ (merged to 'next' on 2012-09-24 at c551c9f)
412
+ + mailinfo: do not concatenate charset= attribute values from mime headers
413
475
- Will merge to 'next'.
414
+ When "git am" is fed an input that has multiple "Content-type: ..."
415
+ header, it did not grok charset= attribute correctly.
416
+
417
+ Will merge to 'master'.
418
419
420
* js/poll-emu (2012-09-17) 4 commits
479
- - make poll() work on platforms that can't recv() on a non-socket
480
- - poll() exits too early with EFAULT if 1st arg is NULL
481
- - fix some win32 specific dependencies in poll.c
482
- - make poll available for other platforms lacking it
421
+ (merged to 'next' on 2012-09-24 at 32e1601)
422
+ + make poll() work on platforms that can't recv() on a non-socket
423
+ + poll() exits too early with EFAULT if 1st arg is NULL
424
+ + fix some win32 specific dependencies in poll.c
425
+ + make poll available for other platforms lacking it
426
(this branch is used by js/hp-nonstop.)
427
485
- Will merge to 'next'.
428
+ Will merge to 'master'.
429
430
431
* nd/wildmatch (2012-09-17) 5 commits
@@ -530,29 +473,18 @@ repositories listed at
473
world projects.
474
475
533
-* rs/archive-zip-utf8 (2012-09-18) 4 commits
534
- (merged to 'next' on 2012-09-18 at 8535c83)
535
- + archive-zip: declare creator to be Unix for UTF-8 paths
476
+* rs/archive-zip-utf8 (2012-09-24) 4 commits
477
+ (merged to 'next' on 2012-09-24 at 9b42b1c)
478
+ + archive-zip: write extended timestamp
479
+ archive-zip: support UTF-8 paths
480
+ Revert "archive-zip: support UTF-8 paths"
481
(merged to 'next' on 2012-09-11 at 3b1f071)
482
+ archive-zip: support UTF-8 paths
483
541
- Will merge to 'master'.
542
-
484
+ With another reroll, it looks like the series is as polished as it
485
+ could be.
486
544
-* jl/submodule-rm (2012-08-27) 1 commit
545
- - Teach rm to remove submodules unless they contain a git directory
546
-
547
- "git rm submodule" cannot blindly remove a submodule directory as
548
- its working tree may have local changes, and worse yet, it may even
549
- have its repository embedded in it. Teach it some special cases
550
- where it is safe to remove a submodule, specifically, when there is
551
- no local changes in the submodule working tree, and its repository
552
- is not embedded in its working tree but is elsewhere and uses the
553
- gitfile mechanism to point at it.
554
-
555
- Replacement sent but was still iffy around conflicted merge cases.
487
+ Will merge to 'master'.
488
489
490
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
@@ -562,3 +494,44 @@ repositories listed at
494
495
Will defer until the end of the 2012.
496
while waiting for older "less" to go extinct.
497
+
498
+--------------------------------------------------
499
+[Discarded]
500
+
501
+* tg/index-v5 (2012-08-17) 13 commits
502
+ . p0002-index.sh: add perf test for the index formats
503
+ . update-index.c: rewrite index when index-version is given
504
+ . Write resolve-undo data for index-v5
505
+ . Write index-v5 cache-tree data
506
+ . Write index-v5
507
+ . Read cache-tree in index-v5
508
+ . Read resolve-undo data
509
+ . Read index-v5
510
+ . Make in-memory format aware of stat_crc
511
+ . Add documentation of the index-v5 file format
512
+ . t2104: Don't fail for index versions other than [23]
513
+ . read-cache.c: Re-read index if index file changed
514
+ . Move index v2 specific functions to their own file
515
+
516
+ A GSoC project. Was waiting for comments from mentors and
517
+ stakeholders, but nothing seems to be happening, other than breakage
518
+ fixes on Cygwin.
519
+
520
+ Discarded without prejudice.
521
+
522
+
523
+* mz/rebase-range (2012-07-18) 7 commits
524
+ . rebase (without -p): correctly calculate patches to rebase
525
+ . rebase -p: don't request --left-right only to ignore left side
526
+ . rebase -p: use --cherry-mark for todo file
527
+ . git-rebase--interactive.sh: look up subject in add_pick_line
528
+ . git-rebase--interactive: group all $preserve_merges code
529
+ . git-rebase--interactive.sh: extract function for adding "pick" line
530
+ . git-rebase--am.sh: avoid special-casing --keep-empty
531
+
532
+ Expecting a reroll.
533
+
534
+ Performance concerns from Windows folks. Also the series lacks
535
+ proper sign-offs.
536
+
537
+ Discarded without prejudice.