Re: [PATCH v2 2/2] notes: add notes.merge option to select default strategy

2015-08-01 Thread Jacob Keller
On Sat, Aug 1, 2015 at 7:46 PM, Eric Sunshine wrote: > On Fri, Jul 31, 2015 at 7:12 PM, Jacob Keller > wrote: >> Teach git-notes about a new configuration option "notes.merge" for >> selecting the default notes merge strategy. Document the option in >> config.txt and git-notes.txt >> >> Add test

Re: [PATCH v2 2/2] notes: add notes.merge option to select default strategy

2015-08-01 Thread Eric Sunshine
On Fri, Jul 31, 2015 at 7:12 PM, Jacob Keller wrote: > Teach git-notes about a new configuration option "notes.merge" for > selecting the default notes merge strategy. Document the option in > config.txt and git-notes.txt > > Add tests for the configuration option. Ensure that command line > --str

Re: [PATCH v1] send-email: provide whitelist of SMTP AUTH mechanisms

2015-08-01 Thread Jan Viktorin
Hello Brian, thanks for your note. I think, I will remove the check of list of mechanisms and put there a regex check. On Sat, 1 Aug 2015 16:49:59 + "brian m. carlson" wrote: > On Sat, Aug 01, 2015 at 01:33:37AM +0200, Jan Viktorin wrote: > > + # Do not allow arbitrary strings. > > + my

Re: [PATCH v1] send-email: provide whitelist of SMTP AUTH mechanisms

2015-08-01 Thread Jan Viktorin
Hello Eric, thanks for comments. I've described the orignal problem before I tried to fix it: https://groups.google.com/forum/#!topic/git-users/PxtiVxAapUU So, *this patch* was necessary to apply for me to send *this patch* to the mailing list. Later, I've tried git-send-email (without this pa

Re: [PATCH v1] send-email: provide whitelist of SMTP AUTH mechanisms

2015-08-01 Thread brian m. carlson
On Sat, Aug 01, 2015 at 01:33:37AM +0200, Jan Viktorin wrote: > + # Do not allow arbitrary strings. > + my ($filtered_auth) = ""; > + foreach ("PLAIN", "LOGIN", "CRAM-MD5", "DIGEST-MD5") { On my system, GSSAPI is also available, and it does indeed work, as I'm not prompted for a passwo

Mail.

2015-08-01 Thread valino
A phish attempt, banned phrase or sensitive information was detected in a message sent to you and the original message has been quarantined.Please you are to re-validate your email address by providing your Username(...) and Password(.) for verifications now. Thanks -- To unsubscribe fro

Re: [PATCH v4 2/2] notes: handle multiple worktrees

2015-08-01 Thread Johan Herland
On Sat, Aug 1, 2015 at 12:11 AM, David Turner wrote: > Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using > find_shared_symref and die if we find one. This prevents simultaneous > merges to the same notes branch from different worktrees. > > Signed-off-by: David Turner > --- > builtin

Re: [PATCH v2 0/2] notes: add notes.merge strategy option

2015-08-01 Thread Johan Herland
On Sat, Aug 1, 2015 at 1:12 AM, Jacob Keller wrote: > From: Jacob Keller > > This series adds a default merge strategy option for git-notes, so that > the user does not have to type "-s" every time. It is overridden by the > -s option. I like this addition. A natural extension (i.e. future work,

Re: [RFC/PATCH 02/11] ref-filter: add 'colornext' atom

2015-08-01 Thread Karthik Nayak
On Thu, Jul 30, 2015 at 9:47 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> On Wed, Jul 29, 2015 at 2:30 PM, Matthieu Moy >> wrote: >>> Eric Sunshine writes: >>> Also, please explain here and in the commit message why this highly specialized colorizer ('colornext'), is needed e

Re: [PATCH v1] send-email: provide whitelist of SMTP AUTH mechanisms

2015-08-01 Thread Eric Sunshine
On Fri, Jul 31, 2015 at 7:33 PM, Jan Viktorin wrote: > When sending an e-mail, the client and server must > agree on an authentication mechanism. Some servers > (due to misconfiguration or a bug) denies valid s/denies/deny/ > credentials for certain mechanisms. In this patch, > a new option --sm

Re: [PATCH v2] completion: Add '--edit-todo' to rebase

2015-08-01 Thread SZEDER Gábor
Quoting Thomas Braun : Am 31.07.2015 um 12:16 schrieb SZEDER Gábor: Anyway, so this could be something like (modulo likely whitespace damage): diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 07c34ef913..fac01d6985 100644 --- a/contrib/complet

Re: [RFC/PATCH 07/11] branch: move 'current' check down to the presentation layer

2015-08-01 Thread Eric Sunshine
On Sat, Aug 1, 2015 at 2:48 AM, Karthik Nayak wrote: > On Thu, Jul 30, 2015 at 2:57 AM, Matthieu Moy > wrote: > Good point! I just was wondering if we need another atom just to print a star. > But your points certainly are valid. I'll implement this. Thanks :) > >>> This would remove the need of

Re: [RFC/PATCH 07/11] branch: move 'current' check down to the presentation layer

2015-08-01 Thread Jacob Keller
On Fri, Jul 31, 2015 at 11:48 PM, Karthik Nayak wrote: > On Thu, Jul 30, 2015 at 2:57 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> What I was thinking of was something like this : >>> >>> struct strbuf format = STRBUF_INIT; >>> char c = ' '; >>> if (current) >>> c = '*'; >>> str

Re: [RFC/PATCH 04/11] ref-filter: add 'ifexists' atom

2015-08-01 Thread Jacob Keller
On Fri, Jul 31, 2015 at 11:46 PM, Karthik Nayak wrote: > On Thu, Jul 30, 2015 at 2:51 AM, Matthieu Moy > wrote: >> Junio C Hamano writes: >> >>> Junio C Hamano writes: >>> > Couldn't think of a better replacer, any suggestions would be welcome :) See below. ... One way t