Re: [PATCH] list: avoid incompatibility with *BSD sys/queue.h

On Sat, Jul 16, 2016 at 8:25 PM, Eric Wong wrote: > Eric Wong wrote: >> I also wonder where we use sys/queue.h, since I use >> LIST_HEAD from ccan/list/list.h in a different project >> without conflicts... > > Still wondering... Checking sys/mman.h in an old

proposal: allow git clone for http-hosted bundles

Hi list, Right now it's possible to git clone a repository over http, and git clone a bundle from the local filesystem, but it's not possible to git clone a bundle hosted on http. Would it be possible to allow this in the future? Hopefully it's only a minor refactor in `builtin/clone.c`.

format-patch with pager.format-patch=true gets very confused

git-config(1) documents the ability to enable or disable the pager (or set a command-specific pager) for any command by setting pager.=true. For most commands, this seems to work as expected. However, setting pager.format-patch=true (or setting it to any specific pager) breaks badly: the pager

[PATCH] list: avoid incompatibility with *BSD sys/queue.h

Eric Wong wrote: > Lars Schneider wrote: > > It looks like as if this topic breaks the OS X build because > > it defines LIST_HEAD. LIST_HEAD is already defined in > > /usr/include/sys/queue.h. > > Oops, I suppose GIT_LIST_HEAD is an acceptable name?

Re: What's cooking in git.git (Jul 2016, #05; Wed, 13)

> On 16 Jul 2016, at 23:04, Eric Wong wrote: > > Lars Schneider wrote: >>> On 13 Jul 2016, at 18:56, Junio C Hamano wrote: >>> * ew/http-walker (2016-07-12) 3 commits >>> - http-walker: reduce O(n) ops with doubly-linked list >>> -

Re: Git and SHA-1 security (again)

On Sat, Jul 16, 2016 at 11:46:06PM +0200, Herczeg Zsolt wrote: > Dear Brian, > > Thank you for your response. It very good to hear that changing the > hash is on the git project's list. I haven't found any official > communication on that topic since 2006. There's been some recent discussion on

Re: Git and SHA-1 security (again)

Dear Brian, Thank you for your response. It very good to hear that changing the hash is on the git project's list. I haven't found any official communication on that topic since 2006. I'll look into the contributions guide and the source codes, to check if I can contribute to this transition. If

Re: Question: Getting 'git diff' to generate /usr/bin/diff output

n...@dad.org wrote: > I am trying to learn how to use git, and am having difficulty > using 'git diff'. > > I can't deal with its output very well. What I would really like > to do is apply /usr/lib/diff. ^^^ For starters, when using the full pathname, you'll need to spell

Re: What's cooking in git.git (Jul 2016, #05; Wed, 13)

Lars Schneider wrote: > > On 13 Jul 2016, at 18:56, Junio C Hamano wrote: > > * ew/http-walker (2016-07-12) 3 commits > > - http-walker: reduce O(n) ops with doubly-linked list > > - http: avoid disconnecting on 404s for loose objects > > -

Re: What's cooking in git.git (Jul 2016, #05; Wed, 13)

> On 13 Jul 2016, at 18:56, Junio C Hamano wrote: > ... > > * ew/http-walker (2016-07-12) 3 commits > - http-walker: reduce O(n) ops with doubly-linked list > - http: avoid disconnecting on 404s for loose objects > - http-walker: remove unused parameter from fetch_object >

Dear Funds Beneficiary,

Dear Funds Beneficiary, I'm happy to inform you that your email address has been selected among those that have compensation payment of ($2.5 Million USD), The INTERNATIONAL MONETARY FUND contacted us for the release of your money a couple of hours ago due to your allocated security code.

Re: Git and SHA-1 security (again)

On Sat, Jul 16, 2016 at 03:48:49PM +0200, Herczeg Zsolt wrote: > But - and that's the main idea i'm writing here - changing the storage > keys does not mean you should drop your old hashes out. If you change > the git data structure in a way, that it can keep multiple hashes for > the same "link"

Question: Getting 'git diff' to generate /usr/bin/diff output

I am trying to learn how to use git, and am having difficulty using 'git diff'. I can't deal with its output very well. What I would really like to do is apply /usr/lib/diff. Would some kind soul be willing to tell me if there is a way to do that, short of making a backup copy of the relevant

Re: [PATCH v4] config: add conditional include

On Sat, Jul 16, 2016 at 06:36:03PM +0200, Johannes Schindelin wrote: > > On Sat, Jul 16, 2016 at 03:30:45PM +0200, Johannes Schindelin wrote: > > > > > As an alternative solution to your problem, you could of course avoid all > > > conditional includes. Simply by adding the include.path settings

Re: [PATCH v4] config: add conditional include

Hi Peff, On Sat, 16 Jul 2016, Jeff King wrote: > On Sat, Jul 16, 2016 at 03:30:45PM +0200, Johannes Schindelin wrote: > > > As an alternative solution to your problem, you could of course avoid all > > conditional includes. Simply by adding the include.path settings > > explicitly to the

Re: [PATCH v4] config: add conditional include

On Sat, Jul 16, 2016 at 03:30:45PM +0200, Johannes Schindelin wrote: > > >> + ; include if $GIT_DIR is /path/to/foo/.git > > >> + [include "gitdir:/path/to/foo/.git"] > > >> + path = /path/to/foo.inc > > > > > > I find this way to specify a conditional unintuitive. Reading > >

Re: [PATCH v4] config: add conditional include

On Sat, Jul 16, 2016 at 3:30 PM, Johannes Schindelin wrote: > As an alternative solution to your problem, you could of course avoid all > conditional includes. Simply by adding the include.path settings > explicitly to the configs that require them. Now, that would

Git and SHA-1 security (again)

Dear List Members, Git Developers, I would like to discuss an old topic from 2006. I understand it was already discussed. The only reason i'm sending this e-mail is to talk about a possible solution which didn't show up on this list before. I think we all understand that SHA-1 is broken. It

Re: [PATCH v4] config: add conditional include

Hi Duy, On Thu, 14 Jul 2016, Duy Nguyen wrote: > On Thu, Jul 14, 2016 at 5:53 PM, Johannes Schindelin > wrote: > > Hi Duy, > > > > On Thu, 14 Jul 2016, Nguyễn Thái Ngọc Duy wrote: > > > >> Helped-by: Jeff King > >> Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH v3 2/2] t/t8003-blame-corner-cases.sh: Use here documents

Hi Mike, On Sat, 16 Jul 2016, Mike Hommey wrote: > Somehow, this test was using: > > { > echo A > echo B > } > file > > block to feed file contents. This changes those to the form most common > in git test scripts: > > cat >file <<-\EOF > A > B > EOF > > Signed-off-by: Mike

[ANNOUNCE] Git for Windows 2.9.2

Dear Git users, It is my pleasure to announce that Git for Windows 2.9.2 is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.9.0 (June 14th 2016) New Features ??? Comes with Git 2.9.2 (skipping the Windows release of Git 2.9.1 due to a

Re: [PATCH 2/1] Verify that --cherry-pick avoids looking at full diffs

Hi Junio, On Fri, 15 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The entire point of the previous patch was to make sure that we look at > > abbreviated patch IDs (using the diff *headers* only, but avoiding > > to load the blobs into memory

Re: [PATCH] git-clean: remove fifo, devices, socket files

On Fri, Jul 15, 2016 at 10:33:42PM +0200, Johannes Sixt wrote: > Am 15.07.2016 um 09:46 schrieb Andrey Vagin: > > On Thu, Jul 14, 2016 at 10:56 PM, Johannes Sixt wrote: > > > IOW: These special files are invisible for Git unless it already knows the > > > names. The latter case is

Re: Plugin mechanism(s) for Git?

On Sat, Jul 16, 2016 at 07:31:25AM +0200, Duy Nguyen wrote: > >> > I wouldn’t be too quick to dismiss dynamically loaded libraries as > >> > there are some distinct advantages over the other patterns especially > >> > performance and simplicity. I realize it requires us to version the > >> > ABI

Re: [PATCH 12/12] receive-pack: send keepalives during quiet periods

On Fri, Jul 15, 2016 at 10:24:16AM -0700, Stefan Beller wrote: > > @@ -319,10 +331,60 @@ static void rp_error(const char *err, ...) > > static int copy_to_sideband(int in, int out, void *arg) > > { > > char data[128]; > > While looking at this code, do you think it is feasible to

Re: [PATCH v2 2/2] archive-tar: huge offset and future timestamps would not work on 32-bit

On Fri, Jul 15, 2016 at 12:36 AM, Junio C Hamano wrote: > Jeff King writes: > >> On Thu, Jul 14, 2016 at 01:43:57PM -0700, Junio C Hamano wrote: >> >>> As we are not yet moving everything to size_t but still using ulong >>> internally when talking about the size

Re: Bug in index-helper/watchman?

On Sat, Jul 16, 2016 at 08:10:15AM +0200, Duy Nguyen wrote: > But you did spot a problem. What if UC extension is loaded _after_ > watchman one? Then index->untracked_cache would have nothing in there > and invalidation is no-op when we do it (at watchmain ext loading > time). We can't control

Re: Bug in index-helper/watchman?

On Thu, Jul 14, 2016 at 5:21 PM, Duy Nguyen wrote: >> On Thu, Jul 14, 2016 at 12:11 AM, Ben Peart wrote: >>> I’ve been chasing down an issue where it looks like the untracked cache >>> logic doesn’t work correctly in the index-helper/watchman patch series.