Re: git interpret-trailers with multiple keys

2016-04-11 Thread Matthieu Moy
"Michael S. Tsirkin" writes: > On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote: >> What I meant is that we could create new options called maybe >> trailer.autocommands and trailer..autocommands that default to >> 'true' and if 'false' the command would not be run automatically a

Re: git interpret-trailers with multiple keys

2016-04-11 Thread Michael S. Tsirkin
On Mon, Apr 11, 2016 at 09:09:48AM +0200, Matthieu Moy wrote: > "Michael S. Tsirkin" writes: > > > On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote: > >> What I meant is that we could create new options called maybe > >> trailer.autocommands and trailer..autocommands that default

[PATCH] fetch-pack: Add missing line-feed character when sending depth-request packet line

2016-04-11 Thread Stan Hu
The pkt-line format mandates: "a sender should include a LF, but the receive MUST NOT complain if it is not present." This patch is not absolutely necessary since receivers handle the missing the LF, but this patch adds it for good measure. Signed-off-by: Stan Hu --- fetch-pack.c | 2 +- 1 file

Re: [PATCH v2 4/7] i18n: builtin/pull.c: mark strings for translation

2016-04-11 Thread Vasco Almeida
Às 18:01 de 10-04-2016, Junio C Hamano escreveu: > Vasco Almeida writes: > >> Some translations might also translate "" and "". > > This offers an interesting observation that I didn't think of while > reviewing the first round of this series. > > Do translations want to translate "remote" and

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Johannes Schindelin
Hi Michael, On Sun, 10 Apr 2016, Michael S. Tsirkin wrote: > This implements a new ack! action for git rebase -i > It is essentially a middle ground between fixup! and squash!: > - commits are squashed silently without editor being started > - commit logs are concatenated (with action line being

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Michael S. Tsirkin
On Mon, Apr 11, 2016 at 01:02:07PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Sun, 10 Apr 2016, Michael S. Tsirkin wrote: > > > This implements a new ack! action for git rebase -i > > It is essentially a middle ground between fixup! and squash!: > > - commits are squashed silently wit

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Christian Neukirchen
Johannes Schindelin writes: > How about making it easier to use, and much, much more generic, like this? > > 1. introducing an `--add-footer` flag to `git commit` that you could use > like this: > > git commit --amend --add-footer "Acked-by: Bugs Bunny" I have a script where I currently do

Re: [PATCH 0/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-11 Thread Jeff King
On Sun, Apr 10, 2016 at 11:57:31PM +0100, Ramsay Jones wrote: > So, the approach taken by patch #1 is to forget about UNIX_PATH_MAX and > simply use sizeof(address.sun_path) instead! That's what the existing code in unix-socket.c does. Which makes me wonder why the index-helper code is not simply

Re: [PATCH 1/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-11 Thread Ramsay Jones
On 11/04/16 05:20, Torsten Bögershausen wrote: > On 04/11/2016 12:59 AM, Ramsay Jones wrote: > The header mentions cygwin, but changes it for linux, BSD and Mac OS as well. > Is this intentional ? Yes. I only compile on 32/64-bit linux and 64-bit cygwin these days, so I only noticed the warnings

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Johannes Schindelin
Hi Michael, On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: > So far I only see examples of adding footers. If that's all we can think > up, why code in all this genericity? Because as far as I can see, the only benefitor of your patches would be you. Ciao, Johannes -- To unsubscribe from this l

Default authentication over https?

2016-04-11 Thread Isaac Levy
Hi all, I use a git server which requires authentication over https. Git seems determined to always try an unauthenticated request first, slowing down operations by a couple seconds. Is there a way to configure git to default to authenticated requests? Thanks! Regards, Isaac Levy -- To unsubscr

[no subject]

2016-04-11 Thread Michael S. Tsirkin
Cc junio Bcc: Subject: Re: [PATCH 1/4] rebase -i: add ack action Message-ID: <20160411184535-mutt-send-email-...@redhat.com> Reply-To: In-Reply-To: On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: > > > So fa

Re: [PATCH] Documentation: clarify signature verification

2016-04-11 Thread Junio C Hamano
KellerFuchs writes: > On Sun, Apr 10, 2016 at 11:46:10AM -0700, Junio C Hamano wrote: >> > --- a/Documentation/merge-options.txt >> > +++ b/Documentation/merge-options.txt >> > @@ -89,8 +89,10 @@ option can be used to override --squash. >> > >> > --verify-signatures:: >> > --no-verify-signatu

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Michael S. Tsirkin
Repost, sorry about the noise. On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: > > > So far I only see examples of adding footers. If that's all we can think > > up, why code in all this genericity? > > Becaus

Re: Hardcoded #!/bin/sh in t5532 causes problems on Solaris

2016-04-11 Thread Junio C Hamano
Eric Sunshine writes: >> with "printf". The output from the latter is compared with an >> expected output, again prepared with "printf" hance lacking the > > s/hance/hence/ Thanks -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel

meaning of SP on ls-tree docs

2016-04-11 Thread pedro rijo
Hey, On https://git-scm.com/docs/git-ls-tree#_output_format, the format is presented as SP SP TAB But what is SP? Couldn't find the meaning. Space? System separator? -- Thanks, Pedro Rijo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord..

Re: Hardcoded #!/bin/sh in t5532 causes problems on Solaris

2016-04-11 Thread Jeff King
On Sun, Apr 10, 2016 at 12:01:30PM -0700, Junio C Hamano wrote: > > diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh > > index 8e22b03..6dedb1c 100755 > > --- a/t/t1020-subdirectory.sh > > +++ b/t/t1020-subdirectory.sh > > @@ -142,9 +142,9 @@ test_expect_success 'GIT_PREFIX for built

Re: meaning of SP on ls-tree docs

2016-04-11 Thread pedro rijo
ups :) Thanks 2016-04-11 18:15 GMT+01:00 Konstantin Khomoutov : > On Mon, 11 Apr 2016 18:04:42 +0100 > pedro rijo wrote: > >> On https://git-scm.com/docs/git-ls-tree#_output_format, the format is >> presented as SP SP TAB >> >> But what is SP? Couldn't find the meaning. Space? System separato

Re: Hardcoded #!/bin/sh in t5532 causes problems on Solaris

2016-04-11 Thread Jeff King
On Sat, Apr 09, 2016 at 05:37:43PM -0700, Junio C Hamano wrote: > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index b79f442..d96d0e4 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -555,10 +555,9 @@ test_expect_success 'rebas

[no subject]

2016-04-11 Thread miwilliams
From 7201fe08ede76e502211a781250c9a0b702a78b2 Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Mon, 11 Apr 2016 14:18:39 -0400 Subject: [PATCH 1/1] wt-status: Remove '!!' from wt_status_collect_changed_cb The wt_status_collect_changed_cb function uses an extraneous double negation (!!) w

Re: your mail

2016-04-11 Thread Jeff King
On Mon, Apr 11, 2016 at 07:04:23PM +, miwilli...@google.com wrote: > From 7201fe08ede76e502211a781250c9a0b702a78b2 Mon Sep 17 00:00:00 2001 > From: Mike Williams > Date: Mon, 11 Apr 2016 14:18:39 -0400 > Subject: [PATCH 1/1] wt-status: Remove '!!' from > wt_status_collect_changed_cb These bi

Re: none

2016-04-11 Thread Matthieu Moy
miwilli...@google.com writes: > From 7201fe08ede76e502211a781250c9a0b702a78b2 Mon Sep 17 00:00:00 2001 > From: Mike Williams > Date: Mon, 11 Apr 2016 14:18:39 -0400 > Subject: [PATCH 1/1] wt-status: Remove '!!' from > wt_status_collect_changed_cb > > The wt_status_collect_changed_cb function uses

Central Bank Governor

2016-04-11 Thread Godwin Emefiele
Dear Sir, We had a meeting with the President Rtd General Muhamad Buhari and he has ordered that all outstanding foreign payment be paid to all contractors and beneficiaries as agreed by the office of the President and National Assembly and also to make sure that all the contractors and benefic

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Junio C Hamano
"Michael S. Tsirkin" writes: > Repost, sorry about the noise. > > On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: >> Hi Michael, >> >> On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: >> >> > So far I only see examples of adding footers. If that's all we can think >> > up, wh

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Michael S. Tsirkin
On Mon, Apr 11, 2016 at 12:48:22PM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > Repost, sorry about the noise. > > > > On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: > >> Hi Michael, > >> > >> On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: > >> > >> >

Re: [PATCH 1/4] rebase -i: add ack action

2016-04-11 Thread Matthieu Moy
"Michael S. Tsirkin" writes: > On Mon, Apr 11, 2016 at 12:48:22PM -0700, Junio C Hamano wrote: >> "Michael S. Tsirkin" writes: >> >> > Repost, sorry about the noise. >> > >> > On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: >> >> Hi Michael, >> >> >> >> On Mon, 11 Apr 2016

Re: [PATCH 0/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-11 Thread David Turner
On Mon, 2016-04-11 at 09:33 -0400, Jeff King wrote: > On Sun, Apr 10, 2016 at 11:57:31PM +0100, Ramsay Jones wrote: > > > So, the approach taken by patch #1 is to forget about UNIX_PATH_MAX > > and > > simply use sizeof(address.sun_path) instead! > > That's what the existing code in unix-socket.c

clone hang prevention / timeout?

2016-04-11 Thread Jason Vas Dias
It appears GIT has no way of specifying a timeout for a clone operation - if the server decides not to complete a get request, the clone can hang forever - is this correct ? This appears to be what I am seeing, in a script that is attempting to do many successive clone operations, eg. of git://anon

Re: [PATCH 3/3] index-helper: take extra care with readlink

2016-04-11 Thread David Turner
On Mon, 2016-04-11 at 00:03 +0100, Ramsay Jones wrote: > It took me a few minutes to convince myself that, if index-helper is > the only writer for the symlink, that the call to readlink would > result in a properly NULL terminated string. This relies on the > initialization of the address variable

Re: [PATCH 1/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-11 Thread David Turner
On Mon, 2016-04-11 at 14:30 +0100, Ramsay Jones wrote: > > On 11/04/16 05:20, Torsten Bögershausen wrote: > > On 04/11/2016 12:59 AM, Ramsay Jones wrote: > > The header mentions cygwin, but changes it for linux, BSD and Mac > > OS as well. > > Is this intentional ? > > Yes. I only compile on 32/6

Re: [PATCH 2/3] index-helper: convert strncpy to memcpy

2016-04-11 Thread David Turner
On Mon, 2016-04-11 at 00:02 +0100, Ramsay Jones wrote: > see commit eddda371 ("convert strncpy to memcpy", 24-09-2015). > > Signed-off-by: Ramsay Jones > --- > index-helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/index-helper.c b/index-helper.c > index 4a8e2ae

Re: [PATCH v3 03/16] index-helper: new daemon for caching index and related stuff

2016-04-11 Thread David Turner
On Fri, 2016-04-08 at 18:16 -0400, David Turner wrote: > And SHM on Macs works a bit differently than on Linux in at least two > irritating ways. > > So, uh, new version to come once I actually make it work on Mac. > Probably Monday. I was chatting with a friend about this and he mentioned that

Re: [PATCH] Documentation: clarify signature verification

2016-04-11 Thread KellerFuchs
On Mon, Apr 11, 2016 at 09:41:22AM -0700, Junio C Hamano wrote: > KellerFuchs writes: > > The reason for the first edit is that “trusted” and “valid” are OpenPGP > > concepts: a key is trusted if the user set a trust level for it, > > and a uid is valid if it has been signed by a trusted key [

Re: [PATCH 0/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-11 Thread Jeff King
On Mon, Apr 11, 2016 at 05:29:22PM -0400, David Turner wrote: > On Mon, 2016-04-11 at 09:33 -0400, Jeff King wrote: > > On Sun, Apr 10, 2016 at 11:57:31PM +0100, Ramsay Jones wrote: > > > > > So, the approach taken by patch #1 is to forget about UNIX_PATH_MAX > > > and > > > simply use sizeof(add

Re: [PATCH] git-stash: Don't GPG sign when stashing changes

2016-04-11 Thread Daurnimator
On 7 April 2016 at 18:19, Johannes Schindelin wrote: > Hi, > > you dropped the Cc: list. So most likely Cameron won't get your mail nor > any response to your mail. I originally replied via the gmane web interface, apparently it doesn't CC the original sender. CCd now. > On Thu, 7 Apr 2016, daur

Re: 0 bot for Git

2016-04-11 Thread Stefan Beller
Resending as plain text. (I need to tame my mobile) On Mon, Apr 11, 2016 at 7:51 AM, Stefan Beller wrote: > Hi Greg, > > Thanks for your talk at the Git Merge 2016! > The Git community uses the same workflow as the kernel. So we may be > interested in the 0 bot which could compile and test each p

Re:

2016-04-11 Thread Stefan Beller
On Mon, Apr 11, 2016 at 12:04 PM, wrote: > From 7201fe08ede76e502211a781250c9a0b702a78b2 Mon Sep 17 00:00:00 2001 > From: Mike Williams > Date: Mon, 11 Apr 2016 14:18:39 -0400 > Subject: [PATCH 1/1] wt-status: Remove '!!' from > wt_status_collect_changed_cb > > The wt_status_collect_changed_cb f

[PATCH] upload-pack: Exit when server finishes sending shallow-update in stateless RPC mode

2016-04-11 Thread Stan Hu
In the stateless RPC case, the server should respond to the client's depth request with the set of commits which are no deeper than the desired depth. Once this finishes, the server should terminate and receive the reply in another POST request. Previously the server would sit idle and die when it

Re: [PATCH] upload-pack: Exit when server finishes sending shallow-update in stateless RPC mode

2016-04-11 Thread Torsten Bögershausen
On 04/12/2016 06:55 AM, Stan Hu wrote: In the stateless RPC case, the server should respond to the client's depth request with the set of commits which are no deeper than the desired depth. Once this finishes, the server should terminate and receive the reply in another POST request. Previously

Re: 0 bot for Git

2016-04-11 Thread Greg KH
On Mon, Apr 11, 2016 at 09:29:59PM -0700, Stefan Beller wrote: > Resending as plain text. (I need to tame my mobile) > > On Mon, Apr 11, 2016 at 7:51 AM, Stefan Beller wrote: > > Hi Greg, > > > > Thanks for your talk at the Git Merge 2016! > > The Git community uses the same workflow as the kerne