From 05b63a7f5fe5002a8d8228f72adc245f81960f7f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 Mar 2015 15:45:35 -0800 Subject: [PATCH] What's cooking (2015/03 #03) --- whats-cooking.txt | 347 ++++++++++++++++++++++-------------------------------- 1 file changed, 138 insertions(+), 209 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 1f73e12a59..548ce4bd10 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 (Mar 2015, #02; Thu, 5) -X-master-at: 83036f8541ad8999974863db9d2ac02a814e6395 -X-next-at: e3086922e7b3f8f159b5b6631ba0052d0b37bcfc +Subject: What's cooking in git.git (Mar 2015, #03; Fri, 6) +X-master-at: d67f9d5e8fd2c165304153a87fd96054d2b74981 +X-next-at: 9704172a1848f24ce72de64c49b043350d93b393 -What's cooking in git.git (Mar 2015, #02; Thu, 5) +What's cooking in git.git (Mar 2015, #03; Fri, 6) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,9 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with '+' are in 'next'. A few more batches of topics have been merged to 'master', including -both fixes and enhancements. First maintenance release for v2.3 was -cut with many fixes that have already been merged to 'master', and -the v2.3.2 will also appear shortly. +both fixes and enhancements. The second maintenance release for +v2.3 has been cut with many fixes that have already been merged to +'master'. You can find the changes described here in the integration branches of the repositories listed at @@ -24,212 +24,162 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* ew/svn-fixes (2015-02-26) 2 commits - (merged to 'next' on 2015-03-03 at 18e4684) - + Merge branch 'svn-maint-fixes' into svn-fixes - + git-svn: lazy load some modules - (this branch uses ew/svn-maint-fixes.) +* ak/t5516-typofix (2015-03-03) 1 commit + (merged to 'next' on 2015-03-03 at c37a677) + + t5516: correct misspelled pushInsteadOf -* ew/svn-maint-fixes (2015-02-26) 2 commits - (merged to 'next' on 2015-03-03 at 776b563) - + Git::SVN::*: avoid premature FileHandle closure - + git-svn: fix localtime=true on non-glibc environments - (this branch is used by ew/svn-fixes.) +* bw/kwset-use-unsigned (2015-03-02) 1 commit + (merged to 'next' on 2015-03-05 at fd124ba) + + kwset: use unsigned char to store values with high-bit set - Correct a breakage to git-svn around v2.2 era that triggers - premature closing of FileHandle. + The borrowed code in kwset API did not follow our usual convention + to use "unsigned char" to store values that range from 0-255. -* jc/apply-beyond-symlink (2015-02-10) 4 commits - (merged to 'next' on 2015-02-18 at 4109de1) - + apply: do not touch a file beyond a symbolic link - + apply: do not read from beyond a symbolic link - + apply: do not read from the filesystem under --index - + apply: reject input that touches outside the working area +* ja/clean-confirm-i18n (2015-03-02) 1 commit + (merged to 'next' on 2015-03-03 at 314c322) + + Add hint interactive cleaning - "git apply" was not very careful about reading from, removing, - updating and creating paths outside the working tree (under - --index/--cached) or the current directory (when used as a - replacement for GNU patch). + The prompt string "remove?" used when "git clean -i" asks the user + if a path should be removed was localizable, but the code always + expects a substring of "yes" to tell it to go ahead. Always show + [y/N] as part of this prompt to hint that the answer is not (yet) + localized. -* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit - (merged to 'next' on 2015-02-18 at b571668) - + apply: detect and mark whitespace errors in context lines when fixing +* mg/doc-remote-tags-or-not (2015-03-02) 1 commit + (merged to 'next' on 2015-03-03 at 1630171) + + git-remote.txt: describe behavior without --tags and --no-tags - "git apply --whitespace=fix" fixed whitespace errors in the common - context lines but did so without reporting. + "git remote add" mentioned "--tags" and "--no-tags" and was not + clear that fetch from the remote in the future will use the default + behaviour when neither is given to override it. -* jc/diff-test-updates (2015-02-23) 7 commits - (merged to 'next' on 2015-02-23 at 9e863a7) - + test_ln_s_add: refresh stat info of fake symbolic links - (merged to 'next' on 2015-02-18 at f152c9f) - + t4008: modernise style - + t/diff-lib: check exact object names in compare_diff_raw - + tests: do not borrow from COPYING and README from the real source - + t4010: correct expected object names - + t9300: correct expected object names - + t4008: correct stale comments - (this branch is used by jc/diff-b-m.) +* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit + (merged to 'next' on 2015-03-03 at 42c282e) + + diff --shortstat --dirstat: remove duplicate output - Test clean-up. + "git diff --shortstat --dirstat=changes" showed a dirstat based on + lines that was never asked by the end user in addition to the + dirstat that the user asked for. -* jk/daemon-interpolate (2015-02-17) 3 commits - (merged to 'next' on 2015-02-20 at 21118a7) - + daemon: sanitize incoming virtual hostname - + t5570: test git-daemon's --interpolated-path option - + git_connect: let user override virtual-host we send to daemon +* mr/doc-clean-f-f (2015-02-26) 1 commit + (merged to 'next' on 2015-03-03 at 67a77a2) + + Documentation/git-clean.txt: document that -f may need to be given twice - The "interpolated-path" option of "git daemon" inserted any string - client declared on the "host=" capability request without checking. - Sanitize and limit %H and %CH to a saner and a valid DNS name. + Documentation update. -* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit - (merged to 'next' on 2015-02-18 at 84c1597) - + git-send-email.perl: support no- prefix with older GetOptions +* ms/submodule-update-config-doc (2015-03-02) 1 commit + (merged to 'next' on 2015-03-03 at b94da4b) + + submodule: improve documentation of update subcommand - Even though we officially haven't dropped Perl 5.8 support, the - Getopt::Long package that came with it does not support "--no-" - prefix to negate a boolean option; manually add support to help - people with older Getopt::Long package. + The interaction between "git submodule update" and the + submodule.*.update configuration was not clearly documented. -* mh/refs-have-new (2015-02-17) 13 commits - (merged to 'next' on 2015-02-23 at b8929db) - + refs.h: remove duplication in function docstrings - + update_ref(): improve documentation - + ref_transaction_verify(): new function to check a reference's value - + ref_transaction_delete(): check that old_sha1 is not null_sha1 - + ref_transaction_create(): check that new_sha1 is valid - + commit: avoid race when creating orphan commits - + commit: add tests of commit races - + ref_transaction_delete(): remove "have_old" parameter - + ref_transaction_update(): remove "have_old" parameter - + struct ref_update: move "have_old" into "flags" - + refs.c: change some "flags" to "unsigned int" - + refs: remove the gap in the REF_* constant values - + refs: move REF_DELETING to refs.c +* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit + (merged to 'next' on 2015-03-03 at 61c9587) + + grep: correct help string for --exclude-standard - Simplify the ref transaction API around how "the ref should be - pointing at this object" is specified. + Description given by "grep -h" for its --exclude-standard option + was phrased poorly. -* mm/am-c-doc (2015-02-20) 2 commits - (merged to 'next' on 2015-02-23 at 1cd9b0f) - + Documentation/git-am.txt: mention mailinfo.scissors config variable - + Documentation/config.txt: document mailinfo.scissors +* ye/http-accept-language (2015-02-26) 1 commit + (merged to 'next' on 2015-03-03 at 58d195e) + + gettext.c: move get_preferred_languages() from http.c - The configuration variable 'mailinfo.scissors' was hard to - discover in the documentation. + Compilation fix for a recent topic in 'master'. +-------------------------------------------------- +[New Topics] -* rj/no-xopen-source-for-cygwin (2015-02-22) 1 commit - (merged to 'next' on 2015-02-23 at 323ac75) - + git-compat-util.h: remove redundant code +* ak/git-done-help-cleanup (2015-03-06) 1 commit + - git: make was_alias and done_help non-static - Code cleanups. + Code simplification. + Will merge to 'next'. -* rs/daemon-interpolate (2015-02-17) 2 commits - (merged to 'next' on 2015-02-18 at c0f5750) - + daemon: use callback to build interpolated path - + daemon: look up client-supplied hostname lazily - "git daemon" looked up the hostname even when "%CH" and "%IP" - interpolations are not requested, which was unnecessary. +* es/rebase-i-count-todo (2015-03-06) 2 commits + - rebase-interactive: re-word "item count" comment + - rebase-interactive: suppress whitespace preceding item count + "git rebase -i" recently started to include the number of + commits in the insn sheet to be processed, but on a platform + that prepends leading whitespaces to "wc -l" output, the numbers + are shown with extra whitespaces that aren't necessary. -* rs/simple-cleanups (2015-02-22) 4 commits - (merged to 'next' on 2015-02-23 at a89f034) - + sha1_name: use strlcpy() to copy strings - + pretty: use starts_with() to check for a prefix - + for-each-ref: use skip_prefix() to avoid duplicate string comparison - + connect: use strcmp() for string comparison + Will merge to 'next'. - Code cleanups. +* mg/fdopen-with-retry (2015-03-06) 6 commits + - buffer_fdinit(): use fdopen_with_retry() + - update_info_file(): use fdopen_with_retry() + - copy_to_log(): use fdopen_with_retry() + - fdopen_lock_file(): use fdopen_with_retry() + - SQUASH??? $gmane/264889 + - xfdopen(): if first attempt fails, free memory and try again -* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits - (merged to 'next' on 2015-02-24 at 6658564) - + t5500: show user name and host in diag-url - + t5601: add more test cases for IPV6 - + connect.c: allow ssh://user@[2001:db8::1]/repo.git + Various parts of the code where they call fdopen() can fail when + they run out of memory; attempt to proceed by retrying the + operation after freeing some resource. - We did not parse username followed by literal IPv6 address in SSH - transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git - correctly. + Waiting for further comments. --------------------------------------------------- -[New Topics] -* ak/t5516-typofix (2015-03-03) 1 commit - (merged to 'next' on 2015-03-03 at c37a677) - + t5516: correct misspelled pushInsteadOf +* mg/log-decorate-HEAD (2015-03-06) 1 commit + - log: decorate non-detached HEAD differently - Will merge to 'master'. + Output from "git log --decorate" mentions HEAD when it points at a + tip of an branch differently from a detached HEAD. + We probably want to de-dup the branch name in the output. -* bw/kwset-use-unsigned (2015-03-02) 1 commit - (merged to 'next' on 2015-03-05 at fd124ba) - + kwset: use unsigned char to store values with high-bit set + Waiting for further comments. - The borrowed code in kwset API did not follow our usual convention - to use "unsigned char" to store values that range from 0-255. - Will merge to 'master'. +* rs/daemon-hostname-in-strbuf (2015-03-06) 1 commit + - daemon: use strbuf for hostname info + Code in "git daemon" to parse out and hold hostnames used in + request interpolation has been simplified. -* mg/doc-remote-tags-or-not (2015-03-02) 1 commit - (merged to 'next' on 2015-03-03 at 1630171) - + git-remote.txt: describe behavior without --tags and --no-tags + Needs updating with a few s/_reset/_release/ ($gmane/264962) - "git remote add" mentioned "--tags" and "--no-tags" and was not - clear that fetch from the remote in the future will use the default - behaviour when neither is given to override it. - Will merge to 'master'. +* rs/deflate-init-cleanup (2015-03-05) 1 commit + - zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} + Code simplification. -* mg/status-v-v (2015-03-03) 2 commits - - commit/status: show the index-worktree diff with -v -v - - t7508: test git status -v + Will merge to 'next'. - "git status" now allows the "-v" to be given twice to show the - differences that are left in the working tree not to be committed. - $gmane/264750 +* rs/zip-text (2015-03-05) 1 commit + - archive-zip: mark text files in archives --------------------------------------------------- -[Stalled] + "git archive" can now be told to set the 'text' attribute in the + resulting zip archive. -* mg/sequencer-commit-messages-always-verbatim (2015-02-23) 1 commit - - sequencer: preserve commit messages + Will merge to 'next'. - Always replay the original commit message verbatim, regardless of - the commit.cleanup configuration settings by the user. - $gmane/264504 +* sg/completion-remote (2015-03-06) 2 commits + - completion: simplify __git_remotes() + - completion: add a test for __git_remotes() helper function + Code simplification. -* mg/detached-head-report (2015-02-23) 1 commit - - branch: name detached HEAD analogous to status - - "git branch" on a detached HEAD always said "(detached from xyz)", - even when "git status" would report "detached at xyz". The HEAD is - actually at xyz and haven't been moved since it was detached in - such a case, but the user cannot read what the current value of - HEAD is when "detached from" is used. - - The goal is sound. May want to share code between branch and - status in a reroll? Are there other commands that give the same - information that share the code, too? - - ($gmane/264251) + Will merge to 'next'. +-------------------------------------------------- +[Stalled] * jk/push-config (2015-02-17) 4 commits - [NEEDSACK] push: allow --follow-tags to be set by config push.followTags @@ -420,22 +370,38 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* mr/doc-clean-f-f (2015-02-26) 1 commit - (merged to 'next' on 2015-03-03 at 67a77a2) - + Documentation/git-clean.txt: document that -f may need to be given twice +* mg/sequencer-commit-messages-always-verbatim (2015-03-06) 1 commit + - sequencer: preserve commit messages - Documentation update. + "git cherry-pick" used to clean-up the log message even when it is + merely replaying an existing commit. It now replays the message + verbatim unless you are editing the message of resulting commits. - Will merge to 'master'. + Will merge to 'next'. -* ye/http-accept-language (2015-02-26) 1 commit - (merged to 'next' on 2015-03-03 at 58d195e) - + gettext.c: move get_preferred_languages() from http.c +* mg/detached-head-report (2015-03-06) 2 commits + - branch: name detached HEAD analogous to status + - wt-status: refactor detached HEAD analysis - Compilation fix for a recent topic in 'master'. + "git branch" on a detached HEAD always said "(detached from xyz)", + even when "git status" would report "detached at xyz". The HEAD is + actually at xyz and haven't been moved since it was detached in + such a case, but the user cannot read what the current value of + HEAD is when "detached from" is used. - Will merge to 'master'. + Will merge to 'next'. + + +* mg/status-v-v (2015-03-06) 3 commits + - commit/status: show the index-worktree diff with -v -v + - t7508: test git status -v + - t7508: .gitignore 'expect' and 'output' files + + "git status" now allows the "-v" to be given twice to show the + differences that are left in the working tree not to be committed. + + Will merge to 'next'. * jk/diffcore-rename-duplicate (2015-02-27) 2 commits @@ -448,16 +414,6 @@ of the repositories listed at Will merge to 'master'. -* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit - (merged to 'next' on 2015-03-03 at 61c9587) - + grep: correct help string for --exclude-standard - - Description given by "grep -h" for its --exclude-standard option - was phrased poorly. - - Will merge to 'master'. - - * nd/versioncmp-prereleases (2015-02-27) 1 commit (merged to 'next' on 2015-03-03 at 6ab29cf) + versionsort: support reorder prerelease suffixes @@ -468,30 +424,6 @@ of the repositories listed at Will merge to 'master'. -* ja/clean-confirm-i18n (2015-03-02) 1 commit - (merged to 'next' on 2015-03-03 at 314c322) - + Add hint interactive cleaning - - The prompt string "remove?" used when "git clean -i" asks the user - if a path should be removed was localizable, but the code always - expects a substring of "yes" to tell it to go ahead. Always show - [y/N] as part of this prompt to hint that the answer is not (yet) - localized. - - Will merge to 'master'. - - -* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit - (merged to 'next' on 2015-03-03 at 42c282e) - + diff --shortstat --dirstat: remove duplicate output - - "git diff --shortstat --dirstat=changes" showed a dirstat based on - lines that was never asked by the end user in addition to the - dirstat that the user asked for. - - Will merge to 'master'. - - * nd/slim-index-pack-memory-usage (2015-02-27) 2 commits - index-pack: kill union delta_base to save memory - index-pack: reduce object_entry size to save memory @@ -499,6 +431,8 @@ of the repositories listed at Memory usage of "git index-pack" has been trimmed by tens of per-cent. + Waiting for further comments. + * nd/list-files (2015-02-09) 21 commits - t3080: tests for git-list-files @@ -526,6 +460,11 @@ of the repositories listed at A new "git list-files" Porcelain command, "ls-files" with bells and whistles. + Concern was raised that this is piggybacking on ls-files codebase, + rather than wt-status codebase ($gmane/264258). + + Waiting for further comments or a reroll. + * jc/decorate-leaky-separator-color (2015-03-04) 7 commits - log --decorate: do not leak "commit" color into the next item @@ -542,16 +481,6 @@ of the repositories listed at Waiting for reviews. -* ms/submodule-update-config-doc (2015-03-02) 1 commit - (merged to 'next' on 2015-03-03 at b94da4b) - + submodule: improve documentation of update subcommand - - The interaction between "git submodule update" and the - submodule.*.update configuration was not clearly documented. - - Will merge to 'master'. - - * mh/expire-updateref-fixes (2015-03-05) 9 commits (merged to 'next' on 2015-03-05 at 1caf9a6) + reflog_expire(): never update a reference to null_sha1 -- 2.11.4.GIT