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

2015-08-02 Thread Jacob Keller
On Sun, Aug 2, 2015 at 1:01 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Don't worry too much about it. Consider it something to keep in mind for future patches. I reviewed the change and it seemed okay. I mentioned it because one of the goals of patch submission, in addition to making an

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

2015-08-02 Thread Eric Sunshine
On Sun, Aug 02, 2015 at 12:41:08AM -0700, Jacob Keller wrote: On Sat, Aug 1, 2015 at 7:46 PM, Eric Sunshine sunsh...@sunshineco.com wrote: If conflicts arise and a strategy for automatically resolving -conflicting notes (see the -s/--strategy option) is not given, -the manual resolver is

[PATCH] git-p4: fix faulty paths for case insensitive systems

2015-08-02 Thread larsxschneider
From: Lars Schneider larsxschnei...@gmail.com Hi, I want to propose this patch as it helped us to migrate a big source code base successfully from P4 to Git. I am sorry that I don't provide a test case, yet. I would like to get advise on the patch and on the best strategy to provide a test. Do

[PATCH] git-p4: fix faulty paths for case insensitive systems

2015-08-02 Thread larsxschneider
From: Lars Schneider larsxschnei...@gmail.com PROBLEM: We run P4 servers on Linux and P4 clients on Windows. For an unknown reason the file path for a number of files in P4 does not match the directory path with respect to case sensitivity. E.g. `p4 files` might return //depot/path/to/file1

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

2015-08-02 Thread Eric Sunshine
On Sat, Aug 1, 2015 at 2:19 PM, Jan Viktorin vikto...@rehivetech.com wrote: On Sat, 1 Aug 2015 05:33:28 -0400 Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Jul 31, 2015 at 7:33 PM, Jan Viktorin vikto...@rehivetech.com wrote: At the very least, you will also want to update the

[PATCH v3 3/4] notes: add notes.merge option to select default strategy

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com 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 use of the configuration option. Include a test to ensure that --strategy

[PATCH v3 0/4] notes: add support for notes.merge option

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com This series incorporates the feedback from both Johan and Eric. In addition, I included an RFC implementing suggestion from Johan regarding per-ref merge strategies. I split the tests for --merge/--commit/--strategy out into their own patch to help

Re: [PATCH 1/1] po/README: split out the different contribution types

2015-08-02 Thread Jiang Xin
2015-08-02 21:42 GMT+08:00 Philip Oakley philipoak...@iee.org: Separate out the three different contribution styles for existing, new, and wider mis-translation contributions, with suitable headings for easy reference. In particular highlight the appropriate action should a Git

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

2015-08-02 Thread Jan Viktorin
When sending an e-mail, the client and server must agree on an authentication mechanism. Some servers (due to misconfiguration or a bug) deny valid credentials for certain mechanisms. In this patch, a new option --smtp-auth and configuration entry smtpauth are introduced. If smtp_auth is defined,

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

2015-08-02 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: What I was really asking was whether this sort of checking really belongs in git-send-email or if it is better left to Net::SMTP (and Authen::SASL) to do so since they are in better positions to know what is valid and what is not. If the Perl

Re: [PATCH/RFC 0/2] bisect per-worktree

2015-08-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Hmm, ok, so you are thinking of a remote database with high latency. I was thinking more of something like LMDB, with latency comparable to filesystem storage. Not necessarily. The comment was more from conceptual point: Why share what needs not

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

2015-08-02 Thread Junio C Hamano
Jan Viktorin vikto...@rehivetech.com writes: Authen::SASL gives: No SASL mechanism found at /usr/share/perl5/vendor_perl/Authen/SASL.pm line 77. at /usr/share/perl5/core_perl/Net/SMTP.pm line 207. The SASL library does not check validity of mechanisms' names (or I did not find it). It

Re: [PATCH v7 0/11] port tag.c to use ref-filter APIs

2015-08-02 Thread Matthieu Moy
Karthik Nayak karthik@gmail.com writes: +test_expect_success 'no padding when `padright` length is smaller than atom length' ' +cat expect -\EOF +refs/heads/master| +refs/heads/side| +refs/odd/spot| +refs/tags/double-tag| +refs/tags/four| +refs/tags/one|

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

2015-08-02 Thread Eric Sunshine
On Sun, Aug 2, 2015 at 12:42 PM, Jan Viktorin vikto...@rehivetech.com wrote: When sending an e-mail, the client and server must agree on an authentication mechanism. Some servers (due to misconfiguration or a bug) deny valid credentials for certain mechanisms. In this patch, a new option

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

2015-08-02 Thread Jan Viktorin
Authen::SASL gives: No SASL mechanism found at /usr/share/perl5/vendor_perl/Authen/SASL.pm line 77. at /usr/share/perl5/core_perl/Net/SMTP.pm line 207. The SASL library does not check validity of mechanisms' names (or I did not find it). It just tries to load one that matches both the ours and

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

2015-08-02 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com writes: Even more generic would be an %(ifeq:x:y) conditional and a %(currentbranch) atom: %(ifeq:refname:currentbranch)*%(endif) Those are just a couple ideas. Other variations are possible and likely preferable to the specialized %(starifcurrent).

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

2015-08-02 Thread Karthik Nayak
On Sat, Aug 1, 2015 at 2:33 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Aug 1, 2015 at 2:48 AM, Karthik Nayak karthik@gmail.com wrote: On Thu, Jul 30, 2015 at 2:57 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Good point! I just was wondering if we need another atom

Re: [PATCH/RFC 0/9] Pseudorefs

2015-08-02 Thread Michael Haggerty
On 07/24/2015 06:45 AM, David Turner wrote: This series is another chunk of the pluggable refs backend work. The major reason it is listed as PATCH/RFC is beacuse it breaks t9300-fast-import.sh, because fast-import wants to create a ref called TEMP_TAG, which would now be a pseudoref. The

Draft of Git Rev News edition 6

2015-08-02 Thread Thomas Ferris Nicolaisen
Hi, A draft of Git Rev News edition 6 is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-6.md Everyone is welcome to contribute in any section, either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub issue:

Re: Draft of Git Rev News edition 6

2015-08-02 Thread Andrew Ardill
Hi Thomas. On 3 August 2015 at 08:52, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Hi, A draft of Git Rev News edition 6 is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-6.md Everyone is welcome to contribute in any section, either by editing

Re: [PATCH v2 00/10] object_id part 2

2015-08-02 Thread Michael Haggerty
On 06/14/2015 12:16 AM, brian m. carlson wrote: This is another series of conversions to struct object_id. This series converts more of the refs code and struct object to use struct object_id. It introduces an additional helper function, has_object_file, which is the equivalent of

pocket size selfie stick bt foldable monopod,only $2.7/pc now

2015-08-02 Thread Raymond
Dear Good day Pocket size mini foldable monopod selfie stick with bt shutter button on stick, now only $2.7/pc ,only from us,the arcpeaks factory,2kpcs in stock now