@matheusbsbs / matheus-bagliano / commits / 4982920e51

What's cooking (2011/06 #03)

Junio C Hamano committed Jun 17, 2011 at 15:44 UTC 4982920e5184a567f95a843ac1f914c4e2f350b0
1 file changed +140 -104
whats-cooking.txt
+140 -104
@@ -1,19 +1,154 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jun 2011, #02; Sat, 11)
3 -X-master-at: 2c162b56f370f5c33e6a945e6922d598006c5ec4
4 -X-next-at: 195f74cadbc9ad92fd15cd612a02206a4353fa30
2 +Subject: What's cooking in git.git (Jun 2011, #03; Fri, 17)
3 +X-master-at: 36bfb0e5f6004e4c4ac9334107dc185c316839a7
4 +X-next-at: a2eb42042a14044c35525779dcf76ee92f3305a7
5
6 -What's cooking in git.git (Jun 2011, #02; Sat, 11)
6 +What's cooking in git.git (Jun 2011, #03; Fri, 17)
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 -Will tag 1.7.6-rc2 sometime next week.
12 +We have passed v1.7.6-rc2 and it seems things are really in releaseable
13 +form, so I am tempted to skip -rc3 and tag the final sometime next week.
14
15 --------------------------------------------------
16 [New Topics]
17
18 +* aw/rebase-i-p (2011-06-13) 1 commit
19 + - rebase -i -p: doesn't pick certain merge commits that are children of "upstream"
20 +
21 +* en/merge-recursive (2011-06-13) 49 commits
22 + - t3030: fix accidental success in symlink rename
23 + - merge-recursive: Fix working copy handling for rename/rename/add/add
24 + - merge-recursive: add handling for rename/rename/add-dest/add-dest
25 + - merge-recursive: Have conflict_rename_delete reuse modify/delete code
26 + - merge-recursive: Make modify/delete handling code reusable
27 + - merge-recursive: Consider modifications in rename/rename(2to1) conflicts
28 + - merge-recursive: Create function for merging with branchname:file markers
29 + - merge-recursive: Record more data needed for merging with dual renames
30 + - merge-recursive: Defer rename/rename(2to1) handling until process_entry
31 + - merge-recursive: Small cleanups for conflict_rename_rename_1to2
32 + - merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
33 + - merge-recursive: Introduce a merge_file convenience function
34 + - merge-recursive: Fix modify/delete resolution in the recursive case
35 + - merge-recursive: Provide more info in conflict markers with file renames
36 + - merge-recursive: Cleanup and consolidation of rename_conflict_info
37 + - merge-recursive: Consolidate process_entry() and process_df_entry()
38 + - merge-recursive: Improve handling of rename target vs. directory addition
39 + - merge-recursive: Add comments about handling rename/add-source cases
40 + - merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
41 + - merge-recursive: Fix deletion of untracked file in rename/delete conflicts
42 + - merge-recursive: When we detect we can skip an update, actually skip it
43 + - merge-recursive: Split update_stages_and_entry; only update stages at end
44 + - merge-recursive: Consolidate different update_stages functions
45 + - merge-recursive: Allow make_room_for_path() to remove D/F entries
46 + - merge-recursive: Split was_tracked() out of would_lose_untracked()
47 + - merge-recursive: Save D/F conflict filenames instead of unlinking them
48 + - merge-recursive: Fix code checking for D/F conflicts still being present
49 + - merge-recursive: Fix sorting order and directory change assumptions
50 + - merge-recursive: Fix recursive case with D/F conflict via add/add conflict
51 + - merge-recursive: Avoid working directory changes during recursive case
52 + - merge-recursive: Remember to free generated unique path names
53 + - merge-recursive: Mark some diff_filespec struct arguments const
54 + - merge-recursive: Correct a comment
55 + - merge-recursive: Make BUG message more legible by adding a newline
56 + - t6022: Add testcase for merging a renamed file with a simple change
57 + - t6022: New tests checking for unnecessary updates of files
58 + - t6022: Remove unnecessary untracked files to make test cleaner
59 + - t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
60 + - t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
61 + - t6036: tests for criss-cross merges with various directory/file conflicts
62 + - t6036: criss-cross with weird content can fool git into clean merge
63 + - t6036: Add differently resolved modify/delete conflict in criss-cross test
64 + - t6042: Ensure rename/rename conflicts leave index and workdir in sane state
65 + - t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
66 + - t6042: Add tests for content issues with modify/rename/directory conflicts
67 + - t6042: Add a testcase where undetected rename causes silent file deletion
68 + - t6042: Add a pair of cases where undetected renames cause issues
69 + - t6042: Add failing testcase for rename/modify/add-source conflict
70 + - t6042: Add a testcase where git deletes an untracked file
71 +
72 +* fg/submodule-keep-updating (2011-06-13) 3 commits
73 + - git-submodule.sh: clarify the "should we die now" logic
74 + - submodule update: continue when a checkout fails
75 + - git-sh-setup: add die_with_status
76 +
77 +* jc/no-gitweb-test-without-cgi-etc (2011-06-15) 1 commit
78 + - t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
79 +
80 +* jn/mime-type-with-params (2011-06-13) 1 commit
81 + - gitweb: Make $prevent_xss protection for 'blob_plain' more usable
82 +
83 +* ln/gitweb-mime-types-split-at-blank (2011-06-15) 1 commit
84 + - gitweb: allow space as delimiter in mime.types
85 +
86 +* md/interix-update (2011-06-15) 1 commit
87 + - Update the Interix default build configuration.
88 +
89 +* rj/config-cygwin (2011-06-16) 3 commits
90 + - config.c: Make git_config() work correctly when called recursively
91 + - t1301-*.sh: Fix the 'forced modes' test on cygwin
92 + - help.c: Fix detection of custom merge strategy on cygwin
93 +
94 +* di/no-no-existant (2011-06-16) 1 commit
95 + - Fix typo: existant->existent
96 +
97 +* jk/archive-tar-filter (2011-06-15) 7 commits
98 + - archive: provide builtin .tar.gz filter
99 + - archive: match extensions from user-configured formats
100 + - archive: refactor format-guessing from filename
101 + - archive: advertise user tar-filters in --list
102 + - archive: support user tar-filters via --format
103 + - archive: add user-configurable tar-filter infrastructure
104 + - archive: reorder option parsing and config reading
105 +
106 +--------------------------------------------------
107 +[Stalled]
108 +
109 +* js/ref-namespaces (2011-06-07) 4 commits
110 + . ref namespaces: documentation
111 + . ref namespaces: support remote repositories via upload-pack and receive-pack
112 + . ref namespaces: infrastructure
113 + . Fix prefix handling in ref iteration functions
114 +
115 +Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
116 +Not urgent. Will not merge before 1.7.6.
117 +
118 +* jh/receive-count-limit (2011-05-23) 10 commits
119 + - receive-pack: Allow server to refuse pushes with too many objects
120 + - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
121 + - send-pack/receive-pack: Allow server to refuse pushing too large packs
122 + - pack-objects: Allow --max-pack-size to be used together with --stdout
123 + - send-pack/receive-pack: Allow server to refuse pushes with too many commits
124 + - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
125 + - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
126 + - Tighten rules for matching server capabilities in server_supports()
127 + - send-pack: Attempt to retrieve remote status even if pack-objects fails
128 + - Update technical docs to reflect side-band-64k capability in receive-pack
129 +
130 +Would need another round to separate per-pack and per-session limits.
131 +Not urgent. Will not merge before 1.7.6.
132 +
133 +--------------------------------------------------
134 +[Cooking]
135 +
136 +* jc/index-pack (2011-06-05) 9 commits
137 + - verify-pack: use index-pack --verify
138 + - index-pack: show histogram when emulating "verify-pack -v"
139 + - index-pack: start learning to emulate "verify-pack -v"
140 + - index-pack: a miniscule refactor
141 + - index-pack --verify: read anomalous offsets from v2 idx file
142 + - write_idx_file: need_large_offset() helper function
143 + - index-pack: --verify
144 + - write_idx_file: introduce a struct to hold idx customization options
145 + - index-pack: group the delta-base array entries also by type
146 +
147 +Killed "verify-pack" ;-) The next will be to update fsck, which would be a
148 +bigger task.
149 +
150 +Not urgent. Will not merge before 1.7.6.
151 +
152 * js/i18n-windows (2011-06-06) 3 commits
153 (merged to 'next' on 2011-06-06 at d8c4ba3)
154 + Windows: teach getenv to do a case-sensitive search
@@ -72,85 +207,6 @@ expectation and what zlib API actually offers piecemeal.
207 - git-remote-testgit: exit gracefully after push
208 - transport-helper: fix minor leak in push_refs_with_export
209
75 ---------------------------------------------------
76 -[Graduated to "master"]
77 -
78 -* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
79 - (merged to 'next' on 2011-06-01 at 4f44a91)
80 - + builtin/commit.c: set status_format _after_ option parsing
81 - + t7508: demonstrate status's failure to use --porcelain format with -z
82 -
83 -* jk/diff-not-so-quick (2011-05-31) 2 commits
84 - (merged to 'next' on 2011-06-01 at 5f66784)
85 - + diff: futureproof "stop feeding the backend early" logic
86 - + diff_tree: disable QUICK optimization with diff filter
87 - (this branch is used by jc/diff-index-quick-exit-early.)
88 -
89 -* jn/gitweb-docs (2011-06-03) 3 commits
90 - (merged to 'next' on 2011-06-05 at 691c7e6)
91 - + gitweb: Move "Requirements" up in gitweb/INSTALL
92 - (merged to 'next' on 2011-06-02 at 56cba41)
93 - + gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
94 - + gitweb: Move information about installation from README to INSTALL
95 -
96 -* jn/mime-type-with-params (2011-06-05) 1 commit
97 - (merged to 'next' on 2011-06-05 at 697f9d2)
98 - + gitweb: Fix usability of $prevent_xss
99 -
100 ---------------------------------------------------
101 -[Stalled]
102 -
103 -* js/ref-namespaces (2011-06-07) 4 commits
104 - . ref namespaces: documentation
105 - . ref namespaces: support remote repositories via upload-pack and receive-pack
106 - . ref namespaces: infrastructure
107 - . Fix prefix handling in ref iteration functions
108 -
109 -Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
110 -Not urgent. Will not merge before 1.7.6.
111 -
112 -* jk/maint-merge-rename-create (2011-03-25) 3 commits
113 - - merge: turn on rewrite detection
114 - - merge: handle renames with replacement content
115 - - t3030: fix accidental success in symlink rename
116 -
117 -Peff wanted to reroll this. Perhaps will discard to make room for Elijah's
118 -merge-recursive series in the meantime.
119 -
120 -* jc/index-pack (2011-06-05) 9 commits
121 - - verify-pack: use index-pack --verify
122 - - index-pack: show histogram when emulating "verify-pack -v"
123 - - index-pack: start learning to emulate "verify-pack -v"
124 - - index-pack: a miniscule refactor
125 - - index-pack --verify: read anomalous offsets from v2 idx file
126 - - write_idx_file: need_large_offset() helper function
127 - - index-pack: --verify
128 - - write_idx_file: introduce a struct to hold idx customization options
129 - - index-pack: group the delta-base array entries also by type
130 -
131 -Killed "verify-pack" ;-) The next will be to update fsck, which would be a
132 -bigger task.
133 -
134 -Not urgent. Will not merge before 1.7.6.
135 -
136 -* jh/receive-count-limit (2011-05-23) 10 commits
137 - - receive-pack: Allow server to refuse pushes with too many objects
138 - - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
139 - - send-pack/receive-pack: Allow server to refuse pushing too large packs
140 - - pack-objects: Allow --max-pack-size to be used together with --stdout
141 - - send-pack/receive-pack: Allow server to refuse pushes with too many commits
142 - - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
143 - - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
144 - - Tighten rules for matching server capabilities in server_supports()
145 - - send-pack: Attempt to retrieve remote status even if pack-objects fails
146 - - Update technical docs to reflect side-band-64k capability in receive-pack
147 -
148 -Would need another round to separate per-pack and per-session limits.
149 -Not urgent. Will not merge before 1.7.6.
150 -
151 ---------------------------------------------------
152 -[Cooking]
153 -
210 * db/http-cookies (2011-06-03) 1 commit
211 (merged to 'next' on 2011-06-06 at 90d736a)
212 + http: pass http.cookiefile using CURLOPT_COOKIEFILE
@@ -350,23 +406,3 @@ Not urgent. Will not merge before 1.7.6.
406
407 Rerolled.
408 Will cook a bit longer.
353 -
354 ---------------------------------------------------
355 -[Discarded]
356 -
357 -* jc/apply-nsbp (2011-05-27) 4 commits
358 - . War on nbsp: teach "git apply" to check and fix nbsp
359 - . War on nbsp: Add "nbsp" whitespace breakage class
360 - . War on nbsp: a bit of retreat
361 - . ws.c: add a helper to format comma separated messages
362 -
363 -It was fun to write, though.
364 -
365 -* jk/tag-contains (2010-07-05) 4 commits
366 - . Why is "git tag --contains" so slow?
367 - . default core.clockskew variable to one day
368 - . limit "contains" traversals based on commit timestamp
369 - . tag: speed up --contains calculation
370 -
371 -This was re-rolled as jk/tag-contans-ab with help from Ævar.
372 -