Re: [msysGit] Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

2015-08-13 Thread Erik Faye-Lund
On Thu, Aug 13, 2015 at 10:37 AM, Johannes Schindelin wrote: > Hi kusma, > > On 2015-08-12 13:58, Erik Faye-Lund wrote: >> On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin >> wrote: >>> >>> On 2015-08-11 22:51, Johannes Sixt wrote: >>>> Inv

Re: [msysGit] Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

2015-08-12 Thread Erik Faye-Lund
On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin wrote: > Hi Johannes, > > On 2015-08-11 22:51, Johannes Sixt wrote: >> Invoking plink requires special treatment, and we have support and even >> test cases for the commands 'plink' and 'tortoiseplink'. We also support >> .exe variants for these

Re: [msysGit] [PATCH] compat/mingw: stubs for getpgid() and tcgetpgrp()

2015-04-15 Thread Erik Faye-Lund
On Wed, Apr 15, 2015 at 8:29 PM, Johannes Sixt wrote: > Windows does not have process groups. It is, therefore, the simplest > to pretend that each process is in its own process group. Windows does have some concept of process groups, but probably not quite what you want: https://msdn.microsoft.

Re: [PATCH] systemd socket activation support

2015-04-08 Thread Erik Faye-Lund
On Thu, Apr 2, 2015 at 8:09 AM, Shawn Landden wrote: > From: Shawn Landden > > v1.1: actually test... > > Signed-off-by: Shawn Landden > --- > daemon.c | 35 +++--- > git-daemon.service | 7 +++ > git-daemon.socket | 9 > sd-daemon.c| 132 >

Re: t5539 broken under Mac OS X

2015-01-27 Thread Erik Faye-Lund
On Tue, Jan 27, 2015 at 3:51 AM, Junio C Hamano wrote: > Erik Faye-Lund writes: > >> On Fri, Jan 16, 2015 at 1:04 AM, Junio C Hamano wrote: >>> Jeff King writes: >>> >>>> Exactly. I am happy to submit a patch, but I cannot think of any >>&

Re: t5539 broken under Mac OS X

2015-01-26 Thread Erik Faye-Lund
On Fri, Jan 16, 2015 at 1:04 AM, Junio C Hamano wrote: > Jeff King writes: > >> Exactly. I am happy to submit a patch, but I cannot think of any >> mechanisms besides: >> >> 1. Calling `id`, which I suspect is very not portable. >> >> 2. Writing a C program to check getuid(). That's portable

Re: [PATCH] win32: syslog: prevent potential realloc memory leak

2015-01-25 Thread Erik Faye-Lund
Sorry for very late reply. I had a bug in my mail rules that caused this email to skip my inbox. That should be fixed now. On Mon, Dec 15, 2014 at 7:11 PM, Junio C Hamano wrote: > Arjun Sreedharan writes: > >> use a temporary variable to free the memory in case >> realloc() fails. >> >> Signed-o

Re: [PATCH] wincred: fix get credential if username has @

2015-01-25 Thread Erik Faye-Lund
return match_part_with_last(ptarget, want, delim, 1); >> +} >> + >> static int match_cred(const CREDENTIALW *cred) >> { >> LPCWSTR target = cred->TargetName; >> @@ -146,7 +165,7 @@ static int match_cred(const CREDENTIALW *cred) >> >> return match_p

Re: [msysGit] [PATCH 01/14] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

2014-10-08 Thread Erik Faye-Lund
On Wed, Oct 8, 2014 at 8:00 PM, Marat Radchenko wrote: > Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h. > > Signed-off-by: Marat Radchenko > Acked-by: Eric Faye-Lund I spell my name with a K, "Erik Faye-Lund". -- To unsubscribe from this list: send

Re: [PATCH v2 2/2] wincred: improve compatibility with windows versions

2014-09-10 Thread Erik Faye-Lund
On Thu, Jan 10, 2013 at 1:10 PM, Karsten Blees wrote: > static int match_cred(const CREDENTIALW *cred) > { > - return (!wusername || !wcscmp(wusername, cred->UserName)) && > - match_attr(cred, L"git_protocol", protocol) && > - match_attr(cred, L"git_host", host) && > -

Re: Location of git config on Windows

2014-08-18 Thread Erik Faye-Lund
On Mon, Aug 18, 2014 at 7:05 PM, Daniel Corbe wrote: > Erik Faye-Lund writes: > >> On Mon, Aug 18, 2014 at 5:47 PM, Erik Faye-Lund wrote: >>> On Mon, Aug 18, 2014 at 5:40 PM, Daniel Corbe wrote: >>>> >>>> Erik Faye-Lund writes: >>>

Re: Location of git config on Windows

2014-08-18 Thread Erik Faye-Lund
On Mon, Aug 18, 2014 at 5:47 PM, Erik Faye-Lund wrote: > On Mon, Aug 18, 2014 at 5:40 PM, Daniel Corbe wrote: >> >> Erik Faye-Lund writes: >> >>> Or you could just restart your shell when you disconnect... >> >> Well I'm not that daft. I tr

Re: Location of git config on Windows

2014-08-18 Thread Erik Faye-Lund
On Mon, Aug 18, 2014 at 5:40 PM, Daniel Corbe wrote: > > Erik Faye-Lund writes: > >> Or you could just restart your shell when you disconnect... > > Well I'm not that daft. I tried that and if it had resolved my problem > I wouldn't have posted. Hm, but isn&#

Re: Location of git config on Windows

2014-08-18 Thread Erik Faye-Lund
On Mon, Aug 18, 2014 at 5:14 PM, Daniel Corbe wrote: > > Karsten Blees writes: > >> Am 18.08.2014 00:01, schrieb Erik Faye-Lund: >>> On Sun, Aug 17, 2014 at 10:18 PM, Daniel Corbe wrote: >>>> >>>> I installed git on my Windows machine while it

Re: Location of git config on Windows

2014-08-17 Thread Erik Faye-Lund
On Sun, Aug 17, 2014 at 10:18 PM, Daniel Corbe wrote: > > I installed git on my Windows machine while it was connected to my > corporate network. It picked up on that fact and used a mapped drive to > store its configuration file. > > As a result, I cannot currently use git when disconnected from

Re: Undefined reference to __builtin_ctzll

2014-08-13 Thread Erik Faye-Lund
On Wed, Aug 13, 2014 at 10:36 AM, Радослав Йовчев wrote: > Dear GIT community, > > > I found myself in situation where I had to install GIT on Debian 3.1 > sarge. It comes with GCC 3.3.5. I tried to built from source but the > libgcc was not providing the ctzll function, thus I decided to put an

Re: [msysGit] [PATCH 4/6] t4210: skip command-line encoding tests on mingw

2014-07-18 Thread Erik Faye-Lund
On Thu, Jul 17, 2014 at 5:37 PM, Stepan Kasal wrote: > From: Pat Thoyts > > On Windows the application command line is provided as unicode and in > mingw-git we convert that to utf-8. So these tests that require a iso-8859-1 > input are being subverted by the encoding transformations we perform a

Re: No fchmod() under msygit - Was: Re: [PATCH 00/14] Add submodule test harness

2014-07-14 Thread Erik Faye-Lund
On Wed, Jul 9, 2014 at 10:00 PM, Eric Wong wrote: > Torsten Bögershausen wrote: >> (And why is it "& 0" and not "& 0777") > > This is to preserve the uncommon sticky/sgid/suid bits. Probably not > needed, but better to keep as much intact as possible. > >> Can we avoid the fchmod() all to

Re: [PATCH 7/7] determine_author_info: stop leaking name/email

2014-06-23 Thread Erik Faye-Lund
On Mon, Jun 23, 2014 at 11:28 AM, Eric Sunshine wrote: > On Wed, Jun 18, 2014 at 4:36 PM, Jeff King wrote: >> When we get the author name and email either from an >> existing commit or from the "--author" option, we create a >> copy of the strings. We cannot just free() these copies, >> since the

Re: [PATCH v2 1/3] add strnncmp() function

2014-06-17 Thread Erik Faye-Lund
On Tue, Jun 17, 2014 at 9:34 AM, Jeremiah Mahler wrote: > Add a strnncmp() function which behaves like strncmp() except it takes > the length of both strings instead of just one. It behaves the same as > strncmp() up to the minimum common length between the strings. When the > strings are identi

Re: [msysGit] Multi-line commit message changed to a single one

2014-06-13 Thread Erik Faye-Lund
On Fri, Jun 13, 2014 at 1:44 PM, wrote: > Hi, > > Here is a simple script to show my problem. I don't know if it's a > wrong operation (from me), a wrong configuration/parameter, or either a bug, > but I don't get what I expected. > From a git repo (#1), I created a commit message conta

Re: [PATCH v2] Add a Windows-specific fallback to getenv("HOME");

2014-06-05 Thread Erik Faye-Lund
On Thu, Jun 5, 2014 at 11:40 AM, Karsten Blees wrote: > Am 05.06.2014 10:03, schrieb Stepan Kasal: >> From: Johannes Schindelin >> Date: Wed, 2 Jun 2010 00:41:33 +0200 >> >> If HOME is not set, use $HOMEDRIVE$HOMEPATH >> >> Signed-off-by: Johannes Schindelin >> Signed-off-by: Stepan Kasal >> --

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv("HOME");

2014-06-04 Thread Erik Faye-Lund
On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin wrote: > Hi Erik, > > On Wed, 4 Jun 2014, Erik Faye-Lund wrote: > >> On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen wrote: >> > On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal wrote: >> >> @@ -133,7 +

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv("HOME");

2014-06-04 Thread Erik Faye-Lund
On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen wrote: > On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal wrote: >> @@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...) >> void home_config_paths(char **global, char **xdg, char *file) >> { >> char *xdg_home = getenv("XDG_CONFIG_HOME"); >> -

Re: [PATCH 1/5] progress.c: replace signal() with sigaction()

2014-05-28 Thread Erik Faye-Lund
On Wed, May 28, 2014 at 10:19 AM, David Kastrup wrote: > Chris Packham writes: > >> On 28/05/14 18:14, Jeremiah Mahler wrote: >>> From signal(2) >>> >>> The behavior of signal() varies across UNIX versions, and has also var‐ >>> ied historically across different versions of Linux. Avoid it

Re: [PATCH 0/5] replace signal() with sigaction()

2014-05-28 Thread Erik Faye-Lund
On Wed, May 28, 2014 at 10:11 AM, Chris Packham wrote: > On 28/05/14 19:40, Johannes Sixt wrote: >> Am 5/28/2014 8:14, schrieb Jeremiah Mahler: >>> From signal(2) >>> >>> The behavior of signal() varies across UNIX versions, and has also var‐ >>> ied historically across different versions of L

Re: [PATCH/RFC] clean: add a flag to back up cleaned files

2014-05-27 Thread Erik Faye-Lund
On Tue, May 27, 2014 at 6:37 PM, Jeff King wrote: > On Tue, May 27, 2014 at 04:17:34PM +0200, Erik Faye-Lund wrote: > >> The combination of "git clean" and fat fingers can some times cause >> data-loss, which can be frustrating. >> >> So let's add a f

[PATCH/RFC] clean: add a flag to back up cleaned files

2014-05-27 Thread Erik Faye-Lund
n-runs. Signed-off-by: Erik Faye-Lund --- I've had a similar patch laying around for quite a while, but since f538a91 ("git-clean: Display more accurate delete messages"), this patch is a lot less nasty than before. So here you go, perhaps someone else has fat fingers and hate

Re: [msysGit] Re: [PATCH/RFC] send-pack.c: Allow to disable side-band-64k

2014-05-20 Thread Erik Faye-Lund
On Tue, May 20, 2014 at 10:46 AM, Thomas Braun wrote: > Am 19.05.2014 22:29, schrieb Erik Faye-Lund: >>> [...] >>> Would we need to wrap both ends, shouldn't wrapping only reading be >>> good enough to prevent deadlocking? >>> >>>

Re: [PATCH/RFC] send-pack.c: Allow to disable side-band-64k

2014-05-19 Thread Erik Faye-Lund
On Mon, May 19, 2014 at 11:15 PM, Thomas Braun wrote: > Am 19.05.2014 21:33, schrieb Jonathan Nieder: > >> Hi, >> >> Thomas Braun wrote: >> >>> pushing over the dump git protocol with a windows git client. >> >> >> I've never heard of the dump git protocol. Do you mean the git >> protocol that's

Re: [msysGit] Re: [PATCH/RFC] send-pack.c: Allow to disable side-band-64k

2014-05-19 Thread Erik Faye-Lund
On Mon, May 19, 2014 at 10:00 PM, Erik Faye-Lund wrote: > On Mon, May 19, 2014 at 9:33 PM, Jonathan Nieder wrote: >> Hi, >> >> Thomas Braun wrote: >> >>> pushing over the dump git protocol with a windows git client. >> >> I've never

Re: [msysGit] Re: [PATCH/RFC] send-pack.c: Allow to disable side-band-64k

2014-05-19 Thread Erik Faye-Lund
On Mon, May 19, 2014 at 9:33 PM, Jonathan Nieder wrote: > Hi, > > Thomas Braun wrote: > >> pushing over the dump git protocol with a windows git client. > > I've never heard of the dump git protocol. Do you mean the git > protocol that's used with git:// URLs? > > [...] >> Alternative approaches

Re: [msysGit] Re: [PATCH v2] config: preserve config file permissions on edits

2014-05-19 Thread Erik Faye-Lund
On Mon, May 19, 2014 at 9:17 PM, Thomas Braun wrote: > Am Montag, den 19.05.2014, 11:59 +0200 schrieb Erik Faye-Lund: >> On Mon, May 19, 2014 at 9:44 AM, Erik Faye-Lund wrote: >> > On Mon, May 19, 2014 at 9:13 AM, Johannes Sixt >> > wrote: >> >&

Re: [msysGit] Re: [PATCH v2] config: preserve config file permissions on edits

2014-05-19 Thread Erik Faye-Lund
On Mon, May 19, 2014 at 9:44 AM, Erik Faye-Lund wrote: > On Mon, May 19, 2014 at 9:13 AM, Johannes Sixt wrote: >> Am 5/6/2014 2:17, schrieb Eric Wong: >>> Users may already store sensitive data such as imap.pass in >>> ..git/config; making the file world-readable when

Re: [msysGit] Re: [PATCH v2] config: preserve config file permissions on edits

2014-05-19 Thread Erik Faye-Lund
On Mon, May 19, 2014 at 9:13 AM, Johannes Sixt wrote: > Am 5/6/2014 2:17, schrieb Eric Wong: >> Users may already store sensitive data such as imap.pass in >> ..git/config; making the file world-readable when "git config" >> is called to edit means their password would be compromised >> on a share

Re: [PATCH 2/2] wincred: avoid overwriting configured variables

2014-05-14 Thread Erik Faye-Lund
On Wed, May 14, 2014 at 10:45 AM, Stepan Kasal wrote: > Hello kusma, > > On Tue, May 13, 2014 at 08:56:54AM +0200, Erik Faye-Lund wrote: >> > --- a/contrib/credential/wincred/Makefile >> > +++ b/contrib/credential/wincred/Makefile >> > @@ -1,12 +1,12 @@ &

Re: [PATCH 2/3] Add read-cache--daemon

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 4:10 PM, Duy Nguyen wrote: > On Tue, May 13, 2014 at 9:06 PM, Erik Faye-Lund wrote: >> On Tue, May 13, 2014 at 3:49 PM, Duy Nguyen wrote: >>> On Tue, May 13, 2014 at 8:37 PM, Erik Faye-Lund wrote: >>>> On Tue, May 13, 2014 at 3:01 PM, Du

Re: [PATCH 2/3] Add read-cache--daemon

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 3:49 PM, Duy Nguyen wrote: > On Tue, May 13, 2014 at 8:37 PM, Erik Faye-Lund wrote: >> On Tue, May 13, 2014 at 3:01 PM, Duy Nguyen wrote: >>> What do you think is a good replacement for unix socket on Windows? >>> It's only used to ref

Re: [PATCH 2/3] Add read-cache--daemon

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 3:01 PM, Duy Nguyen wrote: > What do you think is a good replacement for unix socket on Windows? > It's only used to refresh the cache in the daemon, no sensitive data > sent over, so security is not a problem. I'm thinking maybe just > TCP/IP server, but that's going to be

Re: [PATCH 8/8] read-cache: inform the daemon that the index has been updated

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 1:15 PM, Nguyễn Thái Ngọc Duy wrote: > The daemon would immediately load the new index in memory in > background. Next time Git needs to read the index again, everything is > ready. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > cache.h | 1 + > read-cache.c | 53 +

Re: [PATCH 5/8] read-cache: try index data from shared memory

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 1:15 PM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > Documentation/config.txt | 4 > cache.h | 1 + > config.c | 12 > environment.c| 1 + > read-cache.c | 43 +

Re: [PATCH 2/8] unix-socket: stub impl. for platforms with no unix socket support

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 1:59 PM, Erik Faye-Lund wrote: > On Tue, May 13, 2014 at 1:15 PM, Nguyễn Thái Ngọc Duy > wrote: >> With this we can make unix_stream_* calls without #ifdef. >> >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> Makefile

Re: [PATCH 2/8] unix-socket: stub impl. for platforms with no unix socket support

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 1:15 PM, Nguyễn Thái Ngọc Duy wrote: > With this we can make unix_stream_* calls without #ifdef. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > Makefile | 2 ++ > unix-socket.h | 18 ++ > 2 files changed, 20 insertions(+) > > diff --git a/Makefile b

Re: [PATCH 4/8] Add read-cache--daemon for caching index and related stuff

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 1:15 PM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/Documentation/git-read-cache--daemon.txt > b/Documentation/git-read-cache--daemon.txt > new file mode 100644 > index 000..1b05be4 > --- /dev/null > +++ b/Documentation/git-read-cache--daemon.txt > @@ -0,0 +1,27 @@ > +

Re: [PATCH 2/3] Add read-cache--daemon

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 1:15 PM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/Makefile b/Makefile > index 028749b..98d22de 100644 > --- a/Makefile > +++ b/Makefile > @@ -1502,6 +1502,12 @@ ifdef HAVE_DEV_TTY > BASIC_CFLAGS += -DHAVE_DEV_TTY > endif > > +ifdef HAVE_SHM > + BASIC_CFLAGS

Re: Bug - Git reset --quiet not quiet

2014-05-13 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 11:38 AM, Johannes Sixt wrote: > Am 5/13/2014 11:09, schrieb Erik Faye-Lund: >> On Mon, May 12, 2014 at 9:16 PM, Thomas-Louis Laforest >> wrote: >>> When running this command on Git for Windows (version 1.9.2-preview20140411) >>> git r

Re: Bug - Git reset --quiet not quiet

2014-05-13 Thread Erik Faye-Lund
On Mon, May 12, 2014 at 9:16 PM, Thomas-Louis Laforest wrote: > Good afternoon, > > When running this command on Git for Windows (version 1.9.2-preview20140411) > git reset --quiet --hard with one file having read/write lock git ask this > question : > Unlink of file '' failed. Should I try a

Re: [PATCH 2/2] wincred: avoid overwriting configured variables

2014-05-12 Thread Erik Faye-Lund
On Tue, May 13, 2014 at 8:01 AM, Stepan Kasal wrote: > From: Pat Thoyts > Date: Wed, 24 Oct 2012 00:15:29 +0100 > > Signed-off-by: Pat Thoyts > Signed-off-by: Stepan Kasal > --- > contrib/credential/wincred/Makefile | 4 > 1 file changed, 4 deletions(-) > > diff --git a/contrib/credential

Re: [PATCH v1 04/25] contrib: remove 'buildsystems'

2014-05-09 Thread Erik Faye-Lund
On Fri, May 9, 2014 at 12:57 PM, Felipe Contreras wrote: > Erik Faye-Lund wrote: >> On Fri, May 9, 2014 at 11:32 AM, Felipe Contreras >> wrote: >> > Erik Faye-Lund wrote: >> >> On Fri, May 9, 2014 at 10:48 AM, Felipe Contreras >> >> > You think

Re: [PATCH v1 04/25] contrib: remove 'buildsystems'

2014-05-09 Thread Erik Faye-Lund
On Fri, May 9, 2014 at 11:32 AM, Felipe Contreras wrote: > Erik Faye-Lund wrote: >> On Fri, May 9, 2014 at 10:48 AM, Felipe Contreras >> wrote: >> > Erik Faye-Lund wrote: >> >> On Fri, May 9, 2014 at 10:14 AM, Felipe Contreras >> >> wrote: >

Re: [PATCH v1 04/25] contrib: remove 'buildsystems'

2014-05-09 Thread Erik Faye-Lund
On Fri, May 9, 2014 at 10:48 AM, Felipe Contreras wrote: > Erik Faye-Lund wrote: >> On Fri, May 9, 2014 at 10:14 AM, Felipe Contreras >> wrote: >> > If you want this script to remain in contrib, please: >> > >> > a) Write at least a few tests >>

Re: [PATCH v1 04/25] contrib: remove 'buildsystems'

2014-05-09 Thread Erik Faye-Lund
On Fri, May 9, 2014 at 10:14 AM, Felipe Contreras wrote: > Erik Faye-Lund wrote: >> On Fri, May 9, 2014 at 2:58 AM, Felipe Contreras >> wrote: >> > No activity since 2010, no documentation, no tests. >> > >> > Signed-off-by: Felipe Contreras >>

Re: [PATCH v1 04/25] contrib: remove 'buildsystems'

2014-05-09 Thread Erik Faye-Lund
On Fri, May 9, 2014 at 2:58 AM, Felipe Contreras wrote: > No activity since 2010, no documentation, no tests. > > Signed-off-by: Felipe Contreras > --- > contrib/buildsystems/Generators.pm| 42 -- > contrib/buildsystems/Generators/QMake.pm | 189 - > contrib/buildsystems/Genera

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

2014-05-06 Thread Erik Faye-Lund
On Mon, May 5, 2014 at 11:46 PM, Jeff King wrote: > On Sun, May 04, 2014 at 08:13:15AM +0200, Torsten Bögershausen wrote: > >> > 1. Tell everyone that NFD in the git repo is wrong, and >> > they should make a new commit to normalize all their >> > in-repo files to be precomposed. >> >

Re: [PATCH/RFC] Makefile: do not depend on curl-config

2014-05-05 Thread Erik Faye-Lund
On Wed, Apr 30, 2014 at 9:46 PM, Sebastian Schuberth wrote: > On Wed, Apr 30, 2014 at 6:52 PM, Johannes Schindelin > wrote: > >>> We can keep this patch in the msysGit repo for the 2.0 release. >> >> FWIW the plan is to switch to mingwGitDevEnv for the 2.0 release. It is >> not quite clear as of

Re: [msysGit] Re: #178 parsing of pretty=format:"%an %ad" causes fatal: bad revision '%ad'

2014-05-02 Thread Erik Faye-Lund
On Fri, May 2, 2014 at 7:23 PM, Jonathan Nieder wrote: > (resending with the correct address for the Git for Windows developers. > Sorry for the noise.) > Hi Dave, > > Dave Bradley wrote: > >> G:\ws_test_env\GIT_TESTBED_TMP\fest-swing-1.x>git log --all >> --pretty=format:"%an %ad" -- pom.xml >> x

Re: #178 parsing of pretty=format:"%an %ad" causes fatal: bad revision '%ad'

2014-05-02 Thread Erik Faye-Lund
On Fri, May 2, 2014 at 1:50 PM, Dave Bradley wrote: > Hi, > > I’m very new to ‘git’ github. I reported the #178 issue in github and the > issue has been closed, I believe this means no further discussion. When you say "the #178 issue in github", you really mean "issue #178 for Git for Windows on

Re: [PATCH v2] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-30 Thread Erik Faye-Lund
On Wed, Apr 30, 2014 at 5:13 PM, Junio C Hamano wrote: > I think something along the lines of > > ifdef CURLDIR > CURL_LIBCURL = > else > CURL_CONFIG = curl-config > CURL_LIBCURL := $(shell sh -c '$(CURL_CONFIG) --libs' > 2>/dev/null

Re: [PATCH/RFC] Makefile: do not depend on curl-config

2014-04-30 Thread Erik Faye-Lund
On Wed, Apr 30, 2014 at 5:27 PM, Junio C Hamano wrote: > Erik Faye-Lund writes: > >> MinGW builds of cURL does not ship with curl-config unless built >> with the autoconf based build system, which is not the practice >> recommended by the documentation. MsysGit has had is

Re: [PATCH/RFC] Makefile: do not depend on curl-config

2014-04-30 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 6:29 PM, Erik Faye-Lund wrote: > MinGW builds of cURL does not ship with curl-config unless built > with the autoconf based build system, which is not the practice > recommended by the documentation. MsysGit has had issues with > binaries of that sort, so it

Re: [PATCH v2] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-30 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 11:01 PM, Dave Borowitz wrote: > The original implementation of CURL_CONFIG support did not match the > original behavior of using -lcurl when CURLDIR was not set. This broke > implementations that were lacking curl-config but did have libcurl > installed along system libra

Re: [PATCH] wincred: add install target and avoid overwriting configured variables

2014-04-30 Thread Erik Faye-Lund
--- >> > Another one from msysGit project. >> > Original subject by Pat; I would suggest: >> > wincred: improve Makefile > > On Wed, Apr 30, 2014 at 11:21:17AM +0200, Erik Faye-Lund wrote: >> I'm a little bit unsure about this, because the makef

Re: [PATCH] wincred: add install target and avoid overwriting configured variables

2014-04-30 Thread Erik Faye-Lund
On Wed, Apr 30, 2014 at 8:46 AM, Stepan Kasal wrote: > From: Pat Thoyts > Date: Wed, 24 Oct 2012 00:15:29 +0100 > > Signed-off-by: Pat Thoyts > Signed-off-by: Stepan Kasal > --- > Another one from msysGit project. > Original subject by Pat; I would suggest: > wincred: improve Makefile I'm

Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-30 Thread Erik Faye-Lund
On Wed, Apr 30, 2014 at 10:35 AM, Karsten Blees wrote: > Am 29.04.2014 11:12, schrieb Marat Radchenko: >> On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. >> Fix `warning: passing argument 2 of 'mingw_main' from incompatible >> pointer type` in http-fetch.c and remote-curl.c by dr

Re: [PATCH 03/12] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 9:59 PM, Torsten Bögershausen wrote: > On 2014-04-28 15.51, Marat Radchenko wrote: >> mingw-w64 has lseek defined in io.h. > [] >> #define off_t off64_t >> +#ifndef lseek >> #define lseek _lseeki64 >> +#endif > Is the commit message in line with the code? > > I would have

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 8:39 PM, Dave Borowitz wrote: > On Mon, Apr 28, 2014 at 11:31 AM, Junio C Hamano wrote: >> Erik Faye-Lund writes: >> >>> We're using Curl 7.30.0 in msysGit (and thus also Git for Windows), so >>> we should be able to include i

[PATCH/RFC] Makefile: do not depend on curl-config

2014-04-28 Thread Erik Faye-Lund
. Instead, add a check for curl_multi_init to our configure-script, for those on ancient system. They probably already need to do the configure-dance anyway. Signed-off-by: Erik Faye-Lund --- OK, here's a proper patch. I've even tested it! ;) Makefile | 8 +++- configure.ac

Re: [PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 6:23 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 05:26:38PM +0200, Erik Faye-Lund wrote: >> On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko >> wrote: >> > Also, fix `warning: passing argument 2 of 'mingw_main' from >&

Re: [PATCH v2] Sleep 1 millisecond in poll() to avoid busy wait

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 5:35 PM, Stepan Kasal wrote: > From: theoleblond > Date: Wed, 16 May 2012 06:52:49 -0700 > > SwitchToThread() only gives away the rest of the current time slice > to another thread in the current process. So if the thread that feeds > the file decscriptor we're polling is

Re: [PATCH 06/12] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from compile definitions

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > -D__USE_MINGW_ACCESS only affects MinGW and does nothing when > MSVC is used. Seems reasonable in itself. But, doesn't this mean that our access are currently broken on MSVC? The comment about __USE_MINGW_ACCESS is: /* Old versions of M

Re: [RFC/PATCH v1] Towards MinGW(-W64) cross-compilation

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > This patch series fixes building on modern MinGW and (32bit only yet) > MinGW-W64. > > *Compilation* tested on: > - MSVC (via WinGit environment) > - msysGit environment > - Linux cross-toolchain i686-pc-mingw32 (4.8.2) with mingw-runti

Re: [PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > Also, fix `warning: passing argument 2 of 'mingw_main' from > incompatible pointer type` in http-fetch.c and remote-curl.c. These seems completely unrelated, perhaps it should be split in two? -- To unsubscribe from this list: send the lin

Re: [PATCH 11/12] MINGW: do not fail at redefining pid_t on MinGW-W64

2014-04-28 Thread Erik Faye-Lund
> + > static __inline int strcasecmp (const char *s1, const char *s2) > { > int size1 = strlen(s1); Looks good! Acked-by: Erik Faye-Lund -- 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 10/12] MINGW: config.mak.uname: drop USE_NED_ALLOCATOR

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > nedalloc was initially added in f0ed82 to fix slowness of standard WinXP > memory allocator. Since WinXP is EOLed, this point is no longer valid. > > The actual reason behind this commit is incompatibility of malloc.c.h > with MinGW-W64 hea

Re: [PATCH 12/12] MINGW: compat/mingw.h: drop fork() definition

2014-04-28 Thread Erik Faye-Lund
; } > static inline int fchmod(int fildes, mode_t mode) > { errno = ENOSYS; return -1; } > -static inline pid_t fork(void) > -{ errno = ENOSYS; return -1; } > static inline unsigned int alarm(unsigned int seconds) > { return 0; } > static inline int fsync(int fd) I

Re: [PATCH 03/12] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 5:09 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 05:02:09PM +0200, Erik Faye-Lund wrote: >> msysGit has a declaration of it in io.h as well. But it's not a >> preprocessor-definition... Are you saying that it's a >> preprocessor-defi

Re: [PATCH 07/12] MINGW: config.mak.uname: reorganize MINGW settings

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 5:04 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 04:58:11PM +0200, Erik Faye-Lund wrote: >> On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko >> wrote: >> > HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to >> > msysGi

Re: [PATCH 05/12] MINGW: git-compat-util.h: use inttypes.h for printf macros.

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 5:00 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 04:53:52PM +0200, Erik Faye-Lund wrote: >> Just checking that I understand: Does this mean that we now require an >> MSVC-version that has stdint.h? If so, I'm not against such a case. >> I

Re: [PATCH 03/12] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > mingw-w64 has lseek defined in io.h. msysGit has a declaration of it in io.h as well. But it's not a preprocessor-definition... Are you saying that it's a preprocessor-define in mingw-w64, that points to a 64-bit version? If so, looks good

Re: [PATCH 07/12] MINGW: config.mak.uname: reorganize MINGW settings

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to > msysGit, they're general MinGW settings. Actually, HAVE_LIBCHARSET_H is. It's only present because we have libiconv installed. -- To unsubscribe from this list: send the line "

Re: [PATCH 09/12] MINGW: config.mak.uname: drop -DNOGDI

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI. > > Unfortunately, including wingdi.h brings in #define ERROR 0 which > conflicts with several Git internal enums. So, #undef ERROR. > > Signed-off-by: Marat Radchenko

Re: [PATCH 02/12] MINGW: compat/bswap.h: include stdint.h

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 4:52 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 04:45:43PM +0200, Erik Faye-Lund wrote: >> bswap.h is included after stdint.h from git-compat-util.h anyway... > > That only becomes true after PATCH 05 when talking about MinGW. > > Will

Re: [PATCH 05/12] MINGW: git-compat-util.h: use inttypes.h for printf macros.

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > Also, pass -D__USE_MINGW_ANSI_STDIO=0 to select MSVCRT-compatible > macro definitions. > > Signed-off-by: Marat Radchenko > --- > compat/mingw.h| 2 -- > compat/msvc.h | 3 +++ > config.mak.uname | 3 ++- > git-compat-util.h |

Re: [PATCH 02/12] MINGW: compat/bswap.h: include stdint.h

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > bswap.h uses uint32_t type which might not be defined. > This patch adds direct include so bswap.h can be safely included. > > Signed-off-by: Marat Radchenko > --- > compat/bswap.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git

Re: [msysGit] Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:47 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 03:20:46PM +0200, Johannes Schindelin wrote: >> That way, upstream Git does not have anything to change (and we avoid >> discussing five versions of essentially the same patch :-P). > > This bug isn't specific to msy

Re: [msysGit] Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:20 PM, Johannes Schindelin wrote: > Hi kusma, > > On Mon, 28 Apr 2014, Erik Faye-Lund wrote: > >> On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund wrote: >> > So it seems that 08900987 ("Decide whether to build http-push in the >&g

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund wrote: > On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund wrote: >> So it seems that 08900987 ("Decide whether to build http-push in the >> Makefile") makes a bad assumption about the availability of >> curl-conf

Re: [PATCH] poll/select: prevent busy-waiting

2014-04-28 Thread Erik Faye-Lund
out == INFTIM) > { > - SwitchToThread(); > + SleepEx (1, TRUE); > goto restart; > } > > -- > 1.9.2.msysgit.0.158.g6070cee > Thanks for taking the effort! Acked-by: Erik Faye-Lund -- 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: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund wrote: > On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund wrote: >> So it seems that 08900987 ("Decide whether to build http-push in the >> Makefile") makes a bad assumption about the availability of >> curl-conf

Re: [PATCH] Sleep 1 millisecond in poll() to avoid busy wait

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 10:39 AM, Stepan Kasal wrote: > From: theoleblond > Date: Wed, 16 May 2012 06:52:49 -0700 > > I played around with this quite a bit. After trying some more complex > schemes, I found that what worked best is to just sleep 1 millisecond > between iterations. Though it's a v

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund wrote: > So it seems that 08900987 ("Decide whether to build http-push in the > Makefile") makes a bad assumption about the availability of > curl-config on new libcurl installations; it's not present on "stock" &

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 9:36 AM, Marat Radchenko wrote: > Silvola Tuomas wrote >> Hello, >> >> I installed git for windows 1.9.0 but any push operation I tried with it >> produced an error message saying "git: 'http-push' is not a git command". >> Other commands like pull, add, and commit worked j

Re: [PATCH v3] send-email: recognize absolute path on Windows

2014-04-23 Thread Erik Faye-Lund
On Tue, Apr 22, 2014 at 6:50 PM, Junio C Hamano wrote: > Erik Faye-Lund writes: > >>>> Shouldn't the latter also be anchored at the beginning of the string >>>> with a leading "^"? >>>> >>>>> +} >>>>&

Re: [PATCH v3] send-email: recognize absolute path on Windows

2014-04-22 Thread Erik Faye-Lund
On Wed, Apr 16, 2014 at 7:19 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Erik Faye-Lund writes: >> >>> So let's manually check for these in that case, and fall back to >>> the File::Spec-helper on other platforms (e.g Win

Re: [PATCH 6/6] xdiff/xprepare.c: reduce scope of variables

2014-04-16 Thread Erik Faye-Lund
On Wed, Apr 16, 2014 at 11:33 AM, Elia Pinto wrote: > Signed-off-by: Elia Pinto > --- > xdiff/xprepare.c |5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c > index 63a22c6..e0b6987 100644 > --- a/xdiff/xprepare.c > +++ b/xdiff/xpr

Re: [PATCH 4/6] contrib/credential/osxkeychain/git-credential-osxkeychain.c: reduce scope of variables

2014-04-16 Thread Erik Faye-Lund
On Wed, Apr 16, 2014 at 11:33 AM, Elia Pinto wrote: > Signed-off-by: Elia Pinto > --- > contrib/credential/osxkeychain/git-credential-osxkeychain.c |8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c > b

Re: [PATCH 5/6] contrib/credential/wincred/git-credential-wincred.c: reduce scope of variables

2014-04-16 Thread Erik Faye-Lund
On Wed, Apr 16, 2014 at 11:33 AM, Elia Pinto wrote: > Signed-off-by: Elia Pinto > --- > contrib/credential/wincred/git-credential-wincred.c |6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/contrib/credential/wincred/git-credential-wincred.c > b/contrib/credentia

[PATCH v3] send-email: recognize absolute path on Windows

2014-04-16 Thread Erik Faye-Lund
From: Erik Faye-Lund On Windows, absolute paths might start with a DOS drive prefix, which these two checks failed to recognize. Unfortunately, we cannot simply use the file_name_is_absolute helper in File::Spec::Functions, because Git for Windows has an MSYS-based Perl, where this helper

Re: Re* [PATCH] send-email: recognize absolute path on Windows

2014-04-15 Thread Erik Faye-Lund
On Tue, Apr 15, 2014 at 10:37 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Thanks, both. I'd expect another round then? >> >> -- >8 -- >> From: Erik Faye-Lund >> >> On Windows, absolute paths might start with a DOS drive prefix,

Re: [PATCH] send-email: recognize absolute path on Windows

2014-04-15 Thread Erik Faye-Lund
On Tue, Apr 15, 2014 at 12:42 PM, Erik Faye-Lund wrote: > On Tue, Apr 15, 2014 at 12:32 PM, Johannes Sixt wrote: >> Am 4/15/2014 10:44, schrieb Erik Faye-Lund: >>> From: Erik Faye-Lund >>> >>> On Windows, absolute paths might start with a DOS drive p

  1   2   3   >