From 5aa33cc72a86a286fc4c20006ca8f5276a2cbfe4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 3 Feb 2015 18:51:53 -0800 Subject: [PATCH] What's cooking (2015/02 #01) --- whats-cooking.txt | 276 +++++++++++++++++++++++++++++++--------------- 1 file changed, 189 insertions(+), 87 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 7a3c2e0395..751ff450f8 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,20 +1,17 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jan 2015, #05; Tue, 27) -X-master-at: 15598cf41beed0d86cd2ac443e0f69c5a3b40321 -X-next-at: 4b64765b7657288d677cec107fb5295afb4e3a29 +Subject: What's cooking in git.git (Feb 2015, #01; Tue, 3) +X-master-at: 0d1c285af265459006c012aa4415175c2db961ad +X-next-at: 303d43c5ff509a8324ff30a824663dd552b0d231 -What's cooking in git.git (Jan 2015, #05; Tue, 27) +What's cooking in git.git (Feb 2015, #01; Tue, 3) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -Hopefully final release candidate 2.3-rc2 has been tagged. Please -spend some time to find and fix regressions, instead of spending all -time having fun with new and shiny toys. The final hopefully will -happen sometime next week. +We will see 2.3 final later this week, hopefully. You can find the changes described here in the integration branches of the repositories listed at @@ -22,104 +19,127 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* ak/cat-file-clean-up (2015-01-13) 1 commit - (merged to 'next' on 2015-01-15 at bb1a4b3) - + cat-file: use "type" and "size" from outer scope +* jc/diff-format-doc (2015-01-28) 1 commit + - diff-format doc: a score can follow M for rewrite + The documentation incorrectly said that C(opy) and R(ename) are the + only ones that can be followed by the score number in the output in + the --raw format. -* js/t1050 (2015-01-14) 1 commit - (merged to 'next' on 2015-01-15 at f010b00) - + t1050-large: generate large files without dd + Will merge to 'next'. --------------------------------------------------- -[New Topics] -* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit - - apply: detect and mark whitespace errors in context lines when fixing - (this branch uses jc/apply-ws-fix-expands.) - - "git apply --whitespace=fix" fixed whitespace errors in the common - context lines but did so without reporting. +* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit + - do not check truth value of flex arrays Will merge to 'next'. -* ks/rebase-i-abbrev (2015-01-22) 1 commit - - rebase -i: use full object name internally throughout the script +* jk/status-read-branch-name-fix (2015-01-28) 1 commit + - read_and_strip_branch: fix typo'd address-of operator - The insn sheet "git rebase -i" creates did not fully honor - core.abbrev settings. + Code to read branch name from various files in .git/ directory + would have misbehaved if the code to write them left an empty file. Will merge to 'next'. -* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit - - transport-helper: do not request symbolic refs to remote helpers +* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits + - t/lib-gpg: sanity-check that we can actually sign + - t/lib-gpg: include separate public keys in keyring.gpg - "git fetch" over a remote-helper that cannot respond to "list" - command could not fetch from a symbolic reference e.g. HEAD. + Older GnuPG implementation may not correctly import the keyring + material we prepare for the tests to use. Will merge to 'next'. -* ak/add-i-empty-candidates (2015-01-22) 1 commit - - add -i: return from list_and_choose if there is no candidate +* jc/apply-beyond-symlink (2015-02-03) 4 commits + - 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 - The interactive "show a list and let the user choose from it" - interface "add -i" used showed and prompted to the user even when - the candidate list was empty, against which the only "choice" the - user could have made was to choose nothing. + "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). - Will merge to 'next'. + May need to re-review the tests. -* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit - - wincred: fix get credential if username has "@" +* jc/diff-b-m (2015-02-01) 1 commit + - diff: do not use creation-half of -B as a rename target candidate - Will merge to 'next'. + "git diff -B -M" produced incorrect patch when the postimage of a + completely rewritten file is similar to the preimage of a removed + file; such a resulting file must not be expressed as a rename from + other place. + The fix in this patch is broken, unfortunately. -* jc/conf-var-doc (2015-01-27) 3 commits - - CodingGuidelines: describe naming rules for configuration variables - - config.txt: mark deprecated variables more prominently - - config.txt: clarify that add.ignore-errors as deprecated - Need to send this out for review before doing anything to it. +* jc/remote-set-url-doc (2015-01-29) 1 commit + - Documentation/git-remote.txt: stress that set-url is not for triangular + Clarify in the documentation that "remote..pushURL" and + "remote..URL" are there to name the same repository accessed + via different transports, not two separate repositories. + + Will merge to 'next'. -* jc/doc-log-rev-list-options (2015-01-23) 1 commit - - Documentation: what does "git log --indexed-objects" even mean? + +* jc/t4122-use-test-write-lines (2015-01-28) 1 commit + - t4122: use test_write_lines from test-lib-functions Will merge to 'next'. -* jk/dumb-http-idx-fetch-fix (2015-01-27) 1 commit - - dumb-http: do not pass NULL path to parse_pack_index +* jk/pack-bitmap (2015-02-03) 1 commit + - [NEEDS SOB] ewah: fix building with gcc < 3.4.0 + + Need to get the S-o-by and Acked-by straightend out. + + +* jk/prune-mtime (2015-02-02) 1 commit + - sha1_file: fix iterating loose alternate objects + + In v2.2.0, we broke "git prune" that runs in a repository that + borrows from an alternate object store. Will merge to 'next'. -* ld/p4-submit-hint (2015-01-23) 1 commit - (merged to 'next' on 2015-01-23 at ed972d3) - + git-p4: correct --prepare-p4-only instructions +* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit + - git-submodule.sh: fix '/././' path normalization - Will merge to 'master' after 2.3 final. + Will merge to 'next'. -* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit - - commit: reword --author error message +* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit + - Makefile: handle broken curl version number in version check + + Cope with irregular output of "curl-config --vernum" given by + certain older vintages of cURL. Will merge to 'next'. -* mg/push-repo-option-doc (2015-01-27) 1 commit - - git-push.txt: document the behavior of --repo +* tc/missing-http-proxyauth (2015-02-03) 1 commit + - http: support curl < 7.10.7 Will merge to 'next'. +* tc/t9001-noxmailer (2015-01-30) 1 commit + - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' + + Kyle's update to explicitly support --no-option with older + Getopt::Long ($gmane/263203) might be a better alternative + if we have to support them in the longer term. + -------------------------------------------------- [Stalled] @@ -256,14 +276,95 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* ye/http-accept-language (2015-01-27) 2 commits - - SQUASH??? - - http: Add Accept-Language header if possible +* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit + - apply: detect and mark whitespace errors in context lines when fixing + (this branch uses jc/apply-ws-fix-expands.) + + "git apply --whitespace=fix" fixed whitespace errors in the common + context lines but did so without reporting. + + Will merge to 'next'. + + +* ks/rebase-i-abbrev (2015-01-22) 1 commit + - rebase -i: use full object name internally throughout the script + + The insn sheet "git rebase -i" creates did not fully honor + core.abbrev settings. + + Will merge to 'next'. + + +* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit + - transport-helper: do not request symbolic refs to remote helpers + + "git fetch" over a remote-helper that cannot respond to "list" + command could not fetch from a symbolic reference e.g. HEAD. + + Will merge to 'next'. + + +* ak/add-i-empty-candidates (2015-01-22) 1 commit + - add -i: return from list_and_choose if there is no candidate + + The interactive "show a list and let the user choose from it" + interface "add -i" used showed and prompted to the user even when + the candidate list was empty, against which the only "choice" the + user could have made was to choose nothing. + + Will merge to 'next'. + + +* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit + - wincred: fix get credential if username has "@" + + Will merge to 'next'. + + +* jc/conf-var-doc (2015-02-02) 3 commits + - CodingGuidelines: describe naming rules for configuration variables + - config.txt: mark deprecated variables more prominently + - config.txt: clarify that add.ignore-errors is deprecated + + +* jc/doc-log-rev-list-options (2015-01-23) 1 commit + - Documentation: what does "git log --indexed-objects" even mean? + + Will merge to 'next'. + + +* jk/dumb-http-idx-fetch-fix (2015-01-27) 1 commit + - dumb-http: do not pass NULL path to parse_pack_index + + Will merge to 'next'. + + +* ld/p4-submit-hint (2015-01-23) 1 commit + (merged to 'next' on 2015-01-23 at ed972d3) + + git-p4: correct --prepare-p4-only instructions + + Will merge to 'master' after 2.3 final. + + +* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit + - commit: reword --author error message + + Will merge to 'next'. + + +* mg/push-repo-option-doc (2015-01-28) 1 commit + - git-push.txt: document the behavior of --repo + + Will merge to 'next'. + + +* ye/http-accept-language (2015-01-28) 1 commit + - http: add Accept-Language header if possible Using environment variable LANGUAGE and friends on the client side, send Accept-Language when making HTTP requests. - Almost there, I would think. + Will merge to 'next'. * ak/typofixes (2015-01-21) 2 commits @@ -350,11 +451,12 @@ of the repositories listed at Need extra set of eyes to review this. -* ld/p4-exclude-in-sync (2015-01-20) 1 commit +* ld/p4-exclude-in-sync (2015-01-28) 2 commits + - git-p4: correct "exclude" change (merged to 'next' on 2015-01-22 at f6f1fc7) + git-p4: support excluding paths on sync - Will merge to 'master' after 2.3 final. + Will squash into one after 2.3 final. * tb/connect-ipv6-parse-fix (2015-01-22) 3 commits @@ -545,33 +647,33 @@ of the repositories listed at * nd/list-files (2015-01-27) 22 commits - - t3080: tests for git-list-files - - list-files: -M aka diff-cached - - list-files -F: show submodules with the new indicator '&' - - list-files: add -F/--classify - - SQUASH??? - - list-files: show directories as well as files - - list-files: do not show duplicate cached entries - - list-files: sort output and remove duplicates - - list-files: add -t back - - list-files: add -1 short for --no-column - - list-files: add -R/--recursive short for --max-depth=-1 - - list-files: -u does not imply showing stages - - list-files: make alias 'ls' default to 'list-files' - - list-files: a user friendly version of ls-files and more - - ls-files: support --max-depth - - ls-files: add --column - - ls-files: add --color to highlight file names - - ls-files: buffer full item in strbuf before printing - - ls_colors.c: highlight submodules like directories - - ls_colors.c: add a function to color a file name - - ls_colors.c: parse color.ls.* from config file - - ls_colors.c: add $LS_COLORS parsing code + . t3080: tests for git-list-files + . list-files: -M aka diff-cached + . list-files -F: show submodules with the new indicator '&' + . list-files: add -F/--classify + . SQUASH??? + . list-files: show directories as well as files + . list-files: do not show duplicate cached entries + . list-files: sort output and remove duplicates + . list-files: add -t back + . list-files: add -1 short for --no-column + . list-files: add -R/--recursive short for --max-depth=-1 + . list-files: -u does not imply showing stages + . list-files: make alias 'ls' default to 'list-files' + . list-files: a user friendly version of ls-files and more + . ls-files: support --max-depth + . ls-files: add --column + . ls-files: add --color to highlight file names + . ls-files: buffer full item in strbuf before printing + . ls_colors.c: highlight submodules like directories + . ls_colors.c: add a function to color a file name + . ls_colors.c: parse color.ls.* from config file + . ls_colors.c: add $LS_COLORS parsing code A new "git list-files" Porcelain command, "ls-files" with bells and whistles. - Some comments seen on the list; may be gaining some interests? + Seems unable to pass its self test (yet). * nd/multiple-work-trees (2015-01-27) 38 commits -- 2.47.3