1 To: git@vger.kernel.org
2 Subject: What's cooking in git.git (Jan 2010, #02; Thu, 07)
3 X-master-at: d6f8fd0b3eeb4349493209740742d67616e0263c
4 X-next-at: 5229608cd809769104adde442690de7ca1b6b5db
6 What's cooking in git.git (Jan 2010, #02; Thu, 07)
7 --------------------------------------------------
9 Here are the topics that have been cooking. Commits prefixed with '-' are
10 only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11 marked with '.' do not appear in any of the integration branches, but I am
12 still holding onto them.
14 The tip of 'next' has been rebuilt on top of the current 'master'.
16 --------------------------------------------------
17 [Graduated to "master"]
19 * mo/bin-wrappers (2009-12-02) 3 commits
20 (merged to 'next' on 2010-01-03 at 8c5fa27)
21 + INSTALL: document a simpler way to run uninstalled builds
22 + run test suite without dashed git-commands in PATH
23 + build dashless "bin-wrappers" directory similar to installed bindir
25 * mv/commit-date (2009-12-03) 2 commits
26 (merged to 'next' on 2010-01-03 at 1c45fdf)
27 + Document date formats accepted by parse_date()
28 + builtin-commit: add --date option
30 * bg/maint-add-all-doc (2009-12-07) 4 commits
31 (merged to 'next' on 2010-01-03 at b19a323)
32 + squash! rm documentation--also mention add-u where we mention commit-a
33 + git-rm doc: Describe how to sync index & work tree
34 + git-add/rm doc: Consistently back-quote
35 + Documentation: 'git add -A' can remove files
37 * so/cvsserver-update (2009-12-07) 1 commit
38 (merged to 'next' on 2010-01-03 at 99959b6)
39 + cvsserver: make the output of 'update' more compatible with cvs.
41 * mg/tag-d-show (2009-12-10) 1 commit
42 (merged to 'next' on 2010-01-03 at 87657d2)
43 + tag -d: print sha1 of deleted tag
45 * sb/maint-octopus (2009-12-11) 3 commits
46 (merged to 'next' on 2010-01-03 at ffe77d6)
47 + octopus: remove dead code
48 + octopus: reenable fast-forward merges
49 + octopus: make merge process simpler to follow
51 * js/filter-branch-prime (2009-12-15) 1 commit
52 (merged to 'next' on 2010-01-03 at 7c90319)
53 + filter-branch: remove an unnecessary use of 'git read-tree'
55 --------------------------------------------------
58 * jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
59 - checkout -m path: fix recreating conflicts
61 * jn/makefile (2010-01-06) 4 commits
62 - Makefile: consolidate .FORCE-* targets
63 - Makefile: learn to generate listings for targets requiring special flags
64 - Makefile: use target-specific variable to pass flags to cc
65 - Makefile: regenerate assembler listings when asked
67 --------------------------------------------------
68 [Will graduate after a bit more cooking]
70 * tr/http-updates (2009-12-28) 4 commits
71 (merged to 'next' on 2010-01-02 at cf25698)
73 + Allow curl to rewind the RPC read buffer
74 + Add an option for using any HTTP authentication scheme, not only basic
75 + http: maintain curl sessions
77 * nd/sparse (2010-01-04) 25 commits
78 - t7002: test for not using external grep on skip-worktree paths
79 - t7002: set test prerequisite "external-grep" if supported
80 (merged to 'next' on 2010-01-02 at 5499bbe)
81 + grep: do not do external grep on skip-worktree entries
82 + commit: correctly respect skip-worktree bit
83 + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
84 + tests: rename duplicate t1009
85 + sparse checkout: inhibit empty worktree
86 + Add tests for sparse checkout
87 + read-tree: add --no-sparse-checkout to disable sparse checkout support
88 + unpack-trees(): ignore worktree check outside checkout area
89 + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
90 + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
91 + unpack-trees.c: generalize verify_* functions
92 + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
93 + Introduce "sparse checkout"
94 + dir.c: export excluded_1() and add_excludes_from_file_1()
95 + excluded_1(): support exclude files in index
96 + unpack-trees(): carry skip-worktree bit over in merged_entry()
97 + Read .gitignore from index if it is skip-worktree
98 + Avoid writing to buffer in add_excludes_from_file_1()
99 + Teach Git to respect skip-worktree bit (writing part)
100 + Teach Git to respect skip-worktree bit (reading part)
101 + Introduce "skip-worktree" bit in index, teach Git to get/set this bit
102 + Add test-index-version
103 + update-index: refactor mark_valid() in preparation for new options
105 * jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
106 (merged to 'next' on 2010-01-02 at 190d63b)
107 + reset: unbreak hard resets with GIT_WORK_TREE
109 * jk/push-to-delete (2009-12-30) 1 commit
110 (merged to 'next' on 2010-01-03 at 9ee293b)
111 + builtin-push: add --delete as syntactic sugar for :foo
113 * mm/config-path (2009-12-30) 1 commit
114 (merged to 'next' on 2010-01-03 at 9c0e81a)
115 + builtin-config: add --path option doing ~ and ~user expansion.
117 * pm/cvs-environ (2009-12-30) 1 commit
118 (merged to 'next' on 2010-01-03 at 4c22932)
119 + CVS Server: Support reading base and roots from environment
121 * tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
122 (merged to 'next' on 2010-01-03 at b785974)
123 + bash completion: factor submodules into dirty state
125 * bg/maint-remote-update-default (2009-12-31) 1 commit
126 (merged to 'next' on 2010-01-03 at 113009e)
127 + Fix "git remote update" with remotes.defalt set
129 --------------------------------------------------
132 * da/difftool (2009-12-22) 2 commits
133 (merged to 'next' on 2010-01-06 at e957395)
134 + git-difftool: Add '--gui' for selecting a GUI tool
135 + t7800-difftool: Set a bogus tool for use by tests
137 * jh/gitweb-cached (2010-01-03) 4 commits
138 - gitweb: Makefile improvements
139 - gitweb: Optionally add "git" links in project list page
140 - gitweb: Add option to force version match
141 - gitweb: Load checking
143 Will merge to 'next', unless I hear objections within a few days.
145 * tc/test-locate-httpd (2010-01-02) 1 commit
146 (merged to 'next' on 2010-01-06 at 9d913e5)
147 + t/lib-http.sh: Restructure finding of default httpd location
149 * jc/fix-tree-walk (2009-09-14) 7 commits
150 - read-tree --debug-unpack
151 - unpack-trees.c: look ahead in the index
152 - unpack-trees.c: prepare for looking ahead in the index
153 - Aggressive three-way merge: fix D/F case
154 - traverse_trees(): handle D/F conflict case sanely
155 - more D/F conflict tests
156 - tests: move convenience regexp to match object names to test-lib.sh
158 Resurrected from "Ejected" category. This is fix for a tricky codepath
159 and testing and improving before it hits 'next' by brave souls is greatly
160 appreciated. I am not very happy about the solution myself.
162 * cc/reset-more (2010-01-08) 8 commits
163 - t7111: check that reset options work as described in the tables
164 (merged to 'next' on 2010-01-06 at 96639cb)
165 + Documentation: reset: add some missing tables
166 (merged to 'next' on 2010-01-04 at 8802c2c)
167 + Fix bit assignment for CE_CONFLICTED
168 (merged to 'next' on 2010-01-03 at f83d4c6)
169 + "reset --merge": fix unmerged case
170 + reset: use "unpack_trees()" directly instead of "git read-tree"
171 + reset: add a few tests for "git reset --merge"
172 + Documentation: reset: add some tables to describe the different options
173 + reset: improve mixed reset error message when in a bare repo
175 * jc/branch-d (2009-12-29) 1 commit
176 - branch -d: base the "already-merged" safety on the branch it merges with
178 http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
179 I am tempted to merge this to 'next', but please stop me if people see issues
182 * jc/rerere (2009-12-04) 1 commit
183 - Teach --[no-]rerere-autoupdate option to merge, revert and friends
185 * jk/run-command-use-shell (2010-01-01) 8 commits
186 - t4030, t4031: work around bogus MSYS bash path conversion
187 - diff: run external diff helper with shell
188 - textconv: use shell to run helper
189 - editor: use run_command's shell feature
190 - run-command: optimize out useless shell calls
191 - run-command: convert simple callsites to use_shell
192 - t0021: use $SHELL_PATH for the filter script
193 - run-command: add "use shell" option
195 Shuffled the commits in the topic, following J6t's suggestion in
196 http://thread.gmane.org/gmane.comp.version-control.git/136128
198 * rs/maint-archive-match-pathspec (2009-12-12) 1 commit
199 (merged to 'next' on 2010-01-03 at 92d7d15)
200 + archive: complain about path specs that don't match anything
202 * tc/clone-v-progress (2009-12-26) 4 commits
203 - clone: use --progress to force progress reporting
204 - clone: set transport->verbose when -v/--verbose is used
205 - git-clone.txt: reword description of progress behaviour
206 - check stderr with isatty() instead of stdout when deciding to show progress
208 Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
210 * tc/smart-http-restrict (2010-01-02) 4 commits
211 (merged to 'next' on 2010-01-06 at 82736cb)
212 + Smart-http tests: Test http-backend without curl or a webserver
213 + Smart-http tests: Break test t5560-http-backend into pieces
214 + Smart-http tests: Improve coverage in test t5560
215 + Smart-http: check if repository is OK to export before serving it
217 * jc/cache-unmerge (2009-12-25) 9 commits
218 - rerere forget path: forget recorded resolution
219 - rerere: refactor rerere logic to make it independent from I/O
220 - rerere: remove silly 1024-byte line limit
221 - resolve-undo: teach "update-index --unresolve" to use resolve-undo info
222 - resolve-undo: "checkout -m path" uses resolve-undo information
223 - resolve-undo: allow plumbing to clear the information
224 - resolve-undo: basic tests
225 - resolve-undo: record resolved conflicts in a new index extension section
226 - builtin-merge.c: use standard active_cache macros
228 Will wait a bit more before moving it to 'next'.
230 * jh/commit-status (2009-12-07) 1 commit
231 - [test?] Add commit.status, --status, and --no-status
235 * jc/checkout-merge-base (2010-01-07) 4 commits
236 (merged to 'next' on 2010-01-07 at 5229608)
237 + rebase -i: teach --onto A...B syntax
238 + rebase: fix --onto A...B parsing and add tests
239 (merged to 'next' on 2010-01-02 at 6a8f6fc)
240 + "rebase --onto A...B" replays history on the merge base between A and B
241 + "checkout A...B" switches to the merge base between A and B
243 * tr/http-push-ref-status (2009-12-24) 6 commits
244 - transport-helper.c::push_refs(): emit "no refs" error message
245 - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
246 - transport.c::transport_push(): make ref status affect return value
247 - refactor ref status logic for pushing
248 - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
249 - t5541-http-push.sh: add tests for non-fast-forward pushes
251 Peff: $gmane/136169, 136167, 136168
254 * il/vcs-helper (2009-12-09) 8 commits
255 (merged to 'next' on 2010-01-06 at 7c79f42)
256 + Remove special casing of http, https and ftp
257 + Support remote archive from all smart transports
258 + Support remote helpers implementing smart transports
259 + Support taking over transports
260 + Refactor git transport options parsing
261 + Pass unknown protocols to external protocol handlers
262 + Support mandatory capabilities
263 + Add remote helper debug mode
265 * mm/diag-path-in-treeish (2009-12-07) 1 commit
266 (merged to 'next' on 2010-01-06 at 6b4201e)
267 + Detailed diagnosis when parsing an object name fails.
269 * mh/rebase-fixup (2009-12-07) 2 commits
270 (merged to 'next' on 2010-01-06 at c4779a7)
271 + Add a command "fixup" to rebase --interactive
272 + t3404: Use test_commit to set up test repository
273 (this branch is used by ns/rebase-auto-squash.)
275 Initial round of "fixup" action that is similar to "squash" action in
276 "rebase -i" that excludes the commit log message from follow-up commits
277 when composing the log message for the updated one. Expected is a further
278 improvement to skip opening the editor if a pick is followed only by
279 "fixup" and no "squash".
281 * ns/rebase-auto-squash (2009-12-08) 1 commit
282 (merged to 'next' on 2010-01-06 at da4e2f5)
283 + rebase -i --autosquash: auto-squash commits
284 (this branch uses mh/rebase-fixup.)
286 * jh/notes (2009-12-07) 11 commits
287 - Refactor notes concatenation into a flexible interface for combining notes
288 - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
289 - Notes API: for_each_note(): Traverse the entire notes tree with a callback
290 - Notes API: get_note(): Return the note annotating the given object
291 - Notes API: add_note(): Add note objects to the internal notes tree structure
292 - Notes API: init_notes(): Initialize the notes tree from the given notes ref
293 - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
294 - Minor style fixes to notes.c
295 (merged to 'next' on 2010-01-02 at ae42130)
296 + Add more testcases to test fast-import of notes
297 + Rename t9301 to t9350, to make room for more fast-import tests
298 + fast-import: Proper notes tree manipulation
300 http://thread.gmane.org/gmane.comp.version-control.git/134738
302 What's the status of the fourth and later patches on this topic? Overall
303 it looked reasonable, if I recall correctly what I thought when I reviewed
304 it last time, and I am tempted to merge it to 'next' soonish. Please
305 file complaints before I do so if people have objections.
307 http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
309 * fc/opt-quiet-gc-reset (2009-12-02) 1 commit
310 (merged to 'next' on 2010-01-06 at 03e00cd)
311 + General --quiet improvements
313 * sr/gfi-options (2009-12-04) 7 commits
314 - fast-import: add (non-)relative-marks feature
315 - fast-import: allow for multiple --import-marks= arguments
316 - fast-import: test the new option command
317 - fast-import: add option command
318 - fast-import: add feature command
319 - fast-import: put marks reading in its own function
320 - fast-import: put option parsing code in separate functions
322 http://thread.gmane.org/gmane.comp.version-control.git/134540
324 I haven't seen comments on this round, and I am tempted to merge it to
325 'next' soonish. Please file complaints before I do so if people have
328 * ap/merge-backend-opts (2008-07-18) 6 commits
329 - Document that merge strategies can now take their own options
330 - Extend merge-subtree tests to test -Xsubtree=dir.
331 - Make "subtree" part more orthogonal to the rest of merge-recursive.
332 - Teach git-pull to pass -X<option> to git-merge
333 - git merge -X<option>
334 - git-merge-file --ours, --theirs
336 "git pull" patch needs sq-then-eval fix to protect it from $IFS
337 but otherwise seemed good.