What's cooking (2012/08 #05)
Junio C Hamano committed
Aug 18, 2012 at 23:42 UTC
48a56d0d4e43237336c105f1a4a98b150c731ee4
1 file changed
+156
-48
whats-cooking.txt
+156
-48
@@ -1,17 +1,23 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2012, #04; Tue, 14)
4
-X-master-at: 61b472ed8b090a3e9240590c85041120a54dd268
5
-X-next-at: 4accbf693d5564e36b727349eebdbcb0d4f70a02
3
+Subject: What's cooking in git.git (Aug 2012, #05; Sat, 18)
4
+X-master-at: 91e4bfe96f1e72a3ce743fe032bfadfc9509fc2a
5
+X-next-at: f24913b098a0334d129beee428e81b2d82449265
6
7
-What's cooking in git.git (Aug 2012, #04; Tue, 14)
7
+What's cooking in git.git (Aug 2012, #05; Sat, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
11
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
12
13
-Hopefully tomorrow's 1.7.12-rc3 will be the final rc before the real
14
-thing.
13
+I'll be tagging the v1.7.12 final sometime tomorrow, and following
14
+the tradition the next branch will be rebuilt on top of 'master'
15
+after a few days. We would also eject some topics in 'next' that
16
+turned out to be mistakes when that rebuilding happens, but I do not
17
+think we have any such topics right now. And then, post 1.7.12
18
+cycle opens. I think the next cycle should start the transition of
19
+that much waited "push default change" topic and perhaps we may want
20
+to even call it 1.8.0 release. I haven't decided yet.
21
22
You can find the changes described here in the integration branches of the
23
repositories listed at
@@ -21,23 +27,104 @@ repositories listed at
27
--------------------------------------------------
28
[New Topics]
29
24
-* hv/submodule-path-unmatch (2012-08-14) 1 commit
25
- - Let submodule command exit with error status if path does not exist
26
-
27
-As the title says.
28
-
29
-* jc/add-delete-default (2012-08-13) 1 commit
30
- - git add: notice removal of tracked paths by default
31
-
32
-"git add dir/" updated modified files and added new files, but does
33
-not notice removed files, which may be "Huh?" to some users. They
34
-can of course use "git add -A dir/", but why should they?
35
-
36
-* jc/maint-rev-list-topo-doc (2012-08-13) 1 commit
37
- - rev-list docs: clarify --topo-order description
38
-
39
-Further rewording suggestions by Martin and Thomas were good, but
40
-haven't been incorporated into this patch.
30
+* hv/coding-guidelines (2012-08-15) 1 commit
31
+ (merged to 'next' on 2012-08-18 at 5a78f2c)
32
+ + Documentation/CodingGuidelines: spell out more shell guidelines
33
+
34
+In earlier days, "imitate the style in the neibouring code" was
35
+sufficient to keep the coherent style, but over time some parts of
36
+the codebase have drifted enough to make it ineffective.
37
+
38
+* jc/daemon-access-hook (2012-08-15) 1 commit
39
+ - daemon: --access-hook option
40
+
41
+Allow an external command to tell git-daemon to decline service
42
+based on the client address, repository path, etc.
43
+
44
+* jc/send-email-reconfirm (2012-08-14) 1 commit
45
+ - send-email: validate & reconfirm interactive responses
46
+
47
+Validate interactive input to "git send-email" to avoid common
48
+mistakes such as saying "y<RETURN>" to sender mail address whose
49
+prompt is given with a correctly guessed default.
50
+
51
+* pw/p4-submit-conflicts (2012-08-16) 12 commits
52
+ - git p4: add submit --prepare-p4-only option
53
+ - git p4: add submit --dry-run option
54
+ - git p4: accept -v for --verbose
55
+ - git p4: revert deleted files after submit cancel
56
+ - git p4: rearrange submit template construction
57
+ - git p4: test clean-up after failed submit, fix added files
58
+ - git p4: standardize submit cancel due to unchanged template
59
+ - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
60
+ - git p4: remove submit failure options [a]pply and [w]rite
61
+ - git p4: gracefully fail if some commits could not be applied
62
+ - git p4 test: use p4d -L option to suppress log messages
63
+ - git p4 test: remove bash-ism of combined export/assignment
64
+
65
+* tx/relative-in-the-future (2012-08-16) 2 commits
66
+ - date: show relative dates in the future
67
+ - date: refactor the relative date logic from presentation
68
+
69
+* ef/win32-cred-helper (2012-08-16) 1 commit
70
+ - contrib: add win32 credential-helper
71
+
72
+* jc/maint-abbrev-option-cli (2012-08-16) 1 commit
73
+ (merged to 'next' on 2012-08-18 at e002006)
74
+ + gitcli: describe abbreviation of long options
75
+
76
+We did not document that many commands take unique prefix
77
+abbreviations of long options (e.g. "--option" may be the only flag
78
+that the command accepts that begin with "--opt", in which case you
79
+can give "--opt") anywhere easy to find for new people.
80
+
81
+* mv/pull-r-for-rebase (2012-08-17) 1 commit
82
+ (merged to 'next' on 2012-08-18 at e7d885b)
83
+ + man: git pull -r is a short for --rebase
84
+
85
+Minor documentation update.
86
+
87
+* rr/precompose-utf8-cleanup (2012-08-17) 1 commit
88
+ - cleanup precompose_utf8
89
+
90
+A style and code cleanup.
91
+
92
+* jc/doc-git-updates (2012-08-17) 1 commit
93
+ (merged to 'next' on 2012-08-18 at f24913b)
94
+ + Documentation: update the introductory section
95
+
96
+* fa/remote-svn (2012-08-17) 16 commits
97
+ - Add a test script for remote-svn
98
+ - remote-svn: add marks-file regeneration
99
+ - Add a svnrdump-simulator replaying a dump file for testing
100
+ - remote-svn: add incremental import
101
+ - remote-svn: Activate import/export-marks for fast-import
102
+ - Create a note for every imported commit containing svn metadata
103
+ - vcs-svn: add fast_export_note to create notes
104
+ - Allow reading svn dumps from files via file:// urls
105
+ - remote-svn, vcs-svn: Enable fetching to private refs
106
+ - When debug==1, start fast-import with "--stats" instead of "--quiet"
107
+ - Add documentation for the 'bidi-import' capability of remote-helpers
108
+ - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
109
+ - Add argv_array_detach and argv_array_free_detached
110
+ - Add svndump_init_fd to allow reading dumps from arbitrary FDs
111
+ - Integrate remote-svn into svn-fe/Makefile
112
+ - Implement a remote helper for svn in C
113
+ (this branch is used by fa/vcs-svn.)
114
+
115
+* fa/vcs-svn (2012-08-18) 7 commits
116
+ - fixup: add missing cast to vcs-svn/fast_export.c
117
+ - fixup - no old style defn
118
+ - vcs-svn: remove repo_tree
119
+ - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
120
+ - vcs-svn/svndump: restructure node_ctx, rev_ctx handling
121
+ - svndump: move struct definitions to .h
122
+ - vcs-svn: Add sha1 calculation to fast_export and line_buffer
123
+ (this branch uses fa/remote-svn.)
124
+
125
+* mh/maint-config-doc-proxy-command (2012-08-18) 2 commits
126
+ - git-config doc: unconfuse an example
127
+ - git-config.txt: fix example
128
129
--------------------------------------------------
130
[Stalled]
@@ -62,12 +149,6 @@ proper sign-offs.
149
150
Expecting a reroll.
151
65
-* ph/stash-rerere (2012-07-08) 2 commits
66
- - stash: invoke rerere in case of conflict
67
- - test: git-stash conflict sets up rerere
68
-
69
-Will be rerolled but is going in the right direction.
70
-
152
* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
153
- commit/commit-tree: correct latin1 to utf-8
154
@@ -128,6 +209,30 @@ working :-<.
209
--------------------------------------------------
210
[Cooking]
211
212
+* ph/stash-rerere (2012-08-17) 2 commits
213
+ - stash: invoke rerere in case of conflict
214
+ - test: git-stash conflict sets up rerere
215
+
216
+* hv/submodule-path-unmatch (2012-08-14) 1 commit
217
+ - Let submodule command exit with error status if path does not exist
218
+
219
+As the title says.
220
+
221
+* jc/add-delete-default (2012-08-13) 1 commit
222
+ - git add: notice removal of tracked paths by default
223
+
224
+"git add dir/" updated modified files and added new files, but does
225
+not notice removed files, which may be "Huh?" to some users. They
226
+can of course use "git add -A dir/", but why should they?
227
+
228
+* jc/maint-rev-list-topo-doc (2012-08-15) 1 commit
229
+ (merged to 'next' on 2012-08-18 at d1f54d9)
230
+ + rev-list docs: clarify --topo-order description
231
+
232
+It was unclear what "--topo-order" was really about in the
233
+documentation. It is not just about "children before parent", but
234
+also about "don't mix lineages".
235
+
236
* bc/receive-pack-stdout-protection (2012-08-06) 2 commits
237
(merged to 'next' on 2012-08-07 at d7aa316)
238
+ receive-pack: do not leak output from auto-gc to standard output
@@ -147,7 +252,8 @@ Teach "git prune" without "-v" to be silent about leftover temporary files.
252
Not urgent (non regression).
253
254
* jc/tag-doc (2012-08-06) 1 commit
150
- - Documentation: do not mention .git/refs/* directories
255
+ (merged to 'next' on 2012-08-18 at 9fe64b2)
256
+ + Documentation: do not mention .git/refs/* directories
257
258
Our documentation used to assume having files in .git/refs/*
259
directories was the only to have branches and tags, but that is not
@@ -156,7 +262,8 @@ true for quite some time.
262
Not urgent (non regression).
263
264
* jk/docs-docbook-monospace-display (2012-08-07) 1 commit
159
- - docs: monospace listings in docbook output
265
+ (merged to 'next' on 2012-08-18 at 7e02bf8)
266
+ + docs: monospace listings in docbook output
267
268
The documentation in the TeXinfo format was using indented output
269
for materials meant to be examples that are better typeset in
@@ -172,24 +279,28 @@ rely on being able to parse "ls-files -s | while read a b c..."
279
start to fail. Protect them from such a misconfiguration.
280
281
* jk/check-docs-update (2012-08-08) 8 commits
175
- - check-docs: get documented command list from Makefile
176
- - check-docs: drop git-help special-case
177
- - check-docs: list git-gui as a command
178
- - check-docs: factor out command-list
179
- - command-list: mention git-credential-* helpers
180
- - command-list: add git-sh-i18n
181
- - check-docs: update non-command documentation list
182
- - check-docs: mention gitweb specially
282
+ (merged to 'next' on 2012-08-18 at 4409d2e)
283
+ + check-docs: get documented command list from Makefile
284
+ + check-docs: drop git-help special-case
285
+ + check-docs: list git-gui as a command
286
+ + check-docs: factor out command-list
287
+ + command-list: mention git-credential-* helpers
288
+ + command-list: add git-sh-i18n
289
+ + check-docs: update non-command documentation list
290
+ + check-docs: mention gitweb specially
291
292
Simplify "make check-docs" implementation and update its coverage.
293
186
-* js/gitweb-path-info-unquote (2012-08-09) 1 commit
187
- - gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
294
+* js/gitweb-path-info-unquote (2012-08-15) 1 commit
295
+ (merged to 'next' on 2012-08-15 at 844da17)
296
+ + gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
297
298
Stripping of PATH_INFO in gitweb did not take url style quoting into
299
account, failing to notice directories with funny characters e.g. SP
300
in their paths.
301
302
+Not urgent (non regression).
303
+
304
* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit
305
- rebase -i: use full onto sha1 in reflog
306
@@ -292,11 +403,9 @@ Not urgent (non regression).
403
Remove unused field.
404
Not urgent (non regression).
405
295
-* tg/index-v5 (2012-08-09) 15 commits
296
- - fixup! Read index-v5
297
- - fixup! update-index.c: always rewrite the index when index-version is given
406
+* tg/index-v5 (2012-08-17) 13 commits
407
- p0002-index.sh: add perf test for the index formats
299
- - update-index.c: always rewrite the index when index-version is given
408
+ - update-index.c: rewrite index when index-version is given
409
- Write resolve-undo data for index-v5
410
- Write index-v5 cache-tree data
411
- Write index-v5
@@ -305,13 +414,12 @@ Not urgent (non regression).
414
- Read index-v5
415
- Make in-memory format aware of stat_crc
416
- Add documentation of the index-v5 file format
308
- - t3700: Avoid interfering with the racy code
417
- t2104: Don't fail for index versions other than [23]
418
+ - read-cache.c: Re-read index if index file changed
419
- Move index v2 specific functions to their own file
420
421
A GSoC project, queued here primarily to give people an easier
313
-access to the state of the last posted version, plus trivial
314
-fixups.
422
+access to the state of the last posted version.
423
424
* nd/index-errno (2012-08-06) 1 commit
425
(merged to 'next' on 2012-08-06 at a9f2101)