Re: What's cooking in git.git (Jun 2018, #05; Mon, 18)
Jonathan Tan writes: >> Here are the topics that have been cooking. Commits prefixed with >> '-' are only in 'pu' (proposed updates) while commits prefixed with >> '+' are in 'next'. The ones marked with '.' do not appear in any of >> the integration branches, but I am still holding onto them. > > Would it be possible to have my patches that make bitmap_git not global > [1] in this list? Peff seems OK with it. Let me know if you'd like to > see anything else. That one did fall through the cracks. I'm (unfotunately) offline this morning but hopefully can tag the 2.18 final by the end of the day, and then I'll go into the usual "pick up the patches and discussions missed during the pre-release freeze" mode for a few days, during which time a reminder like this is greatly appreciated. Thanks. > The original patch should contain an extra paragraph that I've provided > here [2] in the commit message - let me know if you want a reroll with > that extra paragraph included. > > [1] > https://public-inbox.org/git/cover.1528397984.git.jonathanta...@google.com/ > > [2] > https://public-inbox.org/git/2018065046.d03f8093347dc6c0e9b11...@google.com/
Re: What's cooking in git.git (Jun 2018, #05; Mon, 18)
> Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still holding onto them. Would it be possible to have my patches that make bitmap_git not global [1] in this list? Peff seems OK with it. Let me know if you'd like to see anything else. The original patch should contain an extra paragraph that I've provided here [2] in the commit message - let me know if you want a reroll with that extra paragraph included. [1] https://public-inbox.org/git/cover.1528397984.git.jonathanta...@google.com/ [2] https://public-inbox.org/git/2018065046.d03f8093347dc6c0e9b11...@google.com/
Re: What's cooking in git.git (Jun 2018, #05; Mon, 18)
Hi Jacob, > * sb/diff-color-move-more (2018-05-21) 8 commits > (merged to 'next' on 2018-05-24 at 45f3fb7975) > + diff: color-moved white space handling options imply color-moved > + diff.c: add --color-moved-ignore-space-delta option > + diff.c: decouple white space treatment from move detection algorithm > + diff.c: add a blocks mode for moved code detection > + diff.c: adjust hash function signature to match hashmap expectation > + diff.c: do not pass diff options as keydata to hashmap > + xdiff/xdiffi.c: remove unneeded function declarations > + xdiff/xdiff.h: remove unused flags > > "git diff --color-moved" feature has further been tweaked. > > Will kick back to 'pu'. > cf. FYI: I have this series still cooking internally, but it is not ready again for prime time, as I still need to debug a corner case. The code found at [1] is improved over this series here as the options for detecting moved code and its coloring are decoupled; having more tests. I just had not enough time to resend this one. [1] https://github.com/stefanbeller/git/tree/color-moved-only Thanks, Stefan
Re: What's cooking in git.git (Jun 2018, #05; Mon, 18)
Hi Junio, Junio C Hamano wrote: > * tz/cred-netrc-cleanup (2018-06-18) 3 commits > - git-credential-netrc: fix exit status when tests fail > - git-credential-netrc: use in-tree Git.pm for tests > - git-credential-netrc: minor whitespace cleanup in test script > > Build and test procedure for netrc credential helper (in contrib/) > has been updated. It looks like 1/4 from that series didn't make it into the tz/cred-netrc-cleanup branch: git-credential-netrc: make "all" default target of Makefile, which is in <20180613031040.3109-2-...@pobox.com>. Thanks, -- Todd ~~ I used to think the brain was the most advanced part of the body. Then I realized, look what's telling me that. -- Emo Phillips
