Re: [PATCH 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread David Rothenberger
On 7/5/2013 8:41 PM, Kyle McKay wrote: > This patch allows git-svn to fetch successfully using the > serf library when given an https?: url to fetch from. Thanks, Kyle. I confirm this is working for my problem cases as well. > Daniel Shahaf has suggested also setting > "servers:global:http-bulk-u

Re: [PATCH v8 3/7] git-remote-mediawiki: New git bin-wrapper for developement

2013-07-06 Thread Benoît Person
On 5 July 2013 09:04, Matthieu Moy wrote: > benoit.per...@ensimag.fr writes: > >> --- a/contrib/mw-to-git/Makefile >> +++ b/contrib/mw-to-git/Makefile >> @@ -2,6 +2,12 @@ >> # Copyright (C) 2013 >> # Matthieu Moy >> # >> +# To build and test: >> +# >> +# make: >> +# bin-wrapper/git m

Re: [PATCH v2 2/2] send-email: introduce sendemail.smtpsslcertpath

2013-07-06 Thread John Keeping
On Fri, Jul 05, 2013 at 11:25:36PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > I'd rather have '$smtp_ssl_cert_path ne ""' in the first if condition > > (instead of the '-d $smtp_ssl_cert_path') ... > > I agree. The signal for "no certs" should be an explicit "nonsense" > value li

[PATCH] diffcore-pickaxe: simplify has_changes and contains

2013-07-06 Thread René Scharfe
Halve the number of callsites of contains() to two using temporary variables, simplifying the code. While at it, get rid of the diff_options parameter, which became unused with 8fa4b09f. Signed-off-by: René Scharfe --- diffcore-pickaxe.c | 11 --- 1 file changed, 4 insertions(+), 7 dele

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-06 Thread Torsten Bögershausen
On 2013-07-05 14.05, Ramkumar Ramachandra wrote: > Due to a recent change in the Net::SMTP::SSL module, send-email emits > the following ugly warning everytime a email is sent via SSL: > > *** > Using the default of SSL_verify_mode o

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-06 Thread brian m. carlson
On Sat, Jul 06, 2013 at 04:28:00PM +0200, Torsten Bögershausen wrote: > On 2013-07-05 14.05, Ramkumar Ramachandra wrote: > > Due to a recent change in the Net::SMTP::SSL module, send-email emits > > the following ugly warning everytime a email is sent via SSL: > > > > *

Re: [PATCH] git stash: Avoid data loss when saving a stash

2013-07-06 Thread Petr Baudis
Hi! (tl;dr - I disagree but this issue is perhaps not so important in practice) On Sun, Jun 30, 2013 at 12:14:26PM -0700, Junio C Hamano wrote: > I do not agree with your `git reset --hard` at all. With the > command, the user demands "no matter what, I want get rid of any > funny state in m

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-06 Thread Torsten Bögershausen
On 2013-07-06 16.32, brian m. carlson wrote: > perl -MIO::Socket::SSL -e 'print "$IO::Socket::SSL::VERSION\n";' Mac OS X, 10.6: (I think this perl we use for git:) /usr/bin/perl -MIO::Socket::SSL -e 'print "$IO::Socket::SSL::VERSION\n";' 1.22 (And this is in my path:) which perl /opt/local/bin/p

[PATCH] lockfile: fix buffer overflow in path handling

2013-07-06 Thread Michael Haggerty
The path of the file to be locked is held in lock_file::filename, which is a fixed-length buffer of length PATH_MAX. This buffer is also (temporarily) used to hold the path of the lock file, which is the path of the file being locked plus ".lock". Because of this, the path of the file being locke

Re: [PATCH 1/2] Git.pm: add new temp_is_locked function

2013-07-06 Thread Jonathan Nieder
Hi, Kyle McKay wrote: > The temp_is_locked function can be used to determine whether > or not a given name previously passed to temp_acquire is > currently locked. [...] > +=item temp_is_locked ( NAME ) > + > +Returns true if the file mapped to C is currently locked. > + > +If true is returned, a

Re: [PATCH 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-06 Thread Jonathan Nieder
(cc-ing Eric Wong, who wrote this code) Hi, Kyle McKay wrote: > Temp file with moniker 'svn_delta' already in use at Git.pm line 1250 > Temp file with moniker 'git_blob' already in use at Git.pm line 1250 > > David Rothenberger has determined the cause to > be that ra_serf does not drive the del

Re: [PATCH 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread Jonathan Nieder
David Rothenberger wrote: > On 7/5/2013 8:41 PM, Kyle McKay wrote: >> Daniel Shahaf has suggested also setting >> "servers:global:http-bulk-updates=on". > > I have a patch that does this, but since turning on bulk updates has > a possible performance penalty, I prefer your approach. I assume tha

Re: What's cooking in git.git (Jul 2013, #02; Fri, 5)

2013-07-06 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: > We are in the middle of 5th week now in the 11-week releace cycle > for 1.8.4 (http://tinyurl.com/gitCal), and quite a few topics have > graduated to 'master'. I'd expect the rest of the week to be slow. I'd like this or the next release to be 2.0, so the common user

Re: [PATCH] documentation: add git transport security notice

2013-07-06 Thread Jonathan Nieder
Hi, Fraser Tweedale wrote: > --- a/Documentation/urls.txt > +++ b/Documentation/urls.txt > @@ -11,6 +11,9 @@ and ftps can be used for fetching and rsync can be used for > fetching > and pushing, but these are inefficient and deprecated; do not use > them). > > +The git transport does not do

Re: [PATCH] test-lib.sh - cygwin does not have usable FIFOs

2013-07-06 Thread Jonathan Nieder
Mark Levedahl wrote: > Do not use FIFOs on cygwin, they do not work. Cygwin includes > coreutils, so has mkfifo, and that command does something. However, > the resultant named pipe is known (on the Cygwin mailing list at > least) to not work correctly. Hm. How would you recommend going about wr

Re: [PATCH v3] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-06 Thread Jonathan Nieder
Tony Finch wrote: > Reviewed-by: Jonathan Nieder Yep, fwiw this version looks perfect to me. :) Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread Kyle McKay
On Jul 6, 2013, at 17:28, Jonathan Nieder wrote: David Rothenberger wrote: On 7/5/2013 8:41 PM, Kyle McKay wrote: Daniel Shahaf has suggested also setting "servers:global:http-bulk-updates=on". I have a patch that does this, but since turning on bulk updates has a possible performance penal

Re: [PATCH 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread Jonathan Nieder
Kyle McKay wrote: > On Jul 6, 2013, at 17:28, Jonathan Nieder wrote: >> David Rothenberger wrote: >>> On 7/5/2013 8:41 PM, Kyle McKay wrote: Daniel Shahaf has suggested also setting "servers:global:http-bulk-updates=on". >>> >>> I have a patch that does this, but since turning on bulk up

Re: [PATCH 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-06 Thread Kyle McKay
On Jul 6, 2013, at 17:24, Jonathan Nieder wrote: (cc-ing Eric Wong, who wrote this code) Hi, Kyle McKay wrote: Temp file with moniker 'svn_delta' already in use at Git.pm line 1250 Temp file with moniker 'git_blob' already in use at Git.pm line 1250 David Rothenberger has determined the caus

Re: Possible error on the git-svn man page

2013-07-06 Thread Jonathan Nieder
Hi, Szuba, Marek (IKP) wrote: > On the git-svn(1) man page, the third example in the "Basic Examples" [...] > $ git checkout -b master FETCH_HEAD > fatal: Cannot update paths and switch to branch 'master' at the same time. > Did you intend to checkout 'FETCH_HEAD' which can not be resolved as com

Re: [PATCH 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-06 Thread Jonathan Nieder
Kyle McKay wrote: > Unless bulk updates are disabled when using the serf access method > (the only one available with svn 1.8) for https?: urls, > apply_textdelta does indeed get called multiple times in a row > without an intervening temp_release. You mean "Unless bulk updates are enabled" and "

Re: [PATCH 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread Kyle McKay
On Jul 6, 2013, at 18:37, Jonathan Nieder wrote: Kyle McKay wrote: On Jul 6, 2013, at 17:28, Jonathan Nieder wrote: David Rothenberger wrote: On 7/5/2013 8:41 PM, Kyle McKay wrote: Daniel Shahaf has suggested also setting "servers:global:http-bulk-updates=on". I have a patch that does thi

Re: [PATCH 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-06 Thread Kyle McKay
On Jul 6, 2013, at 19:23, Jonathan Nieder wrote: Kyle McKay wrote: Unless bulk updates are disabled when using the serf access method (the only one available with svn 1.8) for https?: urls, apply_textdelta does indeed get called multiple times in a row without an intervening temp_release. You

[PATCH v2 1/2] Git.pm: add new temp_is_locked function

2013-07-06 Thread Kyle J. McKay
From: "Kyle J. McKay" The temp_is_locked function can be used to determine whether or not a given name previously passed to temp_acquire is currently locked. Signed-off-by: Kyle J. McKay --- perl/Git.pm | 39 +-- 1 file changed, 33 insertions(+), 6 deletions

[PATCH v2 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread Kyle J. McKay
From: "Kyle J. McKay" This patch allows git-svn to fetch successfully using the serf library when given an https?: url to fetch from. Unfortunately some svn servers do not seem to be configured well for use with the serf library. This can cause fetching to take longer compared to the neon libra

[PATCH v2 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-06 Thread Kyle J. McKay
From: "Kyle J. McKay" When attempting to git-svn fetch files from an svn https?: url using the serf library (the only choice starting with svn 1.8) the following errors can occur: Temp file with moniker 'svn_delta' already in use at Git.pm line 1250 Temp file with moniker 'git_blob' already in u

Re: [PATCH 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread David Rothenberger
On 7/6/2013 5:28 PM, Jonathan Nieder wrote: > David Rothenberger wrote: >> On 7/5/2013 8:41 PM, Kyle McKay wrote: > >>> Daniel Shahaf has suggested also setting >>> "servers:global:http-bulk-updates=on". >> >> I have a patch that does this, but since turning on bulk updates has >> a possible perfo

Re: What's cooking in git.git (Jul 2013, #02; Fri, 5)

2013-07-06 Thread Junio C Hamano
Jonathan Nieder writes: >> We are in the middle of 5th week now in the 11-week releace cycle >> for 1.8.4 (http://tinyurl.com/gitCal), and quite a few topics have >> graduated to 'master'. I'd expect the rest of the week to be slow. > > I'd like this or the next release to be 2.0, so the common

Re: [PATCH] diffcore-pickaxe: simplify has_changes and contains

2013-07-06 Thread Jeff King
On Sat, Jul 06, 2013 at 03:53:27PM +0200, René Scharfe wrote: > Halve the number of callsites of contains() to two using temporary > variables, simplifying the code. While at it, get rid of the > diff_options parameter, which became unused with 8fa4b09f. There is a slight change in behavior, too

Re: [PATCH] lockfile: fix buffer overflow in path handling

2013-07-06 Thread Jeff King
On Sat, Jul 06, 2013 at 09:48:52PM +0200, Michael Haggerty wrote: > When and if resolve_symlink() is called, then that function is > correctly told to treat the buffer as (PATH_MAX - 5) characters long. > This part is correct. However: > > * If LOCK_NODEREF was specified, then resolve_symlink()

Re: [PATCH v2 2/2] send-email: introduce sendemail.smtpsslcertpath

2013-07-06 Thread Junio C Hamano
John Keeping writes: > @@ -1096,19 +1101,18 @@ sub smtp_auth_maybe { > # Helper to come up with SSL/TLS certification validation params > # and warn when doing no verification > sub ssl_verify_params { > - use IO::Socket::SSL qw(SSL_VERIFY_PEER SSL_VERIFY_NONE); > - > - if (!defined $s

[PATCH v3 1/2] Git.pm: add new temp_is_locked function

2013-07-06 Thread Kyle J. McKay
From: "Kyle J. McKay" The temp_is_locked function can be used to determine whether or not a given name previously passed to temp_acquire is currently locked. Signed-off-by: Kyle J. McKay --- perl/Git.pm | 33 +++-- 1 file changed, 31 insertions(+), 2 deletions(-) d

[PATCH v3 0/2] allow git-svn fetching to work using serf

2013-07-06 Thread Kyle J. McKay
From: "Kyle J. McKay" This patch allows git-svn to fetch successfully using the serf library when given an https?: url to fetch from. Unfortunately some svn servers do not seem to be configured well for use with the serf library. This can cause fetching to take longer compared to the neon libra

[PATCH v3 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-06 Thread Kyle J. McKay
From: "Kyle J. McKay" When attempting to git-svn fetch files from an svn https?: url using the serf library (the only choice starting with svn 1.8) the following errors can occur: Temp file with moniker 'svn_delta' already in use at Git.pm line 1250 Temp file with moniker 'git_blob' already in u

Re: [PATCH v2 2/2] send-email: introduce sendemail.smtpsslcertpath

2013-07-06 Thread Jeff King
On Fri, Jul 05, 2013 at 08:29:48PM +, brian m. carlson wrote: > On Fri, Jul 05, 2013 at 10:20:11AM -0700, Junio C Hamano wrote: > > +# Helper to come up with SSL/TLS certification validation params > > +# and warn when doing no verification > > +sub ssl_verify_params { > > + use IO::Socket::