From 27ef8a5faaf9d26847b59acd52c756fba19a6b12 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 15 Jun 2013 22:28:05 -0700 Subject: [PATCH] What's cooking (2013/06 #05) --- whats-cooking.txt | 768 ++++++++++++++++++++++++------------------------------ 1 file changed, 343 insertions(+), 425 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 9c85438505..fed3b2f56a 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jun 2013, #04; Tue, 11) -X-master-at: 4d1c565e1fb4e76c391448cdf85fe7c132bbb390 -X-next-at: 3b07823faafc941f5079443779265b5ba32c8407 +Subject: What's cooking in git.git (Jun 2013, #05; Sat, 15) +X-master-at: 0dbd81251dbc516bb3bf07862c369fc582a4e5e0 +X-next-at: 22819c950c7ed8ce0f8755d6134a6eae6064f6d0 -What's cooking in git.git (Jun 2013, #04; Tue, 11) +What's cooking in git.git (Jun 2013, #05; Sat, 15) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -19,319 +19,265 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* ar/wildmatch-foldcase (2013-06-02) 1 commit - (merged to 'next' on 2013-06-04 at 3180bcc) - + wildmatch: properly fold case everywhere - - The wildmatch engine did not honor WM_CASEFOLD option correctly. - - -* cb/log-follow-with-combined (2013-05-28) 1 commit - (merged to 'next' on 2013-06-04 at d5bf4f3) - + fix segfault with git log -c --follow - - -* cm/gitweb-project-list-persistent-cgi-fix (2013-06-07) 1 commit - (merged to 'next' on 2013-06-07 at b16ca1f) - + gitweb: fix problem causing erroneous project list - - "gitweb" forgot to clear a global variable $search_regexp upon each - request, mistakenly carrying over the previous search to a new one - when used as a persistent CGI. - - -* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit - (merged to 'next' on 2013-06-04 at bebedca) - + git.txt: remove stale comment regarding GIT_WORK_TREE - - These days, "git --work-tree=there cmd" without specifying an - explicit --git-dir=here will do the usual discovery, but we had a - description of older behaviour in the documentation. - - -* fc/at-head (2013-05-08) 13 commits - (merged to 'next' on 2013-06-04 at f334a2a) - + sha1_name: compare variable with constant, not constant with variable - + Add new @ shortcut for HEAD - + sha1_name: refactor reinterpret() - + sha1_name: check @{-N} errors sooner - + sha1_name: reorganize get_sha1_basic() - + sha1_name: don't waste cycles in the @-parsing loop - + sha1_name: remove unnecessary braces - + sha1_name: remove no-op - + tests: at-combinations: @{N} versus HEAD@{N} - + tests: at-combinations: increase coverage - + tests: at-combinations: improve nonsense() - + tests: at-combinations: check ref names directly - + tests: at-combinations: simplify setup - - Instead of typing four capital letters "HEAD", you can say "@". - - -* fc/completion-less-ls-remote (2013-06-02) 1 commit - (merged to 'next' on 2013-06-03 at 6624f0b) - + completion: avoid ls-remote in certain scenarios - - -* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits - (merged to 'next' on 2013-06-04 at 94e7b60) - + read-cache: trivial style cleanups - + read-cache: fix wrong 'the_index' usage - - -* fc/remote-bzr (2013-05-28) 8 commits - (merged to 'next' on 2013-06-04 at a603082) - + remote-bzr: add fallback check for a partial clone - + remote-bzr: reorganize the way 'wanted' works - + remote-bzr: trivial cleanups - + remote-bzr: change global repo - + remote-bzr: delay cloning/pulling - + remote-bzr: simplify get_remote_branch() - + remote-bzr: fix for files with spaces - + remote-bzr: recover from failed clones - - -* fc/remote-hg (2013-05-28) 50 commits - (merged to 'next' on 2013-06-04 at 9ee7dab) - + remote-hg: add support for --force - + remote-hg: add support for --dry-run - + remote-hg: check if a fetch is needed - + remote-hg: trivial cleanup - + remote-helpers: improve marks usage - + remote-hg: add check_push() helper - + remote-hg: add setup_big_push() helper - + remote-hg: remove files before modifications - + remote-hg: improve lightweight tag author - + remote-hg: use remote 'default' not local one - + remote-hg: improve branch listing - + remote-hg: simplify branch_tip() - + remote-hg: check diverged bookmarks - + remote-hg: pass around revision refs - + remote-hg: implement custom checkheads() - + remote-hg: implement custom push() - + remote-hg: only update necessary revisions - + remote-hg: force remote bookmark push selectively - + remote-hg: reorganize bookmark handling - + remote-hg: add test for failed double push - + remote-hg: add test for big push - + remote-hg: add test for new bookmark special - + remote-hg: add test for bookmark diverge - + remote-hg: add test for diverged push - + remote-hg: add test to push new bookmark - + remote-hg: add remote tests - + remote-hg: update bookmarks when using a remote - + remote-hg: add check_bookmark() test helper - + remote-bzr: simplify test checks - + remote-hg: add tests for 'master' bookmark - + remote-hg: always point HEAD to master - + remote-hg: improve progress calculation - + remote-hg: trivial cleanups - + remote-hg: ensure remote rebasing works - + remote-hg: upgrade version 1 marks - + remote-hg: switch from revisions to SHA-1 noteids - + remote-hg: add version checks to the marks - + remote-hg: improve node traversing - + remote-hg: shuffle some code - + remote-hg: use a shared repository store - + remote-hg: load all extensions - + remote-hg: test: simplify previous branch checkout - + remote-helpers: test: simplify remote URLs - + remote-helpers: tests: general improvements - + remote-helpers: test: cleanup style - + remote-helpers: test: cleanup white-spaces - + remote-hg: trivial reorganization - + remote-hg: test: be a little more quiet - + remote-hg: tests: fix hg merge - + remote-helpers: tests: use python directly - - -* jk/test-exit-code-by-signal (2013-06-06) 2 commits - (merged to 'next' on 2013-06-06 at 6fdea1b) - + t0005: skip signal death exit code test on Windows - (merged to 'next' on 2013-06-03 at 25af892) - + t0005: test git exit code from signal death - - -* mm/mediawiki-https-fail-message (2013-05-29) 1 commit - (merged to 'next' on 2013-06-04 at fb2671c) - + git-remote-mediawiki: better error message when HTTP(S) access fails - - Hint users when https:// connection failed to check the - certificate; it is a good hint if we assumie that it is common - error for the end users to make. - - -* nd/warn-ambiguous-object-name (2013-05-29) 1 commit - (merged to 'next' on 2013-06-04 at e87c9d1) - + get_sha1: warn about full or short object names that look like refs - - "git cmd ", when happens to be a 40-hex string, - directly uses the 40-hex string as an object name, even if a ref - "refs//" exists. This disambiguation order - is unlikely to change, but we should warn about the ambiguity just - like we warn when more than one refs/ hierachies share the same - name. - - -* rj/mingw-cygwin (2013-05-08) 2 commits - (merged to 'next' on 2013-06-04 at 308fdb4) - + cygwin: Remove the CYGWIN_V15_WIN32API build variable - + mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE - - Update build for Cygwin 1.[57]. Torsten Bögershausen reports that - this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it - ahead. - - -* rr/die-on-missing-upstream (2013-06-02) 2 commits - (merged to 'next' on 2013-06-03 at 00847ea) - + sha1_name: fix error message for @{}, @{} - + sha1_name: fix error message for @{u} - - When a reflog notation is used for implicit "current branch", we - did not say which branch and worse said "branch ''". - - -* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits - (merged to 'next' on 2013-06-04 at 67d1fc7) - + diffcore-pickaxe doc: document -S and -G properly - + diffcore-pickaxe: make error messages more consistent - - Update the low-level diffcore documentation on -S/-G and --pickaxe-all. - - -* rr/maint-fetch-tag-doc-asterisks (2013-06-07) 1 commit - (merged to 'next' on 2013-06-07 at bfa4e7b) - + fetch-options.txt: prevent a wildcard refspec from getting misformatted - - -* rr/rebase-autostash (2013-05-29) 7 commits - (merged to 'next' on 2013-06-04 at 16f7c54) - + rebase: implement --[no-]autostash and rebase.autostash - + rebase --merge: return control to caller, for housekeeping - + rebase -i: return control to caller, for housekeeping - + am: return control to caller, for housekeeping - + rebase: prepare to do generic housekeeping - + rebase -i: don't error out if $state_dir already exists - + am: tighten a conditional that checks for $dotest - - -* rs/unpack-trees-plug-leak (2013-06-02) 7 commits - (merged to 'next' on 2013-06-03 at 97e7b6d) - + unpack-trees: free cache_entry array members for merges - + diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const - + diff-lib, read-tree, unpack-trees: mark cache_entry pointers const - + unpack-trees: create working copy of merge entry in merged_entry - + unpack-trees: factor out dup_entry - + read-cache: mark cache_entry pointers const - + cache: mark cache_entry pointers const +* bp/mediawiki-credential (2013-06-05) 1 commit + (merged to 'next' on 2013-06-05 at ea07ec1) + + git-remote-mediawiki: use Git.pm functions for credentials + The bridge to MediaWiki has been updated to use the credential + helper interface in Git.pm, losing its own and the original + implementation the former was based on. -* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit - (merged to 'next' on 2013-06-04 at e891bb8) - + sha1_file: silence sha1_loose_object_info +* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits + (merged to 'next' on 2013-06-05 at 193242b) + + revision.c: make default history consider bottom commits + + revision.c: don't show all merges for --parents + + revision.c: discount side branches when computing TREESAME + + revision.c: add BOTTOM flag for commits + + simplify-merges: drop merge from irrelevant side branch + + simplify-merges: never remove all TREESAME parents + + t6012: update test for tweaked full-history traversal + + revision.c: Make --full-history consider more merges + + Documentation: avoid "uninteresting" + + rev-list-options.txt: correct TREESAME for P + + t6111: add parents to tests + + t6111: allow checking the parents as well + + t6111: new TREESAME test set + + t6019: test file dropped in -s ours merge + + decorate.c: compact table when growing + + Major update to a very core part of the revision traversal logic to + improve culling of irrelevant parents while traversing a mergy + history. + + +* mh/reflife (2013-06-02) 25 commits + (merged to 'next' on 2013-06-05 at 291d863) + + refs: document the lifetime of the args passed to each_ref_fn + + register_ref(): make a copy of the bad reference SHA-1 + + exclude_existing(): set existing_refs.strdup_strings + + string_list_add_refs_by_glob(): add a comment about memory management + + string_list_add_one_ref(): rename first parameter to "refname" + + show_head_ref(): rename first parameter to "refname" + + show_head_ref(): do not shadow name of argument + + add_existing(): do not retain a reference to sha1 + + do_fetch(): clean up existing_refs before exiting + + do_fetch(): reduce scope of peer_item + + object_array_entry: fix memory handling of the name field + + find_first_merges(): remove unnecessary code + + find_first_merges(): initialize merges variable using initializer + + fsck: don't put a void*-shaped peg in a char*-shaped hole + + object_array_remove_duplicates(): rewrite to reduce copying + + revision: use object_array_filter() in implementation of gc_boundary() + + object_array: add function object_array_filter() + + revision: split some overly-long lines + + cmd_diff(): make it obvious which cases are exclusive of each other + + cmd_diff(): rename local variable "list" -> "entry" + + cmd_diff(): use an object_array for holding trees + + builtin_diff_tree(): make it obvious that function wants two entries + + add_rev_cmdline(): make a copy of the name argument + + fetch: make own copies of refnames + + describe: make own copy of refname + (this branch is used by mh/ref-races.) + + Define memory ownership and lifetime rules for what for-each-ref + feeds to its callbacks (in short, "you do not own it, so make a + copy if you want to keep it"). + + +* mt/send-email-cc-match-fix (2013-06-05) 7 commits + (merged to 'next' on 2013-06-06 at e4d0831) + + test-send-email: test for pre-sanitized self name + + t/send-email: test suppress-cc=self with non-ascii + + t/send-email: add test with quoted sender + + send-email: make --suppress-cc=self sanitize input + + t/send-email: test suppress-cc=self on cccmd + + send-email: fix suppress-cc=self on cccmd + + t/send-email.sh: add test for suppress-cc=self + + Logic git-send-email used to suppress cc mishandled names like "A + U. Thor" , where the human readable part needs + to be quoted (the user input may not have the double quotes around + the name, and comparison was done between quoted and unquoted + strings). + + +* rr/complete-difftool-fixup (2013-06-09) 2 commits + (merged to 'next' on 2013-06-11 at fe91170) + + completion: show can take both revlist and paths + + completion: difftool takes both revs and files + (this branch is tangled with rr/complete-difftool.) + + "git difftool" can take both revs to be compared and pathspecs. + "git show" takes revs, revs:path and pathspecs. -* tr/test-commit-only-on-orphan (2013-06-02) 1 commit - (merged to 'next' on 2013-06-03 at b1864fd) - + Test 'commit --only' after 'checkout --orphan' +* rr/remove-contrib-some (2013-06-12) 2 commits + (merged to 'next' on 2013-06-12 at 797644c) + + contrib: drop blameview/ directory + (merged to 'next' on 2013-06-05 at fc15705) + + contrib: remove continuous/ and patches/ -* xq/credential-osxkeychain (2013-05-28) 1 commit - (merged to 'next' on 2013-06-04 at a4ee0e0) - + credential-osxkeychain: support more protocols + Remove stale contrib/ material. -------------------------------------------------- [New Topics] -* jc/topo-author-date-sort (2013-06-11) 4 commits - - log: --author-date-order - - sort-in-topological-order: use prio-queue - - prio-queue: priority queue of pointers to structs - - toposort: rename "lifo" field - (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.) - - "git log" learned the "--author-date-order" option, with which the - output is topologically sorted and commits in parallel histories - are shown intermixed together based on the author timestamp. +* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit + - prompt: squelch error output from cat Will merge to 'next'. -* fc/makefile (2013-06-09) 4 commits - - Makefile: use $^ to avoid listing prerequisites on the command line - - build: do not install git-remote-testgit - - build: generate and clean test scripts - - Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile +* jh/libify-note-handling (2013-06-12) 3 commits + - Move create_notes_commit() from notes-merge.c into notes-utils.c + - Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c + - finish_copy_notes_for_rewrite(): Let caller provide commit message + + +* jk/add-i-custom-diff-algo (2013-06-12) 1 commit + - add--interactive: respect diff.algorithm Will merge to 'next'. -* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit - - test: test_must_be_empty helper +* mh/ref-races (2013-06-11) 13 commits + - refs: do not invalidate the packed-refs cache unnecessarily + - for_each_ref: load all loose refs before packed refs + - get_packed_ref_cache: reload packed-refs file when it changes + - add a stat_validity struct + - Extract a struct stat_data from cache_entry + - packed_ref_cache: increment refcount when locked + - do_for_each_entry(): increment the packed refs cache refcount + - refs: manage lifetime of packed refs cache via reference counting + - refs: implement simple transactions for the packed-refs file + - refs: wrap the packed refs cache in a level of indirection + - pack_refs(): split creation of packed refs and entry writing + - repack_without_ref(): split list curation and entry writing + - Merge branch 'mh/packed-refs-various' into mh/ref-races - Will merge to 'next'. +* mm/rm-coalesce-errors (2013-06-12) 2 commits + - rm: introduce advice.rmHints to shorten messages + - rm: better error message on failure for multiple files -* nd/traces (2013-06-09) 2 commits - - git.txt: document GIT_TRACE_PACKET - - core: use env variable instead of config var to turn on logging pack access - Will merge to 'next'. +* rr/am-quit-empty-then-abort-fix (2013-06-14) 2 commits + - SQUASH??? + - am: handle stray $dotest directory -* rr/complete-difftool-fixup (2013-06-09) 2 commits - (merged to 'next' on 2013-06-11 at fe91170) - + completion: show can take both revlist and paths - + completion: difftool takes both revs and files - (this branch is tangled with rr/complete-difftool.) +* rs/logical-vs-binary-or (2013-06-13) 1 commit + (merged to 'next' on 2013-06-14 at 2821441) + + use logical OR (||) instead of binary OR (|) in logical context - Replaces rr/complete-difftool. + Code cleanup. Will merge to 'master'. -* rr/triangle-push-fix (2013-06-09) 4 commits - - t/push-default: test pushdefault with all modes - - t/push-default: generalize test_push_{success, commit} - - push: make upstream, simple work with pushdefault - - t/push-default: remove redundant test_config lines +* rs/match-trees-refactor (2013-06-13) 1 commit + (merged to 'next' on 2013-06-14 at 1904928) + + match-trees: factor out fill_tree_desc_strict - Tries to apply the 'push.default = upstream' semantics to - triangular workflow where it does not quite apply. + Code cleanup. - Will be worked further. + Will merge to 'master'. -* rs/discard-index-discard-array (2013-06-09) 2 commits - - read-cache: free cache in discard_index - - read-cache: add simple performance test +* fg/submodule-non-ascii-path (2013-06-14) 1 commit + - handle multibyte characters in name + + Many "git submodule" operations do not work on a submodule at a + path whose name is not in ASCII. Will merge to 'next'. -* cm/remote-mediawiki (2013-06-11) 1 commit - - git-remote-mediawiki: display message when launched directly +* rr/rebase-autostash (2013-06-13) 3 commits + - rebase: finish_rebase() in noop rebase + - rebase: finish_rebase() in fast-forward rebase + - rebase: guard against missing files in read_basic_state() Will merge to 'next'. -* jg/status-config (2013-06-11) 2 commits - - status:introduce status.branch to enable --branch by default - - status: introduce status.short to enable --short by default +* bp/remote-mw-tests (2013-06-14) 1 commit + - git-remote-mediawiki: remove hardcoded version number in the test suite Will merge to 'next'. -* mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits - - resolve_ref_unsafe(): close race condition reading loose refs - - resolve_ref_unsafe(): nest reference-reading code in an infinite loop - - resolve_ref_unsafe(): handle the case of an SHA-1 within loop - - resolve_ref_unsafe(): extract function handle_missing_loose_ref() +* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits + - git-remote-mediawiki: make error message more precise + - git-remote-mediawiki: add a perlcritic rule in Makefile + - git-remote-mediawiki: add a .perlcriticrc file + - git-remote-mediawiki: clearly rewrite double dereference + - git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki") + - git-remote-mediawiki: put non-trivial numeric values in constants. + - git-remote-mediawiki: don't use quotes for empty strings + - git-remote-mediawiki: replace "unless" statements with negated "if" statements + - git-remote-mediawiki: brace file handles for print for more clarity + - git-remote-mediawiki: modify strings for a better coding-style + - git-remote-mediawiki: put long code into a subroutine + - git-remote-mediawiki: remove import of unused open2 + - git-remote-mediawiki: check return value of open + - git-remote-mediawiki: assign a variable as undef and make proper indentation + - git-remote-mediawiki: rename a variable ($last) which has the name of a keyword + - git-remote-mediawiki: remove unused variable $entry + - git-remote-mediawiki: turn double-negated expressions into simple expressions + - git-remote-mediawiki: change the name of a variable + - git-remote-mediawiki: add newline in the end of die() error messages + - git-remote-mediawiki: change style in a regexp + - git-remote-mediawiki: change style in a regexp + - git-remote-mediawiki: change separator of some regexps + - git-remote-mediawiki: change the behaviour of a split + - git-remote-mediawiki: remove useless regexp modifier (m) + - git-remote-mediawiki: rewrite unclear line of instructions + - git-remote-mediawiki: change syntax of map calls + - git-remote-mediawiki: move a variable declaration at the top of the code + - git-remote-mediawiki: always end a subroutine with a return + - git-remote-mediawiki: replace :utf8 by :encoding(UTF-8) + - git-remote-mediawiki: move "use warnings;" before any instruction + - git-remote-mediawiki: make a regexp clearer + + Will merge to 'next'. + + +* jk/apache-test-for-2.4 (2013-06-14) 4 commits + - t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 + - t/lib-httpd/apache.conf: load compat access module in apache 2.4 + - t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 + - t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 + + Will merge to 'next'. + + +* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits + - rebase: use peel_committish() where appropriate + - sh-setup: add new peel_committish() helper + - t/rebase: add failing tests for a peculiar revision + + +* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits + - unpack_entry: do not die when we fail to apply a delta + - t5303: drop "count=1" from corruption dd -------------------------------------------------- [Stalled] +* rr/triangle-push-fix (2013-06-09) 4 commits + - t/push-default: test pushdefault with all modes + - t/push-default: generalize test_push_{success, commit} + - push: make upstream, simple work with pushdefault + - t/push-default: remove redundant test_config lines + + Tries to apply the 'push.default = upstream' semantics to + triangular workflow where it does not quite apply. + + Waiting for a reroll. + + * jh/shorten-refname (2013-05-07) 4 commits - t1514: refname shortening is done after dereferencing symbolic refs - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin @@ -384,18 +330,6 @@ of the repositories listed at Seems to break some tests in a trivial and obvious way. -* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits - - remote-helpers: add exec-path links - - remote-helpers: allow direct test execution - - remote-helpers: rename tests - - remote-helpers: generate scripts - - I do not particularly think the second from the bottom is a good - change, but it takes the remainder of the series hostage. - - Waiting for a reroll. - - * jk/packed-refs-race (2013-05-06) 4 commits . for_each_ref: load all loose refs before packed refs . get_packed_refs: reload packed-refs file when it changes @@ -469,17 +403,87 @@ of the repositories listed at -------------------------------------------------- [Cooking] +* jc/topo-author-date-sort (2013-06-11) 4 commits + (merged to 'next' on 2013-06-15 at ad4fb48) + + log: --author-date-order + + sort-in-topological-order: use prio-queue + + prio-queue: priority queue of pointers to structs + + toposort: rename "lifo" field + (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.) + + "git log" learned the "--author-date-order" option, with which the + output is topologically sorted and commits in parallel histories + are shown intermixed together based on the author timestamp. + + +* fc/makefile (2013-06-09) 4 commits + (merged to 'next' on 2013-06-14 at 75b5f6b) + + Makefile: use $^ to avoid listing prerequisites on the command line + + build: do not install git-remote-testgit + + build: generate and clean test scripts + + Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile + + Makefile simplification. + + Will merge to 'master'. + + +* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit + (merged to 'next' on 2013-06-14 at 99b6b54) + + test: test_must_be_empty helper + + Will merge to 'master'. + + +* nd/traces (2013-06-09) 2 commits + (merged to 'next' on 2013-06-14 at ce0d897) + + git.txt: document GIT_TRACE_PACKET + + core: use env variable instead of config var to turn on logging pack access + + Will merge to 'master'. + + +* rs/discard-index-discard-array (2013-06-09) 2 commits + (merged to 'next' on 2013-06-14 at 778ea9b) + + read-cache: free cache in discard_index + + read-cache: add simple performance test + + Will merge to 'master'. + + +* cm/remote-mediawiki (2013-06-11) 1 commit + (merged to 'next' on 2013-06-15 at bdce58e) + + git-remote-mediawiki: display message when launched directly + + Will merge to 'master'. + + +* jg/status-config (2013-06-15) 2 commits + (merged to 'next' on 2013-06-15 at 2bc6547) + + status: introduce status.branch to enable --branch by default + + status: introduce status.short to enable --short by default + + Will merge to 'master'. + + +* mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits + - resolve_ref_unsafe(): close race condition reading loose refs + - resolve_ref_unsafe(): nest reference-reading code in an infinite loop + - resolve_ref_unsafe(): handle the case of an SHA-1 within loop + - resolve_ref_unsafe(): extract function handle_missing_loose_ref() + + * jk/commit-info-slab (2013-06-07) 3 commits - - commit-slab: introduce a macro to define a slab for new type - - commit-slab: avoid large realloc - - commit: allow associating auxiliary info on-demand + (merged to 'next' on 2013-06-15 at 908ab93) + + commit-slab: introduce a macro to define a slab for new type + + commit-slab: avoid large realloc + + commit: allow associating auxiliary info on-demand (this branch is used by jc/show-branch and jc/topo-author-date-sort.) - Technology demonstration to show a way we could add custom - information to represent unbound number of flag bits etc. to commit - objects. + Allow adding custom information to commit objects in order to + represent unbound number of flag bits etc. - Will be in 'next' with jc/topo-author-date-sort. + Will merge to 'master'. * fc/sequencer-skip-quiet (2013-06-06) 5 commits @@ -497,94 +501,41 @@ of the repositories listed at * js/test-ln-s-add (2013-06-07) 10 commits - - t4011: remove SYMLINKS prerequisite - - t6035: use test_ln_s_add to remove SYMLINKS prerequisite - - t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite - - t3100: use test_ln_s_add to remove SYMLINKS prerequisite - - t3030: use test_ln_s_add to remove SYMLINKS prerequisite - - t0000: use test_ln_s_add to remove SYMLINKS prerequisite - - tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) - - tests: introduce test_ln_s_add - - t3010: modernize style - - test-chmtime: Fix exit code on Windows + (merged to 'next' on 2013-06-14 at 9f58cb1) + + t4011: remove SYMLINKS prerequisite + + t6035: use test_ln_s_add to remove SYMLINKS prerequisite + + t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite + + t3100: use test_ln_s_add to remove SYMLINKS prerequisite + + t3030: use test_ln_s_add to remove SYMLINKS prerequisite + + t0000: use test_ln_s_add to remove SYMLINKS prerequisite + + tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) + + tests: introduce test_ln_s_add + + t3010: modernize style + + test-chmtime: Fix exit code on Windows Many tests that check the behaviour of symbolic links stored in the index or the tree objects do not have to be skipped on a filesystem that lack symbolic link support. - Will merge to 'next'. - - -* mt/send-email-cc-match-fix (2013-06-05) 7 commits - (merged to 'next' on 2013-06-06 at e4d0831) - + test-send-email: test for pre-sanitized self name - + t/send-email: test suppress-cc=self with non-ascii - + t/send-email: add test with quoted sender - + send-email: make --suppress-cc=self sanitize input - + t/send-email: test suppress-cc=self on cccmd - + send-email: fix suppress-cc=self on cccmd - + t/send-email.sh: add test for suppress-cc=self - - Logic git-send-email used to suppress cc mishandled names like "A - U. Thor" , where the human readable part needs - to be quoted (the user input may not have the double quotes around - the name, and comparison was done between quoted and unquoted - strings). - - Will merge to 'master'. - - -* rr/complete-difftool (2013-06-09) 4 commits - (merged to 'next' on 2013-06-09 at 2ee40cb) - + Revert 77c1305 and 3c3b46b - (merged to 'next' on 2013-06-07 at 90e5f58) - + completion: add deprecated __git_complete_file () - (merged to 'next' on 2013-06-04 at 01c7611) - + completion: clarify ls-tree, archive, show completion - + completion: difftool takes both revs and files - (this branch is tangled with rr/complete-difftool-fixup.) - - Update command line completion (in contrib/) to use a better named - completion helper function for commands that take revisions and - paths. - - Reverted, to be replaced with rr/complete-difftool-fixup. - - -* bp/mediawiki-credential (2013-06-05) 1 commit - (merged to 'next' on 2013-06-05 at ea07ec1) - + git-remote-mediawiki: use Git.pm functions for credentials - - The bridge to MediaWiki has been updated to use the credential - helper interface in Git.pm, losing its own and the original - implementation the former was based on. - Will merge to 'master'. * mz/rebase-tests (2013-06-07) 7 commits - - tests: move test for rebase messages from t3400 to t3406 - - t3406: modernize style - - add tests for rebasing merged history - - add tests for rebasing root - - add tests for rebasing of empty commits - - add tests for rebasing with patch-equivalence present - - add simple tests of consistency across rebase types + (merged to 'next' on 2013-06-14 at 73f3318) + + tests: move test for rebase messages from t3400 to t3406 + + t3406: modernize style + + add tests for rebasing merged history + + add tests for rebasing root + + add tests for rebasing of empty commits + + add tests for rebasing with patch-equivalence present + + add simple tests of consistency across rebase types - Will merge to 'next'. + Will merge to 'master'. * nd/make-wildmatch-default (2013-06-02) 1 commit - - Makefile: promote wildmatch to be the default fnmatch implementation - - Will merge to 'next'. - - -* rr/remove-contrib-some (2013-06-02) 1 commit - (merged to 'next' on 2013-06-05 at fc15705) - + contrib: remove continuous/ and patches/ - - Remove stale contrib/ material. + (merged to 'next' on 2013-06-14 at cf21faa) + + Makefile: promote wildmatch to be the default fnmatch implementation Will merge to 'master'. @@ -597,41 +548,6 @@ of the repositories listed at "diff -B" (ignore blank lines) of GNU diff. -* mh/reflife (2013-06-02) 25 commits - (merged to 'next' on 2013-06-05 at 291d863) - + refs: document the lifetime of the args passed to each_ref_fn - + register_ref(): make a copy of the bad reference SHA-1 - + exclude_existing(): set existing_refs.strdup_strings - + string_list_add_refs_by_glob(): add a comment about memory management - + string_list_add_one_ref(): rename first parameter to "refname" - + show_head_ref(): rename first parameter to "refname" - + show_head_ref(): do not shadow name of argument - + add_existing(): do not retain a reference to sha1 - + do_fetch(): clean up existing_refs before exiting - + do_fetch(): reduce scope of peer_item - + object_array_entry: fix memory handling of the name field - + find_first_merges(): remove unnecessary code - + find_first_merges(): initialize merges variable using initializer - + fsck: don't put a void*-shaped peg in a char*-shaped hole - + object_array_remove_duplicates(): rewrite to reduce copying - + revision: use object_array_filter() in implementation of gc_boundary() - + object_array: add function object_array_filter() - + revision: split some overly-long lines - + cmd_diff(): make it obvious which cases are exclusive of each other - + cmd_diff(): rename local variable "list" -> "entry" - + cmd_diff(): use an object_array for holding trees - + builtin_diff_tree(): make it obvious that function wants two entries - + add_rev_cmdline(): make a copy of the name argument - + fetch: make own copies of refnames - + describe: make own copy of refname - - Define memory ownership and lifetime rules for what for-each-ref - feeds to its callbacks (in short, "you do not own it, so make a - copy if you want to keep it"). - - Will merge to 'master'. - - * jx/clean-interactive (2013-06-03) 15 commits - test: add t7301 for git-clean--interactive - git-clean: add documentation for interactive git-clean @@ -688,39 +604,15 @@ of the repositories listed at $gmane/223964 -* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits - (merged to 'next' on 2013-06-05 at 193242b) - + revision.c: make default history consider bottom commits - + revision.c: don't show all merges for --parents - + revision.c: discount side branches when computing TREESAME - + revision.c: add BOTTOM flag for commits - + simplify-merges: drop merge from irrelevant side branch - + simplify-merges: never remove all TREESAME parents - + t6012: update test for tweaked full-history traversal - + revision.c: Make --full-history consider more merges - + Documentation: avoid "uninteresting" - + rev-list-options.txt: correct TREESAME for P - + t6111: add parents to tests - + t6111: allow checking the parents as well - + t6111: new TREESAME test set - + t6019: test file dropped in -s ours merge - + decorate.c: compact table when growing - - Major update to a very core part of the revision traversal logic to - improve culling of irrelevant parents while traversing a mergy - history. - - Will merge to 'master'. - - * mm/color-auto-default (2013-06-10) 2 commits - - make color.ui default to 'auto' - - config: refactor management of color.ui's default value + (merged to 'next' on 2013-06-14 at 0647576) + + make color.ui default to 'auto' + + config: refactor management of color.ui's default value Flip the default for color.ui to 'auto', which is what many tutorials recommend new users to do. - Will merge to 'next'. + Will merge to 'master'. * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit @@ -748,3 +640,29 @@ of the repositories listed at aka "--no-ignore-removal". Will cook in 'next' until Git 2.0. + +-------------------------------------------------- +[Discarded] + +* rr/complete-difftool (2013-06-09) 3 commits + (merged to 'next' on 2013-06-09 at 2ee40cb) + + Revert 77c1305 and 3c3b46b + (merged to 'next' on 2013-06-07 at 90e5f58) + + completion: add deprecated __git_complete_file () + (merged to 'next' on 2013-06-04 at 01c7611) + + completion: clarify ls-tree, archive, show completion + + Update command line completion (in contrib/) to use a better named + completion helper function for commands that take revisions and + paths. + + Reverted, to be replaced with rr/complete-difftool-fixup. + + +* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits + - remote-helpers: add exec-path links + - remote-helpers: allow direct test execution + - remote-helpers: rename tests + - remote-helpers: generate scripts + + Retracted. -- 2.11.4.GIT