What's cooking (2012/04 #02)
Junio C Hamano committed
Apr 4, 2012 at 16:25 UTC
725ccc6d1a5382d2fc30eb7b4d27c60c8bf5d178
1 file changed
+98
-77
whats-cooking.txt
+98
-77
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #01; Mon, 2)
3
-X-master-at: d82829b6128263951569221ca0c00dd143da055c
4
-X-next-at: 534144fcf8debe1f1ee527931c7346ce866f9ef5
2
+Subject: What's cooking in git.git (Apr 2012, #02; Wed, 4)
3
+X-master-at: e5056c05ecd2bdaceaa95e12e9e94b1584ec59c8
4
+X-next-at: 0677f639064c22077f02df7b77b29cd097a4ecef
5
6
-What's cooking in git.git (Apr 2012, #01; Mon, 2)
6
+What's cooking in git.git (Apr 2012, #02; Wed, 4)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -23,79 +23,34 @@ repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
+* jc/index-v4 (2012-04-04) 10 commits
27
+ - update-index: upgrade/downgrade on-disk index version
28
+ - read-cache.c: write prefix-compressed names in the index
29
+ - read-cache.c: read prefix-compressed names in index on-disk version v4
30
+ - read-cache.c: move code to copy incore to ondisk cache to a helper function
31
+ - read-cache.c: move code to copy ondisk to incore cache to a helper function
32
+ - read-cache.c: report the header version we do not understand
33
+ - read-cache.c: make create_from_disk() report number of bytes it consumed
34
+ - read-cache.c: allow unaligned mapping of the index file
35
+ - cache.h: hide on-disk index details
36
+ - varint: make it available outside the context of pack
37
+ (this branch is tangled with jc/split-blob.)
38
+
39
+* jk/add-p-skip-conflicts (2012-04-04) 3 commits
40
+ - fixup from rctay
41
+ - snap
42
+ - add -p: skip conflicted paths
43
+
44
+--------------------------------------------------
45
+[Graduated to "master"]
46
+
47
* pt/gitk (2012-04-02) 2 commits
27
- - gitk: fix setting font display with new tabbed dialog layout.
28
- - gitk: fix tabbed preferences construction when using tcl 8.4
48
+ + gitk: fix setting font display with new tabbed dialog layout.
49
+ + gitk: fix tabbed preferences construction when using tcl 8.4
50
51
Pat spotted and fixed a few bugs in the latest gitk updates; we may need
52
these in 1.7.10 so testing on various platforms is very much appreciated.
53
33
-* bw/spawn-via-shell-path (2012-03-31) 2 commits
34
- - fixup? Quote SHELL_PATH the same way as DEFAULT_EDITOR for C
35
- - Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
36
-
37
-"sh" on the user's PATH may be utterly broken on some systems;
38
-consistently use SHELL_PATH even from inside run-command API.
39
-
40
-Will squash the fixup and schedule it to merge soon after 1.7.10.
41
-
42
-* jc/commit-unedited-template (2012-04-01) 4 commits
43
- - git-commit.txt: clarify -t requires editing message
44
- - commit: rephrase the error when user did not touch templated log message
45
- - commit: do not trigger bogus "has templated message edited" check
46
- - t7501: test the right kind of breakage
47
-
48
-When "git commit --template F" errors out because the user did not touch
49
-the message, it claimed that it aborts due to "empty message", which was
50
-utterly wrong.
51
-
52
-* jc/push-upstream-sanity (2012-03-30) 1 commit
53
- - push: detect nonsense "upstream" check more carefully
54
-
55
-"git push $there" without refspec, when the current branch is set to push
56
-to a remote different from $there, used to push to $there using the
57
-upstream information to a remote unreleated to $there.
58
-
59
-This is necessary if we were to switch the push.default to 'current'.
60
-
61
-* jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit
62
- - http-backend: respect existing GIT_COMMITTER_* variables
63
-
64
-The smart-http backend used to always override GIT_COMMITTER_* variables
65
-with REMOTE_USER and REMOTE_ADDR.
66
-
67
-* mk/gitweb-diff-hl (2012-03-29) 8 commits
68
- - gitweb: Refinement highlightning in combined diffs
69
- - gitweb: Highlight interesting parts of diff
70
- - gitweb: Push formatting diff lines to print_diff_chunk()
71
- - gitweb: Move HTML-formatting diff line back to process_diff_line()
72
- - gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
73
- - gitweb: Extract print_sidebyside_diff_lines()
74
- - gitweb: Pass esc_html_hl_regions() options to esc_html()
75
- - gitweb: esc_html_hl_regions(): Don't create empty <span> elements
76
-
77
-* it/fetch-pack-many-refs (2012-04-02) 5 commits
78
- - remote-curl: main test case for the OS command line overflow
79
- - fetch-pack: test cases for the new --stdin option
80
- - fixup? no longer need flex argv[]
81
- - remote-curl: send the refs to fetch-pack on stdin
82
- - fetch-pack: new --stdin option to read refs from stdin
83
-
84
-Will squash the fix-up one and then requeue.
85
-
86
-* jn/debian-customizes-default-editor (2012-03-31) 3 commits
87
- - fixup? do not hide the "usual" default from readers
88
- - var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
89
- - var doc: default editor and pager are configurable at build time
90
-
91
-Haven't heard anything back for the fix-up suggestion, but otherwise
92
-looked sane.
93
-
94
-* rs/commit-list-sort-in-batch (2012-04-02) 3 commits
95
- - revision: insert unsorted, then sort in prepare_revision_walk()
96
- - commit: use mergesort() in commit_list_sort_by_date()
97
- - add mergesort() for linked lists
98
-
54
--------------------------------------------------
55
[Stalled]
56
@@ -174,13 +129,15 @@ from Ævar. The second one needs more work, both in perl/Git.pm and
129
prompt.c, to give precedence to tty over SSH_ASKPASS when terminal
130
is available.
131
177
-* jc/split-blob (2012-03-16) 6 commits
132
+* jc/split-blob (2012-04-03) 7 commits
133
- chunked-object: streaming checkout
134
- chunked-object: fallback checkout codepaths
135
- bulk-checkin: support chunked-object encoding
136
- bulk-checkin: allow the same data to be multiply hashed
137
- new representation types in the packstream
183
- - varint-in-pack: refactor varint encoding/decoding
138
+ - packfile: use varint functions
139
+ - varint: make it available outside the context of pack
140
+ (this branch is tangled with jc/index-v4.)
141
142
Not ready.
143
@@ -207,6 +164,71 @@ not working :-(.
164
--------------------------------------------------
165
[Cooking]
166
167
+* bw/spawn-via-shell-path (2012-04-03) 1 commit
168
+ - Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
169
+
170
+"sh" on the user's PATH may be utterly broken on some systems;
171
+consistently use SHELL_PATH even from inside run-command API.
172
+
173
+* jc/commit-unedited-template (2012-04-03) 5 commits
174
+ - Documentation/git-commit: rephrase the "initial-ness" of templates
175
+ - git-commit.txt: clarify -t requires editing message
176
+ - commit: rephrase the error when user did not touch templated log message
177
+ - commit: do not trigger bogus "has templated message edited" check
178
+ - t7501: test the right kind of breakage
179
+
180
+When "git commit --template F" errors out because the user did not touch
181
+the message, it claimed that it aborts due to "empty message", which was
182
+utterly wrong.
183
+
184
+* jc/push-upstream-sanity (2012-04-03) 2 commits
185
+ - [fixup] remove misguided "try to see if URLs are the same"
186
+ - push: detect nonsense "upstream" check more carefully
187
+
188
+"git push $there" without refspec, when the current branch is set to push
189
+to a remote different from $there, used to push to $there using the
190
+upstream information to a remote unreleated to $there.
191
+
192
+This is necessary if we were to switch the push.default to 'current'.
193
+
194
+* jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit
195
+ - http-backend: respect existing GIT_COMMITTER_* variables
196
+
197
+The smart-http backend used to always override GIT_COMMITTER_* variables
198
+with REMOTE_USER and REMOTE_ADDR.
199
+
200
+* mk/gitweb-diff-hl (2012-04-04) 8 commits
201
+ - gitweb: Refinement highlightning in combined diffs
202
+ - gitweb: Highlight interesting parts of diff
203
+ - gitweb: Push formatting diff lines to print_diff_chunk()
204
+ - gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
205
+ - gitweb: Extract print_sidebyside_diff_lines()
206
+ - gitweb: Pass esc_html_hl_regions() options to esc_html()
207
+ - gitweb: esc_html_hl_regions(): Don't create empty <span> elements
208
+ - gitweb: Use descriptive names in esc_html_hl_regions()
209
+
210
+* it/fetch-pack-many-refs (2012-04-02) 5 commits
211
+ - remote-curl: main test case for the OS command line overflow
212
+ - fetch-pack: test cases for the new --stdin option
213
+ - fixup? no longer need flex argv[]
214
+ - remote-curl: send the refs to fetch-pack on stdin
215
+ - fetch-pack: new --stdin option to read refs from stdin
216
+
217
+Will squash the fix-up one and then requeue.
218
+
219
+* jn/debian-customizes-default-editor (2012-03-31) 3 commits
220
+ - fixup? do not hide the "usual" default from readers
221
+ - var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
222
+ - var doc: default editor and pager are configurable at build time
223
+
224
+Haven't heard anything back for the fix-up suggestion, but otherwise
225
+looked sane.
226
+
227
+* rs/commit-list-sort-in-batch (2012-04-02) 3 commits
228
+ - revision: insert unsorted, then sort in prepare_revision_walk()
229
+ - commit: use mergesort() in commit_list_sort_by_date()
230
+ - add mergesort() for linked lists
231
+
232
* hv/submodule-recurse-push (2012-03-30) 3 commits
233
- push: teach --recurse-submodules the on-demand option
234
- Refactor submodule push check to use string list instead of integer
@@ -229,7 +251,7 @@ A test merge of the 'subtree'.
251
Even with "-q"uiet option, "checkout" used to report setting up tracking.
252
Also "branch" learns "-q"uiet option to squelch informational message.
253
232
-* jk/run-command-eacces (2012-03-30) 1 commit
254
+* jk/run-command-eacces (2012-04-03) 1 commit
255
- run-command: treat inaccessible directories as ENOENT
256
257
When PATH contains an unreadable directory, alias expansion code did not
@@ -271,10 +293,9 @@ based on the commit date.
293
Forbids rename detection logic from matching two empty files as renames
294
during merge-recursive to prevent mismerges.
295
274
-* th/difftool-diffall (2012-03-29) 9 commits
296
+* th/difftool-diffall (2012-04-04) 8 commits
297
- difftool: print list of valid tools with '--tool-help'
298
- difftool: teach difftool to handle directory diffs
277
- - difftool: replace system call with Git::command_noisy
299
- difftool: eliminate setup_environment function
300
- difftool: stop appending '.exe' to git
301
- difftool: remove explicit change of PATH