From: Junio C Hamano Date: Tue, 11 Jun 2013 22:21:31 +0000 (-0700) Subject: What's cooking (2013/06 #04) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c9340387191206e4b1d86cd9044c1321f6ac051;p=thirdparty%2Fgit.git What's cooking (2013/06 #04) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index edccb37790..9c85438505 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, #03; Thu, 6) -X-master-at: 882e78c7f9c284408640347a4b1910ea73537a10 -X-next-at: 4be48e85aeafa12baca36edf3ee8cb0b7e970a16 +Subject: What's cooking in git.git (Jun 2013, #04; Tue, 11) +X-master-at: 4d1c565e1fb4e76c391448cdf85fe7c132bbb390 +X-next-at: 3b07823faafc941f5079443779265b5ba32c8407 -What's cooking in git.git (Jun 2013, #03; Thu, 6) +What's cooking in git.git (Jun 2013, #04; Tue, 11) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -17,185 +17,373 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[New Topics] +[Graduated to "master"] -* jk/list-objects-sans-blobs (2013-06-06) 4 commits - - archive: ignore blob objects when checking reachability - - list-objects: optimize "revs->blob_objects = 0" case - - upload-archive: restrict remote objects with reachability check - - clear parsed flag when we free tree buffers +* ar/wildmatch-foldcase (2013-06-02) 1 commit + (merged to 'next' on 2013-06-04 at 3180bcc) + + wildmatch: properly fold case everywhere - Attempt to allow "archive --remote=$there $arbitrary_sha1" while - keeping the reachability safety. + The wildmatch engine did not honor WM_CASEFOLD option correctly. --------------------------------------------------- -[Graduated to "master"] -* dm/unbash-subtree (2013-05-21) 1 commit - (merged to 'next' on 2013-06-03 at 2c9d2fb) - + contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash +* 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 - It turns out that git-subtree script does not have to be run with - bash. + 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. -* fc/cleanups (2013-05-28) 3 commits - (merged to 'next' on 2013-06-03 at 527cf93) - + test: rebase: fix --interactive test - + test: trivial cleanups - + remote: trivial style cleanup +* 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 ''". -* fc/makefile (2013-05-26) 5 commits - (merged to 'next' on 2013-06-03 at d1074e4) - + build: do not install git-remote-testpy - + build: add NO_INSTALL variable - + build: cleanup using $< - + build: cleanup using $^ - + build: trivial simplification - (this branch is used by fc/remote-helpers-use-specified-python.) - Stop installing the git-remote-testpy script that is only used for - testing. Also use handy magic variables to simplify rules. +* 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. -* fc/send-email-chainreplyto-warning (2013-05-28) 1 commit - (merged to 'next' on 2013-06-03 at e04764f) - + send-email: remove warning about unset chainreplyto - An overdue removal of "behaviour changed at 1.7.0; if you were - living in a cave, here is what you can adjust to it" message. +* 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 -* fc/show-branch-in-rebase-am (2013-05-29) 1 commit - (merged to 'next' on 2013-06-03 at 176f6b7) - + prompt: fix for simple rebase +* 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 - The bash prompt code (in contrib/) displayed the name of the branch - being rebased when "rebase -i/-m/-p" modes are in use, but not the - plain vanilla "rebase". +* 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 -* fc/transport-helper-no-refspec (2013-05-21) 2 commits - (merged to 'next' on 2013-06-03 at 8763bda) - + transport-helper: check if the dry-run is supported - + transport-helper: barf when user tries old:new - With "export" remote-helper protocol, (1) a push that tries to - update a remote ref whose name is different from the pushing side - does not work yet, and (2) the helper may not know how to do - --dry-run, so detect such problematic cases and disable them for - now. +* 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 -* jc/core-checkstat (2013-05-06) 1 commit - (merged to 'next' on 2013-06-03 at 2166cb3) - + deprecate core.statinfo at Git 2.0 boundary - (this branch is used by jc/core-checkstat-2.0.) +* 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' - The configuration variable core.checkstat was advertised in the - documentation but the code expected core.statinfo instead. - For now, we accept both core.checkstat and core.statinfo, but the - latter will be removed in the longer term. +* xq/credential-osxkeychain (2013-05-28) 1 commit + (merged to 'next' on 2013-06-04 at a4ee0e0) + + credential-osxkeychain: support more protocols +-------------------------------------------------- +[New Topics] -* ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit - (merged to 'next' on 2013-06-03 at ca0cae0) - + difftool --dir-diff: allow changing any clean working tree file +* 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.) - "difftool --dir-diff" did not copy back changes made by the - end-user in the diff tool backend to the working tree in some - cases. + "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. + Will merge to 'next'. -* nd/clone-connectivity-shortcut (2013-05-28) 4 commits - (merged to 'next' on 2013-06-03 at 812bd80) - + clone: open a shortcut for connectivity check - + index-pack: remove dead code (it should never happen) - + fetch-pack: prepare updated shallow file before fetching the pack - + clone: let the user know when check_everything_connected is run - "git clone" uses a lighter-weight implementation when making sure - that the history behind refs are complete. +* 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 + Will merge to 'next'. -* nd/prune-packed-dryrun-verbose (2013-05-28) 1 commit - (merged to 'next' on 2013-06-03 at 3445b27) - + prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects() +* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit + - test: test_must_be_empty helper -* nd/urls-doc-no-file-hyperlink-fix (2013-05-24) 1 commit - (merged to 'next' on 2013-06-03 at 54903b2) - + urls.txt: avoid auto converting to hyperlink + Will merge to 'next'. - An entry for "file://" scheme in the enumeration of URL types Git - can take in the HTML documentation was made into a clickable link - by mistake. +* 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 -* rj/mingw-compat-st-mode-bits (2013-05-29) 1 commit - (merged to 'next' on 2013-06-03 at 2efe84c) - + path: Fix a sparse warning + Will merge to 'next'. -* rr/push-head (2013-05-29) 3 commits - (merged to 'next' on 2013-06-03 at ecd5be7) - + push: make push.default = current use resolved HEAD - + push: fail early with detached HEAD and current - + push: factor out the detached HEAD error message +* 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 push $there HEAD:branch" did not resolve HEAD early enough, so - it was easy to flip it around while push is still going on and push - out a branch that the user did not originally intended when the - command was started. + Replaces rr/complete-difftool. + Will merge to 'master'. -* rr/zsh-color-prompt (2013-05-17) 3 commits - (merged to 'next' on 2013-06-03 at d011a76) - + prompt: colorize ZSH prompt - + prompt: factor out gitstring coloring logic - + prompt: introduce GIT_PS1_STATESEPARATOR +* 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/commit-m-no-edit (2013-05-28) 1 commit - (merged to 'next' on 2013-06-03 at 14329fa) - + commit: don't start editor if empty message is given with -m + Tries to apply the 'push.default = upstream' semantics to + triangular workflow where it does not quite apply. - "git commit --allow-empty-message -m ''" should not start an - editor. + Will be worked further. -* sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit - (merged to 'next' on 2013-06-03 at c316eec) - + archive-zip:write_zip_entry: Remove second reset of size variable to zero. +* rs/discard-index-discard-array (2013-06-09) 2 commits + - read-cache: free cache in discard_index + - read-cache: add simple performance test + Will merge to 'next'. -* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit - (merged to 'next' on 2013-06-03 at 32a45c0) - + prompt: fix show upstream with svn and zsh - zsh prompt script that borrowed from bash prompt script did not - work due to slight differences in array variable notation between - these two shells. +* cm/remote-mediawiki (2013-06-11) 1 commit + - git-remote-mediawiki: display message when launched directly + Will merge to 'next'. -* th/bisect-skip-report-range-fix (2013-05-22) 1 commit - (merged to 'next' on 2013-06-03 at 7bd4656) - + bisect: Fix log output for multi-parent skip ranges - Fix for an additional bisect log comments. +* 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 + Will merge to 'next'. -* tr/push-no-verify-doc (2013-05-23) 1 commit - (merged to 'next' on 2013-06-03 at 01737d6) - + Document push --no-verify - "git push --[no-]verify" was not documented. +* 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() -------------------------------------------------- [Stalled] +* 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 + - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD" + - t1514: Add tests of shortening refnames in strict/loose mode + + When remotes/origin/HEAD is not a symbolic ref, "rev-parse + --abbrev-ref remotes/origin/HEAD" ought to show "origin", not + "origin/HEAD", which is fixed with this series (if it is a symbolic + ref that points at remotes/origin/something, then it should show + "origin/something" and it already does). + + Expecting a reroll, as an early part of a larger series. + + +* jk/submodule-subdirectory-ok (2013-04-24) 3 commits + - submodule: fix quoting in relative_path() + - submodule: drop the top-level requirement + - rev-parse: add --prefix option + + Allow various subcommands of "git submodule" to be run not from the + top of the working tree of the superproject. + + Waiting for a reroll. + + +* jl/submodule-mv (2013-04-23) 5 commits + - submodule.c: duplicate real_path's return value + - rm: delete .gitmodules entry of submodules removed from the work tree + - Teach mv to update the path entry in .gitmodules for moved submodules + - Teach mv to move submodules using a gitfile + - Teach mv to move submodules together with their work trees + + "git mv A B" when moving a submodule A does "the right thing", + inclusing relocating its working tree and adjusting the paths in + the .gitmodules file. + + Waiting for a reroll. + + +* jk/list-objects-sans-blobs (2013-06-06) 4 commits + . archive: ignore blob objects when checking reachability + . list-objects: optimize "revs->blob_objects = 0" case + . upload-archive: restrict remote objects with reachability check + . clear parsed flag when we free tree buffers + + Attempt to allow "archive --remote=$there $arbitrary_sha1" while + keeping the reachability safety. + + 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 @@ -209,10 +397,10 @@ of the repositories listed at * 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 - - add a stat_validity struct - - resolve_ref: close race condition for packed refs + . for_each_ref: load all loose refs before packed refs + . get_packed_refs: reload packed-refs file when it changes + . add a stat_validity struct + . resolve_ref: close race condition for packed refs Will be rerolled. @@ -268,55 +456,30 @@ of the repositories listed at $gmane/226216 -* jk/commit-info-slab (2013-04-19) 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 - (this branch is used by jc/show-branch.) - - Technology demonstration to show a way we could use unbound number - of flag bits on commit objects. - - -* jc/show-branch (2013-05-21) 5 commits +* jc/show-branch (2013-06-07) 5 commits - show-branch: use commit slab to represent bitflags of arbitrary width - show-branch.c: remove "all_mask" - show-branch.c: abstract out "flags" operation - show-branch.c: lift all_mask/all_revs to a global static - show-branch.c: update comment style - (this branch uses jk/commit-info-slab.) + (this branch uses jk/commit-info-slab; is tangled with jc/topo-author-date-sort.) Waiting for the final step to lift the hard-limit before sending it out. -------------------------------------------------- [Cooking] -* 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. - - Will merge to 'master'. - - -* 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. - - Will merge to 'master'. - +* 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 + (this branch is used by jc/show-branch and jc/topo-author-date-sort.) -* 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 + Technology demonstration to show a way we could add custom + information to represent unbound number of flag bits etc. to commit + objects. - Will merge to 'master'. + Will be in 'next' with jc/topo-author-date-sort. * fc/sequencer-skip-quiet (2013-06-06) 5 commits @@ -330,29 +493,26 @@ of the repositories listed at post-rewrite hook could use a better refactoring from the original code copied from builtin/commit.c, though. + Will discard the top 3, merge the rest to 'next'. -* js/test-ln-s-add (2013-06-02) 11 commits + +* 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 - - t2100: 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 and test_ln_s_add + - tests: introduce test_ln_s_add - t3010: modernize style - - t2100: modernize style and unroll a loop of test cases - 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. - There seem to be some misconversion, mostly around the use of the - new test_ln_s helper. - - Will be rerolled. - $gmane/226466,226467 + Will merge to 'next'. * mt/send-email-cc-match-fix (2013-06-05) 7 commits @@ -374,33 +534,21 @@ of the repositories listed at Will merge to 'master'. -* rr/complete-difftool (2013-06-03) 2 commits +* 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. - - Will merge to 'master'. - - -* 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. - - Will merge to 'master'. - - -* 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 + Update command line completion (in contrib/) to use a better named + completion helper function for commands that take revisions and + paths. - Will merge to 'master'. + Reverted, to be replaced with rr/complete-difftool-fixup. * bp/mediawiki-credential (2013-06-05) 1 commit @@ -414,7 +562,7 @@ of the repositories listed at Will merge to 'master'. -* mz/rebase-tests (2013-06-03) 7 commits +* 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 @@ -423,23 +571,7 @@ of the repositories listed at - add tests for rebasing with patch-equivalence present - add simple tests of consistency across rebase types - Will be rerolled. - - -* 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 - - Will merge to 'master'. - - -* 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 - - Will merge to 'master'. + Will merge to 'next'. * nd/make-wildmatch-default (2013-06-02) 1 commit @@ -454,76 +586,16 @@ of the repositories listed at Remove stale contrib/ material. - -* 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 - - Will merge to 'master'. - - -* 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' - Will merge to 'master'. -* ap/diff-ignore-blank-lines (2013-05-29) 1 commit +* ap/diff-ignore-blank-lines (2013-06-10) 1 commit - diff: add --ignore-blank-lines option "git diff" learned a mode that ignores hunks whose change consists only of additions and removals of blank lines, which is the same as "diff -B" (ignore blank lines) of GNU diff. - Will be rerolled. - $gmane/226394 - - -* 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. - - Will merge to 'master'. - - -* 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 - - Will merge to 'master'. - - -* 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 - - Will merge to 'master'. - - -* xq/credential-osxkeychain (2013-05-28) 1 commit - (merged to 'next' on 2013-06-04 at a4ee0e0) - + credential-osxkeychain: support more protocols - - Will merge to 'master'. - * mh/reflife (2013-06-02) 25 commits (merged to 'next' on 2013-06-05 at 291d863) @@ -560,42 +632,6 @@ of the repositories listed at Will merge to 'master'. -* 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. - - Will merge to 'master'. - - -* 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 ''". - - Will merge to 'master'. - - -* 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 - - 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 @@ -633,70 +669,13 @@ of the repositories listed at Waiting for a reroll. -* fc/contrib-related (2013-06-03) 4 commits +* fc/contrib-related (2013-06-09) 5 commits + - contrib: related: print the amount of involvement - contrib: related: parse committish like format-patch - contrib: related: add option to parse from committish - contrib: related: add support for multiple patches - Add new git-related helper to contrib - Waiting for the design review to settle. - - -* 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 - - Will merge to 'master'. - * hv/config-from-blob (2013-05-12) 5 commits - do not die when error in config parsing of buf occurs @@ -731,96 +710,17 @@ of the repositories listed at improve culling of irrelevant parents while traversing a mergy history. + Will merge to 'master'. + -* mm/color-auto-default (2013-05-15) 2 commits +* mm/color-auto-default (2013-06-10) 2 commits - 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. The updated code claims the - switch happened at Git 2.0 in the past tense, but we might want to - expedite it, as this change is not all that important to deserve a - major version bump. - - I'd vote for merging this without waiting for 2.0. Comments? - - 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 - - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD" - - t1514: Add tests of shortening refnames in strict/loose mode - - When remotes/origin/HEAD is not a symbolic ref, "rev-parse - --abbrev-ref remotes/origin/HEAD" ought to show "origin", not - "origin/HEAD", which is fixed with this series (if it is a symbolic - ref that points at remotes/origin/something, then it should show - "origin/something" and it already does). - - Expecting a reroll, as an early part of a larger series. - - -* 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. - - Will merge to 'master'. - - -* 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 "@" - instead. - - Will merge to 'master'. - - -* jk/submodule-subdirectory-ok (2013-04-24) 3 commits - - submodule: fix quoting in relative_path() - - submodule: drop the top-level requirement - - rev-parse: add --prefix option - - Allow various subcommands of "git submodule" to be run not from the - top of the working tree of the superproject. + tutorials recommend new users to do. - Waiting for a reroll. - - -* jl/submodule-mv (2013-04-23) 5 commits - - submodule.c: duplicate real_path's return value - - rm: delete .gitmodules entry of submodules removed from the work tree - - Teach mv to update the path entry in .gitmodules for moved submodules - - Teach mv to move submodules using a gitfile - - Teach mv to move submodules together with their work trees - - "git mv A B" when moving a submodule A does "the right thing", - inclusing relocating its working tree and adjusting the paths in - the .gitmodules file. - - Waiting for a reroll. + Will merge to 'next'. * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit