From 8c84c1eb98ec78b3ceb7311820872be6456aacf8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 21 Jul 2013 23:52:52 -0700 Subject: [PATCH] What's cooking (2013/07 #07) --- whats-cooking.txt | 540 ++++++++++++++++++++-------------------------- 1 file changed, 234 insertions(+), 306 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 9188c6625d..66227b2fbf 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,19 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jul 2013, #06; Thu, 18) -X-master-at: b72c6161f1f34985e4a13f8c4c9ba9e55b3d1496 -X-next-at: 6b4ca9f6d2ab38b0a886be8faea27be3a50ef9e1 +Subject: What's cooking in git.git (Jul 2013, #07; Sun, 21) +X-master-at: 805c5a578995db7594ad0751a683bc6422655c29 +X-next-at: e2c9e63a26e9480ed73a4f2615121c69962087b4 -What's cooking in git.git (Jul 2013, #06; Thu, 18) +What's cooking in git.git (Jul 2013, #07; Sun, 21) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -A handful of code and documentation clean-up patches have been -applied to 'master'. +Quite a many documentation clean-up patches that are already in +'master' have been applied to 'maint'. Hopefully 1.8.3.4 will be +the last of the 1.8.3.x maintenance series. You can find the changes described here in the integration branches of the repositories listed at @@ -20,168 +21,188 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* bc/commit-invalid-utf8 (2013-07-09) 3 commits - (merged to 'next' on 2013-07-11 at a2ee572) - + commit: reject non-characters - + commit: reject overlong UTF-8 sequences - + commit: reject invalid UTF-8 codepoints +* mm/color-auto-default (2013-07-19) 1 commit + (merged to 'next' on 2013-07-19 at 880d984) + + git add -e: Explicitly specify that patch should have no color - Tighten up autodetection of UTF-8 encoded strings. + A finishing touch to fix breakage to "add -e" caused by defaulting + ui.color to "auto". + Will merge to 'master'. -* bc/push-match-many-refs (2013-07-08) 1 commit - (merged to 'next' on 2013-07-11 at df4d56d) - + remote.c: avoid O(m*n) behavior in match_push_refs - Pushing to repositories with many refs employed O(m*n) algorithm - where n is the number of refs on the receiving end. +* jc/simple-add-must-be-a-no-op (2013-07-19) 1 commit + (merged to 'next' on 2013-07-19 at a1543ee) + + t2202: make sure "git add" (no args) stays a no-op + This detected a mismerge of one of "add-2.0" topics to the 'jch' + and 'pu' branches. -* bc/send-email-use-port-as-separate-param (2013-07-04) 1 commit - (merged to 'next' on 2013-07-09 at a569eb5) - + send-email: provide port separately from hostname + Will merge to 'master'. - Pass port number as a separate argument when send-email initializes - Net::SMTP, instead of as a part of the hostname, i.e. host:port. - This allows GSSAPI codepath to match with the hostname given. +* jm/doc-ref-prune (2013-07-18) 2 commits + - Documentation: fix git-prune example usage + - Documentation: remove --prune from pack-refs examples -* bp/mediawiki-preview (2013-07-08) 7 commits - (merged to 'next' on 2013-07-12 at 870890a) - + git-remote-mediawiki: add preview subcommand into git mw - + git-remote-mediawiki: add git-mw command - + git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki - + git-remote-mediawiki: update tests to run with the new bin-wrapper - + git-remote-mediawiki: add a git bin-wrapper for developement - + wrap-for-bin: make bin-wrappers chainable - + git-remote-mediawiki: introduction of Git::Mediawiki.pm + Will merge to 'next' and then 'master'. - Add a command to allow previewing the contents locally before - pushing it out, when working with a MediaWiki remote. - I personally do not think this belongs to Git. If you are working - on a set of AsciiDoc source files, you sure do want to locally - format to preview what you will be pushing out, and if you are - working on a set of C or Java source files, you do want to test it - before pushing it out, too. That kind of thing belongs to your - build script, not to your SCM. +* rj/sparse (2013-07-21) 1 commit + - Revert "compat/unsetenv.c: Fix a sparse warning" - But I'll let it pass, as this is only a contrib/ thing. + Will merge to 'next' and then 'master'. -* cp/submodule-custom-update (2013-07-03) 1 commit - (merged to 'next' on 2013-07-09 at 3d27516) - + submodule update: allow custom command to update submodule working tree +* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit + - traverse_trees(): clarify return value of the callback - In addition to the choice from "rebase, merge, or checkout-detach", - allow a custom command to be used in "submodule update" to update - the working tree of submodules. + Will merge to 'next' and then 'master'. +-------------------------------------------------- +[Stalled] -* es/overlapping-range-set (2013-07-09) 2 commits - (merged to 'next' on 2013-07-11 at 3df5a94) - + range_set: fix coalescing bug when range is a subset of another - + t4211: fix broken test when one -L range is subset of another +* jk/fast-import-empty-ls (2013-06-23) 4 commits + - fast-import: allow moving the root tree + - fast-import: allow ls or filecopy of the root tree + - fast-import: set valid mode on root tree in "ls" + - t9300: document fast-import empty path issues + Comments? -* fg/submodule-clone-depth (2013-07-03) 1 commit - (merged to 'next' on 2013-07-09 at ab156f3) - + Add --depth to submodule update/add - Allow shallow-cloning of submodules with "git submodule update". +* tf/gitweb-ss-tweak (2013-07-15) 4 commits + - gitweb: make search help link less ugly + - gitweb: omit the repository owner when it is unset + - gitweb: vertically centre contents of page footer + - gitweb: ensure OPML text fits inside its box + Comments? -* jc/revert-clone-doc-update-for-push-from-shallow (2013-07-15) 1 commit - + Revert "git-clone.txt: remove the restriction on pushing from a shallow clone" +* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits + - ### DONTMERGE: needs better explanation on what config they need + - pack-refs.c: Add missing call to git_config() + - show-ref.c: Add missing call to git_config() -* jk/fetch-pack-many-refs (2013-07-02) 3 commits - (merged to 'next' on 2013-07-09 at a53b7c7) - + fetch-pack: avoid quadratic behavior in rev_list_push - + commit.c: make compare_commits_by_commit_date global - + fetch-pack: avoid quadratic list insertion in mark_complete + The changes themselves are probably good, but it is unclear what + basic setting needs to be read for which exact operation. - Fetching between repositories with many refs employed O(n^2) - algorithm to match up the common objects, which has been corrected. + Waiting for clarification. + $gmane/228294 -* jk/format-patch-from (2013-07-03) 2 commits - (merged to 'next' on 2013-07-09 at 6ed86d5) - + teach format-patch to place other authors into in-body "From" - + pretty.c: drop const-ness from pretty_print_context +* 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 - "git format-patch" learned "--from[=whom]" option, which sets the - "From: " header to the specified person (or the person who runs the - command, if "=whom" part is missing) and move the original author - information to an in-body From: header as necessary. + 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. + $gmane/225137 -* jk/in-pack-size-measurement (2013-07-12) 10 commits - (merged to 'next' on 2013-07-12 at 5ba720f) - + pack-revindex: radix-sort the revindex - + pack-revindex: use unsigned to store number of objects - + cat-file: split --batch input lines on whitespace - + cat-file: add %(objectsize:disk) format atom - + cat-file: add --batch-check= - + cat-file: refactor --batch option parsing - + cat-file: teach --batch to stream blob objects - + t1006: modernize output comparisons - + teach sha1_object_info_extended a "disk_size" query - + zero-initialize object_info structs - (this branch is used by jk/cat-file-batch-optim.) - Allow on-disk footprint of objects in packfiles (often they are a - lot smaller than their true size, when expressed as deltas). +* 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. -* jk/maint-clone-shared-no-connectivity-validation (2013-07-08) 1 commit - (merged to 'next' on 2013-07-11 at 8183412) - + clone: drop connectivity check for local clones - (this branch is used by jk/clone-shared-no-connectivity-validation.) + Ejected from 'pu', as it conflicts with nd/magic-pathspec. - "git clone -s/-l" is a filesystem level copy and does not offer any - protection against source repository being corrupt. While the - connectivity validation checks commits and trees being readable, it - made the otherwise instantaneous local modes of clone much more - expensive, without protecting blob data from bitflips. +* 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 -* mv/merge-ff-tristate (2013-07-02) 1 commit - (merged to 'next' on 2013-07-09 at c32b95d) - + merge: handle --ff/--no-ff/--ff-only as a tri-state option + Attempt to allow "archive --remote=$there $arbitrary_sha1" while + keeping the reachability safety. - The configuration variable "merge.ff" was cleary a tri-state to - choose one from "favor fast-forward when possible", "always create - a merge even when the history could fast-forward" and "do not - create any merge, only update when the history fast-forwards", but - the command line parser did not implement the usual convention of - "last one wins, and command line overrides the configuration" - correctly. + Seems to break some tests in a trivial and obvious way. -* rr/rebase-reflog-message-reword (2013-06-23) 2 commits - (merged to 'next' on 2013-07-11 at 59921e0) - + rebase -i: use a better reflog message - + rebase: use a better reflog message +* mg/more-textconv (2013-05-10) 7 commits + - grep: honor --textconv for the case rev:path + - grep: allow to use textconv filters + - t7008: demonstrate behavior of grep with textconv + - cat-file: do not die on --textconv without textconv filters + - show: honor --textconv for blobs + - diff_opt: track whether flags have been set explicitly + - t4030: demonstrate behavior of show with textconv - "git rebase [-i]" used to leave just "rebase" as its reflog message - for some operations. This rewords them to be more informative. + Make "git grep" and "git show" pay attention to --textconv when + dealing with blob objects. + I thought this was pretty well designed and executed, but it seems + there are some doubts on the list; kicked back to 'pu'. -* rs/mailmap-himself (2013-07-17) 1 commit - + .mailmap: René Scharfe has a new email address +* jc/format-patch (2013-04-22) 2 commits + - format-patch: --inline-single + - format-patch: rename "no_inline" field + + A new option to send a single patch to the standard output to be + appended at the bottom of a message. I personally have no need for + this, but it was easy enough to cobble together. Tests, docs and + stripping out more MIMEy stuff are left as exercises to interested + parties. + + Not ready for inclusion. + + Will discard unless we hear from anybody who is interested in + tying its loose ends. -* sb/mailmap-updates (2013-07-17) 3 commits - + .mailmap: combine more (email, name) to individual persons - (merged to 'next' on 2013-07-15 at 61c965a) - + .mailmap: Combine more (email, name) to individual persons - + .mailmap: Map email addresses to names + +* jk/gitweb-utf8 (2013-04-08) 4 commits + - gitweb: Fix broken blob action parameters on blob/commitdiff pages + - gitweb: Don't append ';js=(0|1)' to external links + - gitweb: Make feed title valid utf8 + - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch + + Various fixes to gitweb. + + Drew Northup volunteered to take a look into this. + $gmane/226216 + + +* 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 + + Waiting for the final step to lift the hard-limit before sending it out. -------------------------------------------------- -[New Topics] +[Cooking] + +* mh/multimail (2013-07-15) 2 commits + - post-receive-email: deprecate script in favor of git-multimail + - git-multimail: an improved replacement for post-receive-email + + An enhanced "post-receive" hook to send e-mail messages. + + I tend to agree that the wording of the tip one is a bit too + strong. An old script does not necessarily have to be avoided by + its existing users only because it has not got updates for a long + time. + * db/show-ref-head (2013-07-17) 1 commit (merged to 'next' on 2013-07-18 at 73797d0) @@ -221,14 +242,14 @@ of the repositories listed at Will merge to 'master'. -* jc/diff-filter-negation (2013-07-17) 6 commits +* jc/diff-filter-negation (2013-07-19) 6 commits - diff: deprecate -q option to diff-files - diff: allow lowercase letter to specify what change class to exclude - diff: reject unknown change class given to --diff-filter - diff: preparse --diff-filter string argument - diff: factor out match_filter() - diff: pass the whole diff_options to diffcore_apply_filter() - (this branch is used by jc/diff-2.0-remove-q-synonym-for-no-deletion.) + (this branch is used by jc/hold-diff-remove-q-synonym-for-no-deletion.) Teach "git diff --diff-filter" to express "I do not want to see these classes of changes" more directly by listing only the @@ -236,13 +257,13 @@ of the repositories listed at everything but deletion) and deprecate "diff-files -q" which did the same thing as "--diff-filter=d". - Waiting for comments. + Will merge to 'next'. * mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit - do_one_ref(): save and restore value of current_ref - May want some tests? + Needs a bit better description to be placed in the Release Notes. * ml/avoid-using-grep-on-crlf-files (2013-07-18) 1 commit @@ -253,15 +274,20 @@ of the repositories listed at extract matching lines may lose the CR at the end of lines that match, causing the actual output not to match the expected output. - Waiting for success reports from folks on various flavours of - Windows ports. + Will merge to 'next'. + +* ml/cygwin-updates (2013-07-21) 4 commits + - cygwin: stop forcing core.filemode=false + - Cygwin 1.7 supports mmap + - Cygwin 1.7 has thread-safe pread + - Cygwin 1.7 needs compat/regex -* ml/cygwin-updates (2013-07-15) 2 commits - - Use compat/regex on Cygwin - - Cygwin has trustable filemode + The tip one does _not_ revert c869753e (Force core.filemode to + false on Cygwin., 2006-12-30) on purpose, so that people can + still retain the old behaviour if they wanted to. - This seems to depend heavily on Cygwin version differences. + Will merge to 'next'. * mm/diff-no-patch-synonym-to-s (2013-07-17) 6 commits @@ -342,15 +368,18 @@ of the repositories listed at This is an earlier part of a 6 patch series, with log message corrected. + Will merge to 'next'. + * sb/misc-fixes (2013-07-15) 3 commits - - diff.c: Do not initialize a variable, which gets reassigned anyway. - - commit: Fix a memory leak in determine_author_info - - daemon.c:handle: Remove unneeded check for null pointer. + (merged to 'next' on 2013-07-21 at 880b08c) + + diff.c: Do not initialize a variable, which gets reassigned anyway. + + commit: Fix a memory leak in determine_author_info + + daemon.c:handle: Remove unneeded check for null pointer. Assorted code cleanups and a minor fix. - Will merge to 'next'. + Will merge to 'master'. * sb/parse-object-buffer-eaten (2013-07-17) 1 commit @@ -380,147 +409,27 @@ of the repositories listed at Will merge to 'master'. -* jc/diff-2.0-remove-q-synonym-for-no-deletion (2013-07-18) 1 commit - - diff: remove "diff-files -q" at Git 2.0 version boundary - (this branch uses jc/diff-filter-negation.) - - This obviously has to wait until Git 2.0. - --------------------------------------------------- -[Stalled] - -* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits - - ### DONTMERGE: needs better explanation on what config they need - - pack-refs.c: Add missing call to git_config() - - show-ref.c: Add missing call to git_config() - - The changes themselves are probably good, but it is unclear what - basic setting needs to be read for which exact operation. - - Waiting for clarification. - $gmane/228294 - - -* 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. - $gmane/225137 - - -* 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. - - Ejected from 'pu', as it conflicts with nd/magic-pathspec. - - -* 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. - - -* mg/more-textconv (2013-05-10) 7 commits - - grep: honor --textconv for the case rev:path - - grep: allow to use textconv filters - - t7008: demonstrate behavior of grep with textconv - - cat-file: do not die on --textconv without textconv filters - - show: honor --textconv for blobs - - diff_opt: track whether flags have been set explicitly - - t4030: demonstrate behavior of show with textconv - - Make "git grep" and "git show" pay attention to --textconv when - dealing with blob objects. - - I thought this was pretty well designed and executed, but it seems - there are some doubts on the list; kicked back to 'pu'. - - -* mh/multimail (2013-07-15) 2 commits - - post-receive-email: deprecate script in favor of git-multimail - - git-multimail: an improved replacement for post-receive-email - - An enhanced "post-receive" hook to send e-mail messages. - - Will wait for the review for the tip one to settle and then merge. - - -* jc/format-patch (2013-04-22) 2 commits - - format-patch: --inline-single - - format-patch: rename "no_inline" field - - A new option to send a single patch to the standard output to be - appended at the bottom of a message. I personally have no need for - this, but it was easy enough to cobble together. Tests, docs and - stripping out more MIMEy stuff are left as exercises to interested - parties. - - Not ready for inclusion. - - Will discard unless we hear from anybody who is interested in - tying its loose ends. - - -* jk/gitweb-utf8 (2013-04-08) 4 commits - - gitweb: Fix broken blob action parameters on blob/commitdiff pages - - gitweb: Don't append ';js=(0|1)' to external links - - gitweb: Make feed title valid utf8 - - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch - - Various fixes to gitweb. - - Drew Northup volunteered to take a look into this. - $gmane/226216 - - -* 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 - - Waiting for the final step to lift the hard-limit before sending it out. - --------------------------------------------------- -[Cooking] - * rr/send-email-ssl-verify (2013-07-18) 1 commit - - send-email: be explicit with SSL certificate verification + (merged to 'next' on 2013-07-21 at 62099ff) + + send-email: be explicit with SSL certificate verification - Waiting for test reports. + Newer Net::SMTP::SSL module does not want the user programs to use + the default behaviour to let server certificate go without + verification, so by default enable the verification with a + mechanism to turn it off if needed. + + Will merge to 'master'. * es/check-mailmap (2013-07-13) 2 commits - - t4203: test check-mailmap command invocation - - builtin: add git-check-mailmap command + (merged to 'next' on 2013-07-21 at 23c5363) + + t4203: test check-mailmap command invocation + + builtin: add git-check-mailmap command + (this branch is used by es/contacts.) A new command to allow scripts to query the mailmap information. - Will merge to 'next'. + Will merge to 'master'. * jc/check-x-z (2013-07-11) 4 commits @@ -576,15 +485,6 @@ of the repositories listed at Will merge to 'master'. -* tf/gitweb-ss-tweak (2013-07-15) 4 commits - - gitweb: make search help link less ugly - - gitweb: omit the repository owner when it is unset - - gitweb: vertically centre contents of page footer - - gitweb: ensure OPML text fits inside its box - - Waiting for comments. - - * tr/fd-gotcha-fixes (2013-07-12) 2 commits (merged to 'next' on 2013-07-18 at 30f4fdf) + run-command: dup_devnull(): guard against syscalls failing @@ -619,15 +519,18 @@ of the repositories listed at * ms/fetch-prune-configuration (2013-07-18) 1 commit - - fetch: make --prune configurable + (merged to 'next' on 2013-07-21 at 7ffb690) + + fetch: make --prune configurable Allow fetch.prune and remote.*.prune configuration variables to be set, and "git fetch" to behave as if "--prune" is given. - Will merge to 'next'. + Will merge to 'master'. -* jk/gcc-function-attributes (2013-07-09) 3 commits +* jk/gcc-function-attributes (2013-07-19) 4 commits + (merged to 'next' on 2013-07-19 at 5f6ad91) + + Add the LAST_ARG_MUST_BE_NULL macro (merged to 'next' on 2013-07-12 at 5a7081f) + wt-status: use "format" function attribute for status_printf + use "sentinel" function attribute for variadic lists @@ -640,13 +543,16 @@ of the repositories listed at Will merge to 'master'. -* km/http-curl-config-per-url (2013-07-12) 2 commits - - config: add support for http..* settings - - http.c: fix parsing of http.sslCertPasswordProtected variable +* km/http-curl-config-per-url (2013-07-21) 5 commits + . config: allow http..* any user matching + . tests: add new test for the url_normalize function + . config: improve support for http..* settings + . config: add support for http..* settings + . http.c: fix parsing of http.sslCertPasswordProtected variable Allows custom curl configuration per URL when talking over http. - - There is a reroll that needs to be picked up after discussion. + Tentatively ejected as I did not seem to have received some binary + files correctly. * hv/config-from-blob (2013-07-12) 5 commits @@ -680,7 +586,9 @@ of the repositories listed at Will merge to 'master'. -* km/svn-1.8-serf-only (2013-07-07) 2 commits +* km/svn-1.8-serf-only (2013-07-18) 3 commits + (merged to 'next' on 2013-07-19 at ab8d034) + + Git.pm: revert _temp_cache use of temp_is_locked (merged to 'next' on 2013-07-12 at 70e0b95) + git-svn: allow git-svn fetching to work using serf + Git.pm: add new temp_is_locked function @@ -688,7 +596,7 @@ of the repositories listed at Subversion 1.8.0 that was recently released breaks older subversion clients coming over http/https in various ways. - Are people on older Subversion happy with this change? + Will cook for a while. * tr/merge-recursive-index-only (2013-07-07) 3 commits @@ -696,6 +604,13 @@ of the repositories listed at - merge-recursive: untangle double meaning of o->call_depth - merge-recursive: remove dead conditional in update_stages() + What's the status of this one? + + I am not particularly fond of the second patch that conceptually + allows updating working tree during a virtual merge (i.e. addition + of o->no_worktree is fine, but there needs a way to make sure it is + never set to false when o->depth is not zero). + * jc/push-cas (2013-07-17) 6 commits - t5533: test "push --lockref" @@ -711,11 +626,16 @@ of the repositories listed at The machinery is more or less ready. The "--force" option is again the big red button to override any safety, thanks to J6t's sanity - (the original round allowed --lockref to defeat --force). The - logic to choose the default for --lockref is suitable only for the - simplest workflows, and may hurt users more than help them. + (the original round allowed --lockref to defeat --force). + + I have strong doubts on the merit of the logic to choose the + default for "--lockref" implemented here. It is suitable only for + the simplest workflows, and it may hurt users more than it helps + them. - Waiting for comments. + Also the option may be called something with "--force" prefix, as + it is a weaker and more controlled form of "--force" that is used + to defeat the usual "must fast-forward" safety. * nd/const-struct-cache-entry (2013-07-09) 1 commit @@ -725,10 +645,13 @@ of the repositories listed at Will merge to 'master'. -* es/contacts (2013-07-03) 3 commits +* es/contacts (2013-07-21) 5 commits + - contrib: contacts: add documentation + - contrib: contacts: add mailmap support - contrib: contacts: interpret committish akin to format-patch - contrib: contacts: add ability to parse from committish - contrib: add git-contacts helper + (this branch uses es/check-mailmap.) A helper to read from a set of format-patch output files or a range of commits and find those who may have insights to the code that @@ -739,10 +662,10 @@ of the repositories listed at in-tree. Assuming that "git contact" is something we may want to have as a member of the official set of commands someday, that is. - Perhaps this should be rebased on es/check-mailmap to utilize it. + Will merge to 'next'. -* jc/pull-training-wheel (2013-07-18) 1 commit +* jc/pull-training-wheel (2013-07-19) 1 commit - pull: require choice between rebase/merge on non-fast-forward pull Make "git pull" (without arguments that say what branch to @@ -756,23 +679,19 @@ of the repositories listed at for full discussion. - Waiting for reviews. - - -* jk/fast-import-empty-ls (2013-06-23) 4 commits - - fast-import: allow moving the root tree - - fast-import: allow ls or filecopy of the root tree - - fast-import: set valid mode on root tree in "ls" - - t9300: document fast-import empty path issues - - Waiting for reviews. - $gmane/228741 + Will merge to 'next'. * rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit - cygwin: Remove the Win32 l/stat() implementation - Waiting for the discussion to settle. + Cygwin port added a "not quite correct but a lot faster and good + enough for many lstat() calls that are only used to see if the + working tree entity matches the index entry" lstat() emulation some + time ago, and it started biting us in places. This removes it and + uses the standard lstat() that comes with Cygwin. + + I am personally in favor of this simpler solution. Comments? * jc/reflog-doc (2013-06-19) 1 commit @@ -790,6 +709,8 @@ of the repositories listed at This requires the platform lstat() to be correct to avoid false negatives. + Will merge to 'next'. + * jx/clean-interactive (2013-06-26) 16 commits (merged to 'next' on 2013-07-12 at 61dd42d) @@ -844,3 +765,10 @@ of the repositories listed at aka "--no-ignore-removal". Will cook in 'next' until Git 2.0. + + +* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit + - diff: remove "diff-files -q" in a version of Git in a distant future + (this branch uses jc/diff-filter-negation.) + + This obviously has to wait until a distant future. -- 2.47.3