1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Jun 2013, #04; Tue, 11)
4 X-master-at: 4d1c565e1fb4e76c391448cdf85fe7c132bbb390
5 X-next-at: 3b07823faafc941f5079443779265b5ba32c8407
7 What's cooking in git.git (Jun 2013, #04; Tue, 11)
8 --------------------------------------------------
10 Here are the topics that have been cooking. Commits prefixed with
11 '-' are only in 'pu' (proposed updates) while commits prefixed with
14 You can find the changes described here in the integration branches
15 of the repositories listed at
17 http://git-blame.blogspot.com/p/git-public-repositories.html
19 --------------------------------------------------
20 [Graduated to "master"]
22 * ar/wildmatch-foldcase (2013-06-02) 1 commit
23 (merged to 'next' on 2013-06-04 at 3180bcc)
24 + wildmatch: properly fold case everywhere
26 The wildmatch engine did not honor WM_CASEFOLD option correctly.
29 * cb/log-follow-with-combined (2013-05-28) 1 commit
30 (merged to 'next' on 2013-06-04 at d5bf4f3)
31 + fix segfault with git log -c --follow
34 * cm/gitweb-project-list-persistent-cgi-fix (2013-06-07) 1 commit
35 (merged to 'next' on 2013-06-07 at b16ca1f)
36 + gitweb: fix problem causing erroneous project list
38 "gitweb" forgot to clear a global variable $search_regexp upon each
39 request, mistakenly carrying over the previous search to a new one
40 when used as a persistent CGI.
43 * cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
44 (merged to 'next' on 2013-06-04 at bebedca)
45 + git.txt: remove stale comment regarding GIT_WORK_TREE
47 These days, "git --work-tree=there cmd" without specifying an
48 explicit --git-dir=here will do the usual discovery, but we had a
49 description of older behaviour in the documentation.
52 * fc/at-head (2013-05-08) 13 commits
53 (merged to 'next' on 2013-06-04 at f334a2a)
54 + sha1_name: compare variable with constant, not constant with variable
55 + Add new @ shortcut for HEAD
56 + sha1_name: refactor reinterpret()
57 + sha1_name: check @{-N} errors sooner
58 + sha1_name: reorganize get_sha1_basic()
59 + sha1_name: don't waste cycles in the @-parsing loop
60 + sha1_name: remove unnecessary braces
61 + sha1_name: remove no-op
62 + tests: at-combinations: @{N} versus HEAD@{N}
63 + tests: at-combinations: increase coverage
64 + tests: at-combinations: improve nonsense()
65 + tests: at-combinations: check ref names directly
66 + tests: at-combinations: simplify setup
68 Instead of typing four capital letters "HEAD", you can say "@".
71 * fc/completion-less-ls-remote (2013-06-02) 1 commit
72 (merged to 'next' on 2013-06-03 at 6624f0b)
73 + completion: avoid ls-remote in certain scenarios
76 * fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
77 (merged to 'next' on 2013-06-04 at 94e7b60)
78 + read-cache: trivial style cleanups
79 + read-cache: fix wrong 'the_index' usage
82 * fc/remote-bzr (2013-05-28) 8 commits
83 (merged to 'next' on 2013-06-04 at a603082)
84 + remote-bzr: add fallback check for a partial clone
85 + remote-bzr: reorganize the way 'wanted' works
86 + remote-bzr: trivial cleanups
87 + remote-bzr: change global repo
88 + remote-bzr: delay cloning/pulling
89 + remote-bzr: simplify get_remote_branch()
90 + remote-bzr: fix for files with spaces
91 + remote-bzr: recover from failed clones
94 * fc/remote-hg (2013-05-28) 50 commits
95 (merged to 'next' on 2013-06-04 at 9ee7dab)
96 + remote-hg: add support for --force
97 + remote-hg: add support for --dry-run
98 + remote-hg: check if a fetch is needed
99 + remote-hg: trivial cleanup
100 + remote-helpers: improve marks usage
101 + remote-hg: add check_push() helper
102 + remote-hg: add setup_big_push() helper
103 + remote-hg: remove files before modifications
104 + remote-hg: improve lightweight tag author
105 + remote-hg: use remote 'default' not local one
106 + remote-hg: improve branch listing
107 + remote-hg: simplify branch_tip()
108 + remote-hg: check diverged bookmarks
109 + remote-hg: pass around revision refs
110 + remote-hg: implement custom checkheads()
111 + remote-hg: implement custom push()
112 + remote-hg: only update necessary revisions
113 + remote-hg: force remote bookmark push selectively
114 + remote-hg: reorganize bookmark handling
115 + remote-hg: add test for failed double push
116 + remote-hg: add test for big push
117 + remote-hg: add test for new bookmark special
118 + remote-hg: add test for bookmark diverge
119 + remote-hg: add test for diverged push
120 + remote-hg: add test to push new bookmark
121 + remote-hg: add remote tests
122 + remote-hg: update bookmarks when using a remote
123 + remote-hg: add check_bookmark() test helper
124 + remote-bzr: simplify test checks
125 + remote-hg: add tests for 'master' bookmark
126 + remote-hg: always point HEAD to master
127 + remote-hg: improve progress calculation
128 + remote-hg: trivial cleanups
129 + remote-hg: ensure remote rebasing works
130 + remote-hg: upgrade version 1 marks
131 + remote-hg: switch from revisions to SHA-1 noteids
132 + remote-hg: add version checks to the marks
133 + remote-hg: improve node traversing
134 + remote-hg: shuffle some code
135 + remote-hg: use a shared repository store
136 + remote-hg: load all extensions
137 + remote-hg: test: simplify previous branch checkout
138 + remote-helpers: test: simplify remote URLs
139 + remote-helpers: tests: general improvements
140 + remote-helpers: test: cleanup style
141 + remote-helpers: test: cleanup white-spaces
142 + remote-hg: trivial reorganization
143 + remote-hg: test: be a little more quiet
144 + remote-hg: tests: fix hg merge
145 + remote-helpers: tests: use python directly
148 * jk/test-exit-code-by-signal (2013-06-06) 2 commits
149 (merged to 'next' on 2013-06-06 at 6fdea1b)
150 + t0005: skip signal death exit code test on Windows
151 (merged to 'next' on 2013-06-03 at 25af892)
152 + t0005: test git exit code from signal death
155 * mm/mediawiki-https-fail-message (2013-05-29) 1 commit
156 (merged to 'next' on 2013-06-04 at fb2671c)
157 + git-remote-mediawiki: better error message when HTTP(S) access fails
159 Hint users when https:// connection failed to check the
160 certificate; it is a good hint if we assumie that it is common
161 error for the end users to make.
164 * nd/warn-ambiguous-object-name (2013-05-29) 1 commit
165 (merged to 'next' on 2013-06-04 at e87c9d1)
166 + get_sha1: warn about full or short object names that look like refs
168 "git cmd <name>", when <name> happens to be a 40-hex string,
169 directly uses the 40-hex string as an object name, even if a ref
170 "refs/<some hierarchy>/<name>" exists. This disambiguation order
171 is unlikely to change, but we should warn about the ambiguity just
172 like we warn when more than one refs/ hierachies share the same
176 * rj/mingw-cygwin (2013-05-08) 2 commits
177 (merged to 'next' on 2013-06-04 at 308fdb4)
178 + cygwin: Remove the CYGWIN_V15_WIN32API build variable
179 + mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
181 Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
182 this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
186 * rr/die-on-missing-upstream (2013-06-02) 2 commits
187 (merged to 'next' on 2013-06-03 at 00847ea)
188 + sha1_name: fix error message for @{<N>}, @{<date>}
189 + sha1_name: fix error message for @{u}
191 When a reflog notation is used for implicit "current branch", we
192 did not say which branch and worse said "branch ''".
195 * rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
196 (merged to 'next' on 2013-06-04 at 67d1fc7)
197 + diffcore-pickaxe doc: document -S and -G properly
198 + diffcore-pickaxe: make error messages more consistent
200 Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
203 * rr/maint-fetch-tag-doc-asterisks (2013-06-07) 1 commit
204 (merged to 'next' on 2013-06-07 at bfa4e7b)
205 + fetch-options.txt: prevent a wildcard refspec from getting misformatted
208 * rr/rebase-autostash (2013-05-29) 7 commits
209 (merged to 'next' on 2013-06-04 at 16f7c54)
210 + rebase: implement --[no-]autostash and rebase.autostash
211 + rebase --merge: return control to caller, for housekeeping
212 + rebase -i: return control to caller, for housekeeping
213 + am: return control to caller, for housekeeping
214 + rebase: prepare to do generic housekeeping
215 + rebase -i: don't error out if $state_dir already exists
216 + am: tighten a conditional that checks for $dotest
219 * rs/unpack-trees-plug-leak (2013-06-02) 7 commits
220 (merged to 'next' on 2013-06-03 at 97e7b6d)
221 + unpack-trees: free cache_entry array members for merges
222 + diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
223 + diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
224 + unpack-trees: create working copy of merge entry in merged_entry
225 + unpack-trees: factor out dup_entry
226 + read-cache: mark cache_entry pointers const
227 + cache: mark cache_entry pointers const
230 * tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
231 (merged to 'next' on 2013-06-04 at e891bb8)
232 + sha1_file: silence sha1_loose_object_info
235 * tr/test-commit-only-on-orphan (2013-06-02) 1 commit
236 (merged to 'next' on 2013-06-03 at b1864fd)
237 + Test 'commit --only' after 'checkout --orphan'
240 * xq/credential-osxkeychain (2013-05-28) 1 commit
241 (merged to 'next' on 2013-06-04 at a4ee0e0)
242 + credential-osxkeychain: support more protocols
244 --------------------------------------------------
247 * jc/topo-author-date-sort (2013-06-11) 4 commits
248 - log: --author-date-order
249 - sort-in-topological-order: use prio-queue
250 - prio-queue: priority queue of pointers to structs
251 - toposort: rename "lifo" field
252 (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.)
254 "git log" learned the "--author-date-order" option, with which the
255 output is topologically sorted and commits in parallel histories
256 are shown intermixed together based on the author timestamp.
258 Will merge to 'next'.
261 * fc/makefile (2013-06-09) 4 commits
262 - Makefile: use $^ to avoid listing prerequisites on the command line
263 - build: do not install git-remote-testgit
264 - build: generate and clean test scripts
265 - Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
267 Will merge to 'next'.
270 * fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
271 - test: test_must_be_empty helper
273 Will merge to 'next'.
276 * nd/traces (2013-06-09) 2 commits
277 - git.txt: document GIT_TRACE_PACKET
278 - core: use env variable instead of config var to turn on logging pack access
280 Will merge to 'next'.
283 * rr/complete-difftool-fixup (2013-06-09) 2 commits
284 (merged to 'next' on 2013-06-11 at fe91170)
285 + completion: show can take both revlist and paths
286 + completion: difftool takes both revs and files
287 (this branch is tangled with rr/complete-difftool.)
289 Replaces rr/complete-difftool.
291 Will merge to 'master'.
294 * rr/triangle-push-fix (2013-06-09) 4 commits
295 - t/push-default: test pushdefault with all modes
296 - t/push-default: generalize test_push_{success, commit}
297 - push: make upstream, simple work with pushdefault
298 - t/push-default: remove redundant test_config lines
300 Tries to apply the 'push.default = upstream' semantics to
301 triangular workflow where it does not quite apply.
303 Will be worked further.
306 * rs/discard-index-discard-array (2013-06-09) 2 commits
307 - read-cache: free cache in discard_index
308 - read-cache: add simple performance test
310 Will merge to 'next'.
313 * cm/remote-mediawiki (2013-06-11) 1 commit
314 - git-remote-mediawiki: display message when launched directly
316 Will merge to 'next'.
319 * jg/status-config (2013-06-11) 2 commits
320 - status:introduce status.branch to enable --branch by default
321 - status: introduce status.short to enable --short by default
323 Will merge to 'next'.
326 * mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits
327 - resolve_ref_unsafe(): close race condition reading loose refs
328 - resolve_ref_unsafe(): nest reference-reading code in an infinite loop
329 - resolve_ref_unsafe(): handle the case of an SHA-1 within loop
330 - resolve_ref_unsafe(): extract function handle_missing_loose_ref()
332 --------------------------------------------------
335 * jh/shorten-refname (2013-05-07) 4 commits
336 - t1514: refname shortening is done after dereferencing symbolic refs
337 - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
338 - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
339 - t1514: Add tests of shortening refnames in strict/loose mode
341 When remotes/origin/HEAD is not a symbolic ref, "rev-parse
342 --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
343 "origin/HEAD", which is fixed with this series (if it is a symbolic
344 ref that points at remotes/origin/something, then it should show
345 "origin/something" and it already does).
347 Expecting a reroll, as an early part of a larger series.
350 * jk/submodule-subdirectory-ok (2013-04-24) 3 commits
351 - submodule: fix quoting in relative_path()
352 - submodule: drop the top-level requirement
353 - rev-parse: add --prefix option
355 Allow various subcommands of "git submodule" to be run not from the
356 top of the working tree of the superproject.
358 Waiting for a reroll.
361 * jl/submodule-mv (2013-04-23) 5 commits
362 - submodule.c: duplicate real_path's return value
363 - rm: delete .gitmodules entry of submodules removed from the work tree
364 - Teach mv to update the path entry in .gitmodules for moved submodules
365 - Teach mv to move submodules using a gitfile
366 - Teach mv to move submodules together with their work trees
368 "git mv A B" when moving a submodule A does "the right thing",
369 inclusing relocating its working tree and adjusting the paths in
370 the .gitmodules file.
372 Waiting for a reroll.
375 * jk/list-objects-sans-blobs (2013-06-06) 4 commits
376 . archive: ignore blob objects when checking reachability
377 . list-objects: optimize "revs->blob_objects = 0" case
378 . upload-archive: restrict remote objects with reachability check
379 . clear parsed flag when we free tree buffers
381 Attempt to allow "archive --remote=$there $arbitrary_sha1" while
382 keeping the reachability safety.
384 Seems to break some tests in a trivial and obvious way.
387 * fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
388 - remote-helpers: add exec-path links
389 - remote-helpers: allow direct test execution
390 - remote-helpers: rename tests
391 - remote-helpers: generate scripts
393 I do not particularly think the second from the bottom is a good
394 change, but it takes the remainder of the series hostage.
396 Waiting for a reroll.
399 * jk/packed-refs-race (2013-05-06) 4 commits
400 . for_each_ref: load all loose refs before packed refs
401 . get_packed_refs: reload packed-refs file when it changes
402 . add a stat_validity struct
403 . resolve_ref: close race condition for packed refs
408 * mg/more-textconv (2013-05-10) 7 commits
409 - grep: honor --textconv for the case rev:path
410 - grep: allow to use textconv filters
411 - t7008: demonstrate behavior of grep with textconv
412 - cat-file: do not die on --textconv without textconv filters
413 - show: honor --textconv for blobs
414 - diff_opt: track whether flags have been set explicitly
415 - t4030: demonstrate behavior of show with textconv
417 Make "git grep" and "git show" pay attention to --textconv when
418 dealing with blob objects.
420 I thought this was pretty well designed and executed, but it seems
421 there are some doubts on the list; kicking back to 'pu'.
424 * mh/multimail (2013-04-21) 1 commit
425 - git-multimail: a replacement for post-receive-email
427 Waiting for the initial history to pull from.
431 * jc/format-patch (2013-04-22) 2 commits
432 - format-patch: --inline-single
433 - format-patch: rename "no_inline" field
435 A new option to send a single patch to the standard output to be
436 appended at the bottom of a message. I personally have no need for
437 this, but it was easy enough to cobble together. Tests, docs and
438 stripping out more MIMEy stuff are left as exercises to interested
441 Not ready for inclusion.
443 Will discard unless we hear from anybody who is interested in
444 tying its loose ends.
447 * jk/gitweb-utf8 (2013-04-08) 4 commits
448 - gitweb: Fix broken blob action parameters on blob/commitdiff pages
449 - gitweb: Don't append ';js=(0|1)' to external links
450 - gitweb: Make feed title valid utf8
451 - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
453 Various fixes to gitweb.
455 Drew Northup volunteered to take a look into this.
459 * jc/show-branch (2013-06-07) 5 commits
460 - show-branch: use commit slab to represent bitflags of arbitrary width
461 - show-branch.c: remove "all_mask"
462 - show-branch.c: abstract out "flags" operation
463 - show-branch.c: lift all_mask/all_revs to a global static
464 - show-branch.c: update comment style
465 (this branch uses jk/commit-info-slab; is tangled with jc/topo-author-date-sort.)
467 Waiting for the final step to lift the hard-limit before sending it out.
469 --------------------------------------------------
472 * jk/commit-info-slab (2013-06-07) 3 commits
473 - commit-slab: introduce a macro to define a slab for new type
474 - commit-slab: avoid large realloc
475 - commit: allow associating auxiliary info on-demand
476 (this branch is used by jc/show-branch and jc/topo-author-date-sort.)
478 Technology demonstration to show a way we could add custom
479 information to represent unbound number of flag bits etc. to commit
482 Will be in 'next' with jc/topo-author-date-sort.
485 * fc/sequencer-skip-quiet (2013-06-06) 5 commits
486 - sequencer: run post-rewrite hook
487 - cherry-pick: store rewritten commits
488 - cherry-pick: add --skip-empty option
489 - sequencer: avoid leaking message buffer when refusing to create an empty commit
490 - sequencer: remove useless indentation
492 The bottom three looked more or less reasonable. Execution of
493 post-rewrite hook could use a better refactoring from the original
494 code copied from builtin/commit.c, though.
496 Will discard the top 3, merge the rest to 'next'.
499 * js/test-ln-s-add (2013-06-07) 10 commits
500 - t4011: remove SYMLINKS prerequisite
501 - t6035: use test_ln_s_add to remove SYMLINKS prerequisite
502 - t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
503 - t3100: use test_ln_s_add to remove SYMLINKS prerequisite
504 - t3030: use test_ln_s_add to remove SYMLINKS prerequisite
505 - t0000: use test_ln_s_add to remove SYMLINKS prerequisite
506 - tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
507 - tests: introduce test_ln_s_add
508 - t3010: modernize style
509 - test-chmtime: Fix exit code on Windows
511 Many tests that check the behaviour of symbolic links stored in the
512 index or the tree objects do not have to be skipped on a filesystem
513 that lack symbolic link support.
515 Will merge to 'next'.
518 * mt/send-email-cc-match-fix (2013-06-05) 7 commits
519 (merged to 'next' on 2013-06-06 at e4d0831)
520 + test-send-email: test for pre-sanitized self name
521 + t/send-email: test suppress-cc=self with non-ascii
522 + t/send-email: add test with quoted sender
523 + send-email: make --suppress-cc=self sanitize input
524 + t/send-email: test suppress-cc=self on cccmd
525 + send-email: fix suppress-cc=self on cccmd
526 + t/send-email.sh: add test for suppress-cc=self
528 Logic git-send-email used to suppress cc mishandled names like "A
529 U. Thor" <author@example.xz>, where the human readable part needs
530 to be quoted (the user input may not have the double quotes around
531 the name, and comparison was done between quoted and unquoted
534 Will merge to 'master'.
537 * rr/complete-difftool (2013-06-09) 4 commits
538 (merged to 'next' on 2013-06-09 at 2ee40cb)
539 + Revert 77c1305 and 3c3b46b
540 (merged to 'next' on 2013-06-07 at 90e5f58)
541 + completion: add deprecated __git_complete_file ()
542 (merged to 'next' on 2013-06-04 at 01c7611)
543 + completion: clarify ls-tree, archive, show completion
544 + completion: difftool takes both revs and files
545 (this branch is tangled with rr/complete-difftool-fixup.)
547 Update command line completion (in contrib/) to use a better named
548 completion helper function for commands that take revisions and
551 Reverted, to be replaced with rr/complete-difftool-fixup.
554 * bp/mediawiki-credential (2013-06-05) 1 commit
555 (merged to 'next' on 2013-06-05 at ea07ec1)
556 + git-remote-mediawiki: use Git.pm functions for credentials
558 The bridge to MediaWiki has been updated to use the credential
559 helper interface in Git.pm, losing its own and the original
560 implementation the former was based on.
562 Will merge to 'master'.
565 * mz/rebase-tests (2013-06-07) 7 commits
566 - tests: move test for rebase messages from t3400 to t3406
567 - t3406: modernize style
568 - add tests for rebasing merged history
569 - add tests for rebasing root
570 - add tests for rebasing of empty commits
571 - add tests for rebasing with patch-equivalence present
572 - add simple tests of consistency across rebase types
574 Will merge to 'next'.
577 * nd/make-wildmatch-default (2013-06-02) 1 commit
578 - Makefile: promote wildmatch to be the default fnmatch implementation
580 Will merge to 'next'.
583 * rr/remove-contrib-some (2013-06-02) 1 commit
584 (merged to 'next' on 2013-06-05 at fc15705)
585 + contrib: remove continuous/ and patches/
587 Remove stale contrib/ material.
589 Will merge to 'master'.
592 * ap/diff-ignore-blank-lines (2013-06-10) 1 commit
593 - diff: add --ignore-blank-lines option
595 "git diff" learned a mode that ignores hunks whose change consists
596 only of additions and removals of blank lines, which is the same as
597 "diff -B" (ignore blank lines) of GNU diff.
600 * mh/reflife (2013-06-02) 25 commits
601 (merged to 'next' on 2013-06-05 at 291d863)
602 + refs: document the lifetime of the args passed to each_ref_fn
603 + register_ref(): make a copy of the bad reference SHA-1
604 + exclude_existing(): set existing_refs.strdup_strings
605 + string_list_add_refs_by_glob(): add a comment about memory management
606 + string_list_add_one_ref(): rename first parameter to "refname"
607 + show_head_ref(): rename first parameter to "refname"
608 + show_head_ref(): do not shadow name of argument
609 + add_existing(): do not retain a reference to sha1
610 + do_fetch(): clean up existing_refs before exiting
611 + do_fetch(): reduce scope of peer_item
612 + object_array_entry: fix memory handling of the name field
613 + find_first_merges(): remove unnecessary code
614 + find_first_merges(): initialize merges variable using initializer
615 + fsck: don't put a void*-shaped peg in a char*-shaped hole
616 + object_array_remove_duplicates(): rewrite to reduce copying
617 + revision: use object_array_filter() in implementation of gc_boundary()
618 + object_array: add function object_array_filter()
619 + revision: split some overly-long lines
620 + cmd_diff(): make it obvious which cases are exclusive of each other
621 + cmd_diff(): rename local variable "list" -> "entry"
622 + cmd_diff(): use an object_array for holding trees
623 + builtin_diff_tree(): make it obvious that function wants two entries
624 + add_rev_cmdline(): make a copy of the name argument
625 + fetch: make own copies of refnames
626 + describe: make own copy of refname
628 Define memory ownership and lifetime rules for what for-each-ref
629 feeds to its callbacks (in short, "you do not own it, so make a
630 copy if you want to keep it").
632 Will merge to 'master'.
635 * jx/clean-interactive (2013-06-03) 15 commits
636 - test: add t7301 for git-clean--interactive
637 - git-clean: add documentation for interactive git-clean
638 - git-clean: add ask each interactive action
639 - git-clean: add select by numbers interactive action
640 - git-clean: add filter by pattern interactive action
641 - git-clean: use a git-add-interactive compatible UI
642 - git-clean: add colors to interactive git-clean
643 - git-clean: show items of del_list in columns
644 - git-clean: add support for -i/--interactive
645 - git-clean: refactor git-clean into two phases
646 - Refactor write_name_quoted_relative, remove unused params
647 - Refactor quote_path_relative, remove unused params
648 - quote.c: remove path_relative, use relative_path instead
649 - path.c: refactor relative_path(), not only strip prefix
650 - test: add test cases for relative_path
653 * tr/test-v-and-v-subtest-only (2013-05-16) 6 commits
654 - test-lib: support running tests under valgrind in parallel
655 - test-lib: allow prefixing a custom string before "ok N" etc.
656 - test-lib: valgrind for only tests matching a pattern
657 - test-lib: verbose mode for only tests matching a pattern
658 - test-lib: refactor $GIT_SKIP_TESTS matching
659 - test-lib: enable MALLOC_* for the actual tests
661 Allows N instances of tests run in parallel, each running 1/N parts
662 of the test suite under Valgrind, to speed things up.
664 The tip one may be useful in practice but is a tad ugly ;-)
666 There seem to be some miscounting by toggling the verbose/valgrind
667 mode at wrong places? Cf. $gmane/225735
669 Waiting for a reroll.
672 * fc/contrib-related (2013-06-09) 5 commits
673 - contrib: related: print the amount of involvement
674 - contrib: related: parse committish like format-patch
675 - contrib: related: add option to parse from committish
676 - contrib: related: add support for multiple patches
677 - Add new git-related helper to contrib
680 * hv/config-from-blob (2013-05-12) 5 commits
681 - do not die when error in config parsing of buf occurs
682 - teach config --blob option to parse config from database
683 - config: make parsing stack struct independent from actual data source
684 - config: drop cf validity check in get_next_char()
685 - config: factor out config file stack management
687 Waiting for a reroll.
691 * kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
692 (merged to 'next' on 2013-06-05 at 193242b)
693 + revision.c: make default history consider bottom commits
694 + revision.c: don't show all merges for --parents
695 + revision.c: discount side branches when computing TREESAME
696 + revision.c: add BOTTOM flag for commits
697 + simplify-merges: drop merge from irrelevant side branch
698 + simplify-merges: never remove all TREESAME parents
699 + t6012: update test for tweaked full-history traversal
700 + revision.c: Make --full-history consider more merges
701 + Documentation: avoid "uninteresting"
702 + rev-list-options.txt: correct TREESAME for P
703 + t6111: add parents to tests
704 + t6111: allow checking the parents as well
705 + t6111: new TREESAME test set
706 + t6019: test file dropped in -s ours merge
707 + decorate.c: compact table when growing
709 Major update to a very core part of the revision traversal logic to
710 improve culling of irrelevant parents while traversing a mergy
713 Will merge to 'master'.
716 * mm/color-auto-default (2013-06-10) 2 commits
717 - make color.ui default to 'auto'
718 - config: refactor management of color.ui's default value
720 Flip the default for color.ui to 'auto', which is what many
721 tutorials recommend new users to do.
723 Will merge to 'next'.
726 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
727 - git add: -u/-A now affects the entire working tree
729 Will cook in 'next' until Git 2.0.
732 * jc/core-checkstat-2.0 (2013-05-06) 1 commit
733 - core.statinfo: remove as promised in Git 2.0
735 Will cook in 'next' until Git 2.0.
738 * jc/push-2.0-default-to-simple (2013-04-03) 1 commit
739 - push: switch default from "matching" to "simple"
741 Will cook in 'next' until Git 2.0.
744 * jc/add-2.0-ignore-removal (2013-04-22) 1 commit
745 - git add <pathspec>... defaults to "-A"
747 Updated endgame for "git add <pathspec>" that defaults to "--all"
748 aka "--no-ignore-removal".
750 Will cook in 'next' until Git 2.0.