What's cooking (2011/08 #04)
Junio C Hamano committed
Aug 16, 2011 at 17:00 UTC
77aa652624eecebcbb4cb14ab46b57d0536f2a0d
1 file changed
+101
-91
whats-cooking.txt
+101
-91
@@ -1,14 +1,17 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2011, #03; Thu, 11)
3
-X-master-at: b91766295f2b873bbd4ef79c06de05aff27f8e12
4
-X-next-at: 6c94a45e9f00a1b3c623d79d889f6b1c0b4db93d
2
+Subject: What's cooking in git.git (Aug 2011, #04; Tue, 16)
3
+X-master-at: 4bfe7cb6668c43c1136304bbb17eea1b3ddf0237
4
+X-next-at: 0e3f8f0b05033eaaaa60133977cc86dd9a5db4bf
5
6
-What's cooking in git.git (Aug 2011, #03; Thu, 11)
6
+What's cooking in git.git (Aug 2011, #04; Tue, 16)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
+The kernel.org machine seems to be very busy for the past 48 hours so it
13
+might take a while for tonight's pushout to propagate to mirrors.
14
+
15
There are a few 'fixup!' commits queued in topics still in 'pu', so that
16
authors have a choice to just say "that fix looks good, squash it in!"
17
instead of going through an extra round.
@@ -16,63 +19,38 @@ instead of going through an extra round.
19
--------------------------------------------------
20
[New Topics]
21
19
-* di/fast-import-ident (2011-08-11) 5 commits
20
- - fsck: improve committer/author check
21
- - fsck: add a few committer name tests
22
- - fast-import: check committer name more strictly
23
- - fast-import: don't fail on omitted committer name
24
- - fast-import: add input format tests
25
-
26
-* fg/submodule-ff-check-before-push (2011-08-09) 1 commit
27
- - push: Don't push a repository with unpushed submodules
28
-
29
-* hv/submodule-update-none (2011-08-11) 2 commits
30
- - add update 'none' flag to disable update of submodule by default
31
- - submodule: move update configuration variable further up
32
-
33
-* jc/lookup-object-hash (2011-08-11) 6 commits
34
- - object hash: replace linear probing with 4-way cuckoo hashing
35
- - object hash: we know the table size is a power of two
36
- - object hash: next_size() helper for readability
37
- - pack-objects --count-only
38
- - object.c: remove duplicated code for object hashing
39
- - object.c: code movement for readability
40
-
41
-* js/i18n-scripts (2011-08-08) 5 commits
42
- - submodule: take advantage of gettextln and eval_gettextln.
43
- - stash: take advantage of eval_gettextln
44
- - pull: take advantage of eval_gettextln
45
- - git-am: take advantage of gettextln and eval_gettextln.
46
- - gettext: add gettextln, eval_gettextln to encode common idiom
47
-
48
---------------------------------------------------
49
-[Graduated to "master"]
22
+* di/fast-import-deltified-tree (2011-08-14) 2 commits
23
+ - fast-import: prevent producing bad delta
24
+ - fast-import: add a test for tree delta base corruption
25
51
-* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
52
- (merged to 'next' on 2011-08-03 at 6918f69)
53
- + commit: allow partial commits with relative paths
26
+* di/parse-options-split (2011-08-11) 2 commits
27
+ - Reduce parse-options.o dependencies
28
+ - parse-options: export opterr, optbug
29
55
-Ideally the pathspec-prefix helper should be renamed to something more
56
-sensible, but we could live with it for now.
30
+* mh/attr (2011-08-14) 7 commits
31
+ - Unroll the loop over passes
32
+ - Change while loop into for loop
33
+ - Determine the start of the states outside of the pass loop
34
+ - Change parse_attr() to take a pointer to struct attr_state
35
+ - Increment num_attr in parse_attr_line(), not parse_attr()
36
+ - Document struct match_attr
37
+ - Add a file comment
38
58
-* ef/ipv4-connect-error-report (2011-08-01) 2 commits
59
- (merged to 'next' on 2011-08-03 at ea4842b)
60
- + connect: only log if all attempts failed (ipv4)
61
- + Merge branch 'maint' into ef/ipv4-connect-error-report
39
+All looked reasonable.
40
63
-* jk/fast-export-quote-path (2011-08-05) 1 commit
64
- (merged to 'next' on 2011-08-05 at a80e5f5)
65
- + fast-export: quote paths in output
41
+* mh/iterate-refs (2011-08-14) 6 commits
42
+ - Retain caches of submodule refs
43
+ - Store the submodule name in struct cached_refs
44
+ - Allocate cached_refs objects dynamically
45
+ - Change the signature of read_packed_refs()
46
+ - Access reference caches only through new function get_cached_refs()
47
+ - Extract a function clear_cached_refs()
48
67
-* rc/maint-http-wrong-free (2011-08-03) 2 commits
68
- (merged to 'next' on 2011-08-05 at cea08ed)
69
- + Makefile: some changes for http-related flag documentation
70
- + http.c: fix an invalid free()
49
+* jn/plug-empty-tree-leak (2011-08-16) 2 commits
50
+ - merge-recursive: take advantage of hardcoded empty tree
51
+ - revert: plug memory leak in "cherry-pick root commit" codepath
52
72
-* rs/grep-function-context (2011-08-01) 2 commits
73
- (merged to 'next' on 2011-08-05 at 8d63a8c)
74
- + grep: long context options
75
- + grep: add option to show whole function as context
53
+Both looked reasonable.
54
55
--------------------------------------------------
56
[Stalled]
@@ -127,7 +105,32 @@ Cf. $gmane/176254, 176255, 166256
105
The initial "tag --contains" de-pessimization without need for generation
106
numbers is already in; backburnered.
107
130
-* en/merge-recursive (2011-08-04) 49 commits
108
+* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
109
+ - t5800: point out that deleting branches does not work
110
+ - t5800: document inability to push new branch with old content
111
+
112
+* po/cygwin-backslash (2011-08-05) 2 commits
113
+ - On Cygwin support both UNIX and DOS style path-names
114
+ - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
115
+
116
+I think a further refactoring (no, not my suggestion) was offered?
117
+
118
+--------------------------------------------------
119
+[Cooking]
120
+
121
+* ac/describe-dirty-refresh (2011-08-11) 1 commit
122
+ - describe: Refresh the index when run with --dirty
123
+
124
+Will merge to "next", but needs Sign-off.
125
+
126
+* en/merge-recursive-2 (2011-08-14) 57 commits
127
+ - merge-recursive: Don't re-sort a list whose order we depend upon
128
+ - merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
129
+ - t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
130
+ - merge-recursive: Avoid unnecessary file rewrites
131
+ - t6022: Additional tests checking for unnecessary updates of files
132
+ - merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
133
+ - t6022: Add testcase for spurious "refusing to lose untracked" messages
134
- t3030: fix accidental success in symlink rename
135
- merge-recursive: Fix working copy handling for rename/rename/add/add
136
- merge-recursive: add handling for rename/rename/add-dest/add-dest
@@ -141,6 +144,7 @@ numbers is already in; backburnered.
144
- merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
145
- merge-recursive: Introduce a merge_file convenience function
146
- merge-recursive: Fix modify/delete resolution in the recursive case
147
+ - merge-recursive: When we detect we can skip an update, actually skip it
148
- merge-recursive: Provide more info in conflict markers with file renames
149
- merge-recursive: Cleanup and consolidation of rename_conflict_info
150
- merge-recursive: Consolidate process_entry() and process_df_entry()
@@ -148,10 +152,9 @@ numbers is already in; backburnered.
152
- merge-recursive: Add comments about handling rename/add-source cases
153
- merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
154
- merge-recursive: Fix deletion of untracked file in rename/delete conflicts
151
- - merge-recursive: When we detect we can skip an update, actually skip it
155
- merge-recursive: Split update_stages_and_entry; only update stages at end
153
- - merge-recursive: Consolidate different update_stages functions
156
- merge-recursive: Allow make_room_for_path() to remove D/F entries
157
+ - string-list: Add API to remove an item from an unsorted list
158
- merge-recursive: Split was_tracked() out of would_lose_untracked()
159
- merge-recursive: Save D/F conflict filenames instead of unlinking them
160
- merge-recursive: Fix code checking for D/F conflicts still being present
@@ -159,6 +162,7 @@ numbers is already in; backburnered.
162
- merge-recursive: Fix recursive case with D/F conflict via add/add conflict
163
- merge-recursive: Avoid working directory changes during recursive case
164
- merge-recursive: Remember to free generated unique path names
165
+ - merge-recursive: Consolidate different update_stages functions
166
- merge-recursive: Mark some diff_filespec struct arguments const
167
- merge-recursive: Correct a comment
168
- merge-recursive: Make BUG message more legible by adding a newline
@@ -170,38 +174,48 @@ numbers is already in; backburnered.
174
- t6036: tests for criss-cross merges with various directory/file conflicts
175
- t6036: criss-cross with weird content can fool git into clean merge
176
- t6036: Add differently resolved modify/delete conflict in criss-cross test
173
- - t6042: Ensure rename/rename conflicts leave index and workdir in sane state
177
- t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
178
+ - t6042: Ensure rename/rename conflicts leave index and workdir in sane state
179
- t6042: Add tests for content issues with modify/rename/directory conflicts
180
- t6042: Add a testcase where undetected rename causes silent file deletion
181
- t6042: Add a pair of cases where undetected renames cause issues
182
- t6042: Add failing testcase for rename/modify/add-source conflict
183
- t6042: Add a testcase where git deletes an untracked file
184
181
-Re-roll being worked on.
182
-
183
-* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
184
- - t5800: point out that deleting branches does not work
185
- - t5800: document inability to push new branch with old content
186
-
187
-* po/cygwin-backslash (2011-08-05) 2 commits
188
- - On Cygwin support both UNIX and DOS style path-names
189
- - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
185
+Rerolled.
186
191
-I think a further refactoring (no, not my suggestion) was offered?
187
+* di/fast-import-ident (2011-08-11) 5 commits
188
+ - fsck: improve committer/author check
189
+ - fsck: add a few committer name tests
190
+ - fast-import: check committer name more strictly
191
+ - fast-import: don't fail on omitted committer name
192
+ - fast-import: add input format tests
193
193
---------------------------------------------------
194
-[Cooking]
194
+* fg/submodule-ff-check-before-push (2011-08-09) 1 commit
195
+ - push: Don't push a repository with unpushed submodules
196
196
-* cb/maint-ls-files-error-report (2011-08-11) 1 commit
197
- - ls-files: fix pathspec display on error
197
+* hv/submodule-update-none (2011-08-11) 2 commits
198
+ - add update 'none' flag to disable update of submodule by default
199
+ - submodule: move update configuration variable further up
200
199
-Will merge to "next".
201
+* jc/lookup-object-hash (2011-08-11) 6 commits
202
+ - object hash: replace linear probing with 4-way cuckoo hashing
203
+ - object hash: we know the table size is a power of two
204
+ - object hash: next_size() helper for readability
205
+ - pack-objects --count-only
206
+ - object.c: remove duplicated code for object hashing
207
+ - object.c: code movement for readability
208
201
-* ac/describe-dirty-refresh (2011-08-11) 1 commit
202
- - describe: Refresh the index when run with --dirty
209
+* js/i18n-scripts (2011-08-08) 5 commits
210
+ - submodule: take advantage of gettextln and eval_gettextln.
211
+ - stash: take advantage of eval_gettextln
212
+ - pull: take advantage of eval_gettextln
213
+ - git-am: take advantage of gettextln and eval_gettextln.
214
+ - gettext: add gettextln, eval_gettextln to encode common idiom
215
204
-Will merge to "next".
216
+* cb/maint-ls-files-error-report (2011-08-11) 1 commit
217
+ (merged to 'next' on 2011-08-15 at 69f41cf)
218
+ + ls-files: fix pathspec display on error
219
220
* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
221
(merged to 'next' on 2011-08-05 at 976a4d4)
@@ -233,22 +247,20 @@ Will merge to "master" after cooking for a bit more.
247
+ helping smart-http/stateless-rpc fetch race
248
249
* jn/maint-test-return (2011-08-11) 3 commits
236
- - t3900: do not reference numbered arguments from the test script
237
- - test: cope better with use of return for errors
238
- - test: simplify return value of test_run_
239
-
240
-Will merge to "next".
250
+ (merged to 'next' on 2011-08-15 at 5a42301)
251
+ + t3900: do not reference numbered arguments from the test script
252
+ + test: cope better with use of return for errors
253
+ + test: simplify return value of test_run_
254
255
* rt/zlib-smaller-window (2011-08-11) 2 commits
243
- - test: consolidate definition of $LF
244
- - Tolerate zlib deflation with window size < 32Kb
245
-
246
-Will merge to "next".
256
+ (merged to 'next' on 2011-08-15 at e05b26b)
257
+ + test: consolidate definition of $LF
258
+ + Tolerate zlib deflation with window size < 32Kb
259
248
-* fg/submodule-git-file-git-dir (2011-08-08) 3 commits
260
+* fg/submodule-git-file-git-dir (2011-08-16) 3 commits
261
+ - fixup! Move git-dir for submodules
262
- Move git-dir for submodules
250
- - fixup! rev-parse: add option --is-well-formed-git-dir
251
- - rev-parse: add option --is-well-formed-git-dir <path>
263
+ - rev-parse: add option --resolve-git-dir <path>
264
265
* js/bisect-no-checkout (2011-08-09) 11 commits
266
(merged to 'next' on 2011-08-11 at 6c94a45)
@@ -388,5 +400,3 @@ for different repositories.
400
- revert: Simplify and inline add_message_to_msg
401
- config: Introduce functions to write non-standard file
402
- advice: Introduce error_resolve_conflict
391
-
392
-Will merge to "next".