Re: [msysGit] [PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

On Thu, Oct 09, 2014 at 09:22:19PM +0200, Johannes Schindelin wrote: Hi, On Wed, 8 Oct 2014, Marat Radchenko wrote: +CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2/dev/null || echo not') There is a rather huge problem with that. The latest mingw-w64 release, 4.9.1, does not do what you

Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

On Thu, Oct 09, 2014 at 12:34:25AM -0700, Junio C Hamano wrote: No, and I do not quite see why you even need to look at -dumbmachine output when your goal is to make this command line $ make uname_O=MINGW uname_S=MINGW work sensibly. Wouldn't it be more like a series of

Re: [msysGit] [PATCH v5] MinGW(-W64) compilation

On Thu, Oct 09, 2014 at 12:11:01PM +0200, Johannes Schindelin wrote: I also added one patch I find highly convenient: https://github.com/dscho/git/commit/29749c7d7b4638c63369d6cf067f5d524d0092f9 There already were two attempts to this issue: 1.

Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation

On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote: Hi Marat, On Wed, 8 Oct 2014, Marat Radchenko wrote: That's not what msysgit folks say (they say that msysgit is the development environment to build Git for Windows [*1*]). Aaargh! msys != msysgit != Git for Windows SDK

Re: [msysGit] [PATCH v4] MinGW(-W64) compilation

On Wed, Oct 08, 2014 at 11:40:17AM +0200, Johannes Schindelin wrote: To make it easier to review and substantially easier to work on this patch series with Git, I opened a pull request on GitHub: https://github.com/msysgit/git/pull/264 1. I fail to see how using a tool that doesn't

[PATCH 06/14] MINGW: compat/winansi.c: do not redefine CONSOLE_FONT_INFOEX

Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined in wincon.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/winansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/winansi.c b/compat/winansi.c index efc5bb3..0ac3297 100644

[PATCH 09/14] MINGW: config.mak.uname: reorganize MinGW settings

of this commit. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index c7aaa1c..f79c0e0 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -532,11 +532,11 @@ ifneq

[PATCH 04/14] MINGW: do not fail at redefining pid_t on MinGW-W64

pid_t is available in sys/types.h on both MinGW and MinGW-W64 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 1 - compat/msvc.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat

[PATCH 08/14] MINGW: git-compat-util.h: use inttypes.h for printf macros

of stdint.h but hopefully that is not a problem. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h| 2 -- compat/msvc.h | 3 +++ config.mak.uname | 3 ++- git-compat-util.h | 11 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compat/mingw.h

[PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

From: Ray Donnelly mingw.andr...@gmail.com Signed-off-by: Ray Donnelly mingw.andr...@gmail.com Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 324a7fc

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

Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index 5e499cf..36a47cb

[PATCH 03/14] MINGW: compat/mingw.h: drop fork() definition

fork() is not used in MinGW builds but causes a compiler warning on x86_64 MinGW-W64: conflicting types for built-in function 'fork' Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 -- 1 file changed, 2 deletions(-) diff

[PATCH v5] MinGW(-W64) compilation

This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64). *Compilation* tested on: - MSVC - msysGit environment (twice) - Linux cross-toolchain i686-pc-mingw32 - Linux cross-toolchain i686-w64-mingw32 - Linux cross-toolchain x86_64-w64-mingw32 Also, this patchset

[PATCH 05/14] MINGW: config.mak.uname: allow using cURL for non-msysGit builds

Is it absolutely valid and possible to have cURL in generic MinGW environment. Building Git without cURL is still possible by passing NO_CURL=1 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 -- 1 file changed, 2

[PATCH 02/14] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from CFLAGS

-D__USE_MINGW_ACCESS only affects MinGW and does nothing when MSVC is used. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b

[PATCH 10/14] Makefile: introduce CROSS_COMPILE variable

-linux-gnu- then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- Makefile | 19 +-- config.mak.uname | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f34a2d4

[PATCH 12/14] Fix pointer - integer casts on IL32P64 systems

to intptr_t. [1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.c| 8 compat/poll/poll.c| 2 +- compat/regex/regcomp.c| 4 ++-- compat/regex/regex_internal.h | 1

[PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems

Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat-util.h index b338277..101c9d7 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -474,7 +474,7 @@ extern int

[PATCH 11/14] compat/nedmalloc/malloc.c.h: fix compilation under MinGW-W64

version of FORCEINLINE. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/nedmalloc/malloc.c.h | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index f216a2a..a6c8cac 100644 --- a/compat/nedmalloc

[PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

When crosscompiling, one cannot rely on `uname` from host system. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 5 + 1 file changed, 5 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 9f7037e..182da50 100644 --- a/config.mak.uname +++ b

Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

On Wed, Oct 08, 2014 at 12:26:52PM -0700, Junio C Hamano wrote: Marat Radchenko ma...@slonopotamus.org writes: When crosscompiling, one cannot rely on `uname` from host system. That may well be true, but is that limited to cross-compiling to mingw? Would it be generally true for any

Re: [PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems

On Wed, Oct 08, 2014 at 01:02:10PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Marat Radchenko ma...@slonopotamus.org writes: Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion

Re: [PATCH v4] MinGW(-W64) compilation

On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote: Am 30.09.2014 um 09:02 schrieb Marat Radchenko: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) Hi Marat, I wanted

Re: [PATCH v4] MinGW(-W64) compilation

On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). Junio, ping? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [msysGit] [PATCH 12/14] Fix pointer - integer casts on IL32P64 systems

On Mon, Sep 29, 2014 at 10:43:41PM +0200, Johannes Sixt wrote: Am 28.09.2014 um 15:24 schrieb Marat Radchenko: This commit touches regcomp.c and poll.c from Gnulib, both were fixed upstream in 2012 the same way. Wrt ShellExecute, see [1]. [1]: http://blogs.msdn.com/b/oldnewthing

[PATCH v4] MinGW(-W64) compilation

This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) - Linux cross-toolchain i686-pc-mingw32 - Linux cross-toolchain i686-w64-mingw32 - Linux cross-toolchain x86_64-w64-mingw32 Attention: in order

[PATCH 09/14] MINGW: config.mak.uname: reorganize MinGW settings

of this commit. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index c7aaa1c..f79c0e0 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -532,11 +532,11 @@ ifneq

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

Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index df0e320..ed79368

[PATCH 05/14] MINGW: config.mak.uname: allow using cURL for non-msysGit builds

Is it absolutely valid and possible to have cURL in generic MinGW environment. Building Git without cURL is still possible by passing NO_CURL=1 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 -- 1 file changed, 2

[PATCH 06/14] MINGW: compat/winansi.c: do not redefine CONSOLE_FONT_INFOEX

Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined in wincon.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/winansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/winansi.c b/compat/winansi.c index efc5bb3..0ac3297 100644

[PATCH 03/14] MINGW: compat/mingw.h: drop fork() definition

fork() is not used in MinGW builds but causes a compiler warning on x86_64 MinGW-W64: conflicting types for built-in function 'fork' Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 -- 1 file changed, 2 deletions(-) diff

[PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

From: Ray Donnelly mingw.andr...@gmail.com Signed-off-by: Ray Donnelly mingw.andr...@gmail.com Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 324a7fc

[PATCH 08/14] MINGW: git-compat-util.h: use inttypes.h for printf macros

of stdint.h but hopefully that is not a problem. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h| 2 -- compat/msvc.h | 3 +++ config.mak.uname | 3 ++- git-compat-util.h | 11 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compat/mingw.h

[PATCH 04/14] MINGW: do not fail at redefining pid_t on MinGW-W64

pid_t is available in sys/types.h on both MinGW and MinGW-W64 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 1 - compat/msvc.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat

[PATCH 02/14] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from CFLAGS

-D__USE_MINGW_ACCESS only affects MinGW and does nothing when MSVC is used. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b

[PATCH 12/14] Fix pointer - integer casts on IL32P64 systems

/archive/2006/11/08/1035971.aspx Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.c| 8 compat/poll/poll.c| 2 +- compat/regex/regcomp.c| 4 ++-- compat/regex/regex_internal.h | 1 + compat/win32/pthread.h| 2 +- compat

[PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

When crosscompiling, one cannot rely on `uname` from host system. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 5 + 1 file changed, 5 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 9f7037e..182da50 100644 --- a/config.mak.uname +++ b

[PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems

Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat-util.h index 9d2d5ab..5f6659c 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -474,7 +474,7 @@ extern int

[PATCH 10/14] Makefile: introduce CROSS_COMPILE variable

-linux-gnu- then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- Makefile | 19 +-- config.mak.uname | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f34a2d4

[PATCH 11/14] compat/nedmalloc/malloc.c.h: fix compilation under MinGW-W64

version of FORCEINLINE. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/nedmalloc/malloc.c.h | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index f216a2a..a6c8cac 100644 --- a/compat/nedmalloc

[PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

From: Ray Donnelly mingw.andr...@gmail.com Signed-off-by: Ray Donnelly mingw.andr...@gmail.com Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 324a7fc

[PATCH 08/14] MINGW: git-compat-util.h: use inttypes.h for printf macros

of stdint.h but hopefully that is not a problem. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h| 2 -- compat/msvc.h | 3 +++ config.mak.uname | 3 ++- git-compat-util.h | 11 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compat/mingw.h

[PATCH 05/14] MINGW: config.mak.uname: allow using cURL for non-msysGit builds

Is it absolutely valid and possible to have cURL in generic MinGW environment. Building Git without cURL is still possible by passing NO_CURL=1 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 -- 1 file changed, 2

MinGW(-W64) compilation

This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC (via WinGit environment) - msysGit environment - Linux cross-toolchain i686-pc-mingw32 - Linux cross-toolchain i686-w64-mingw32 - Linux cross-toolchain x86_64-w64-mingw32

[PATCH 02/14] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from CFLAGS

-D__USE_MINGW_ACCESS only affects MinGW and does nothing when MSVC is used. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b

[PATCH 06/14] MINGW: compat/winansi.c: do not redefine CONSOLE_FONT_INFOEX

Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined in wincon.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/winansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/winansi.c b/compat/winansi.c index efc5bb3..0ac3297 100644

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

Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index df0e320..ed79368

[PATCH 04/14] MINGW: do not fail at redefining pid_t on MinGW-W64

pid_t is available in sys/types.h on both MinGW and MinGW-W64 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 1 - compat/msvc.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat

[PATCH 09/14] MINGW: config.mak.uname: reorganize MinGW settings

of this commit. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index c7aaa1c..f79c0e0 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -532,11 +532,11 @@ ifneq

[PATCH 03/14] MINGW: compat/mingw.h: drop fork() definition

fork() is not used in MinGW builds but causes a compiler warning on x86_64 MinGW-W64: conflicting types for built-in function 'fork' Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 -- 1 file changed, 2 deletions(-) diff

[PATCH 10/14] Makefile: introduce CROSS_COMPILE variable

-linux-gnu- then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- Makefile | 19 +-- config.mak.uname | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f34a2d4

[PATCH 11/14] compat/nedmalloc/malloc.c.h: fix compilation under MinGW-W64

version of FORCEINLINE. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/nedmalloc/malloc.c.h | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index f216a2a..a6c8cac 100644 --- a/compat/nedmalloc

[PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

When crosscompiling, one cannot rely on `uname` from host system. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 5 + 1 file changed, 5 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 9f7037e..182da50 100644 --- a/config.mak.uname +++ b

[PATCH 12/14] Fix pointer - integer casts on IL32P64 systems

This commit touches regcomp.c and poll.c from Gnulib, both were fixed upstream in 2012 the same way. Wrt ShellExecute, see [1]. [1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.c | 8

[PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems

Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat-util.h index 9d2d5ab..5f6659c 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -474,7 +474,7 @@ extern int

[ANNOUNCE] git-as-svn: subversion frontend server for git repository

Some time ago I complained [1] about troubles using Git on a project with high ratio of non-programmers. Since then, a conclusion was made: Git is too complex. While Git provides many nice advanced stuff, its simplest workflow isn't simple enough. So we examined other options: * Splitting

Re: [ANNOUNCE] git-as-svn: subversion frontend server for git repository

On Tue, Sep 09, 2014 at 09:49:03AM -0700, Junio C Hamano wrote: Marat Radchenko ma...@slonopotamus.org writes: Some time ago I complained [1] about troubles using Git on a project with high ratio of non-programmers. ... Then, a lost'n'forgotten git_svn_server [4] was found

[BUG] git push writes to stderr instead of stdout on success

`git push` writes to stderr instead of stdout Steps to reproduce: mkdir foo cd foo git init echo foo fo git add -A git commit -am foo git push . HEAD:refs/heads/newbranch 2out Expected: `out` file is empty Actual: `out` file contents: To . * [new branch] HEAD - newbranch

Re: [BUG] git push writes to stderr instead of stdout on success

On Mon, May 19, 2014 at 11:49:09AM -0400, Jeff King wrote: On Mon, May 19, 2014 at 07:03:58PM +0400, Marat Radchenko wrote: `git push` writes to stderr instead of stdout That's by design. Which one is correct is largely a matter of philosophy / mental model. This case has been

Re: [PATCH 10/12] MINGW: compat/poll/poll.c: undef NOGDI

On Sun, May 04, 2014 at 08:52:44PM +0200, Stepan Kasal wrote: Thank you very much for this analysis. It enables us to redirect you the third time: to report this as a bug in MinGW-W64 ! ;-) I'll report this to MinGW-W64 soon, though even if/when they fix the issue on their side, I'd still

Re: [PATCH] MSVC: link dynamically to the CRT

On Wed, Apr 30, 2014 at 12:54:15PM -0700, Junio C Hamano wrote: Sebastian Schuberth sschube...@gmail.com writes: On 30.04.2014 20:36, Junio C Hamano wrote: I am not intimate with the msysgit developer community, and I do not know if it is appropriate for me to respond with a Does

Re: [PATCH 10/12] MINGW: compat/poll/poll.c: undef NOGDI

On Wed, Apr 30, 2014 at 01:41:25PM +0200, Stepan Kasal wrote: Hello, On Tue, Apr 29, 2014 at 01:12:04PM +0400, Marat Radchenko wrote: On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI. Removal -DNOGDI=1 from config.mak.uname has an undesirable effect of bringing

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

On Wed, Apr 30, 2014 at 10:35:56AM +0200, 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

Re: [PATCH 10/12] MINGW: config.mak.uname: drop USE_NED_ALLOCATOR

On Mon, Apr 28, 2014 at 05:23:25PM +0200, Erik Faye-Lund wrote: On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko ma...@slonopotamus.org 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

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

Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index e033e72..262b300

[PATCH v2] MinGW(-W64) cross-compilation

Differences with v1: - Dropped MINGW: compat/bswap.h: include stdint.h, it isn't needed after MINGW: git-compat-util.h: use inttypes.h for printf macros - Split MINGW: config.mak.uname allow using CURL for non-msysGit builds into MINGW: config.mak.uname: allow using cURL for non-msysGit

[PATCH 09/12] Makefile: introduce CROSS_COMPILE variable

-linux-gnu- then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- Makefile | 19 +-- config.mak.uname | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 74a929b

[PATCH 02/12] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from CFLAGS

-D__USE_MINGW_ACCESS only affects MinGW and does nothing when MSVC is used. Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b

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

fork() is not used in MinGW builds but causes a compiler warning on x86_64 MinGW-W64: conflicting types for built-in function 'fork' Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 2 -- 1 file changed, 2 deletions(-) diff

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

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 dropping 'const'. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- http-fetch.c | 5 +++-- remote

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

pid_t is available in sys/types.h on both MinGW and MinGW-W64 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- compat/mingw.h | 1 - compat/msvc.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat

[PATCH 11/12] compat/nedmalloc/malloc.c.h: fix compilation under MinGW-W64

version of FORCEINLINE. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/nedmalloc/malloc.c.h | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index f216a2a..a6c8cac 100644 --- a/compat/nedmalloc

[PATCH 10/12] MINGW: compat/poll/poll.c: undef NOGDI

On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI. Removal -DNOGDI=1 from config.mak.uname has an undesirable effect of bringing in wingdi.h with weird #define ERROR 0 that conflicts with internal Git enums. So, just #undef NOGDI in compat/poll/poll.c. Signed-off-by: Marat

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

-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 50c1114..b68a7d1 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -516,11 +516,11 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT

[PATCH 05/12] MINGW: config.mak.uname: allow using cURL for non-msysGit builds

Is it absolutely valid and possible to have cURL in generic MinGW environment. Building Git without cURL is still possible by passing NO_CURL=1 Signed-off-by: Marat Radchenko ma...@slonopotamus.org Acked-by: Eric Faye-Lund kusmab...@gmail.com --- config.mak.uname | 2 -- 1 file changed, 2

Re: [PATCH v5 1/6] pull: rename pull.rename to pull.mode

Felipe Contreras wrote [PATCH v5 1/6] pull: rename pull.rename to pull.mode s/pull.rename/pull.rebase/ -- View this message in context: http://git.661346.n2.nabble.com/PATCH-v5-0-6-Reject-non-ff-pulls-by-default-tp7609118p7609129.html Sent from the git mailing list archive at Nabble.com. --

A failing attempt to use Git in a centralized environment

Setup: 20 people (programmers, artists, designers) with prior SVN knowledge and a desire to use Git for a new project (mostly on programmers side). Non-programmers used TortoiseSVN before so choosing TortoiseGit as a GUI was an obvios step. We made an in-house presentation introducing basic

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

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 just fine. At the end of this day I noticed that C:\Program Files

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

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 msysGit but also affects all environments where curl-config is not

[PATCH 01/12] MINGW: config.mak.uname: add explicit way to request MinGW-build

When crosscompiling, one cannot rely on `uname` from host system. Thus, add an option to use `make MINGW=1` for building MinGW build from non-MinGW host (Linux, for example). Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 5 + 1 file changed, 5 insertions

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

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 ma...@slonopotamus.org --- compat/bswap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index 120c6c1

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

Also, pass -D__USE_MINGW_ANSI_STDIO=0 to select MSVCRT-compatible macro definitions. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h| 2 -- compat/msvc.h | 3 +++ config.mak.uname | 3 ++- git-compat-util.h | 11 ++- 4 files changed, 11 insertions

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

HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to msysGit, they're general MinGW settings. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index

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

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 ma...@slonopotamus.org --- config.mak.uname | 4 ++-- git-compat

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

Also, fix `warning: passing argument 2 of 'mingw_main' from incompatible pointer type` in http-fetch.c and remote-curl.c. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 2 -- http-fetch.c | 5 +++-- remote-curl.c| 2 +- 3 files changed, 4 insertions(+), 5

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

-D__USE_MINGW_ACCESS only affects MinGW and does nothing when MSVC is used. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b/config.mak.uname index e5edae6..dc87e21 100644

[PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

To ease cross-compilation process, introduce a single variable with the prefix to all compiler-related executables. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- Makefile | 13 + config.mak.uname | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff

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

mingw-w64 has lseek defined in io.h. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index e033e72..262b300 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -265,7 +265,9 @@ static

[PATCH 10/12] MINGW: config.mak.uname: drop USE_NED_ALLOCATOR

newer. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 4883fd5..3fea7a8 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -342,7 +342,6 @@ ifeq ($(uname_S),Windows

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

pid_t is available in sys/types.h on both MinGW and MinGW-W64 Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h | 1 - compat/msvc.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat/mingw.h index c502a22..8850109 100644

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

fork() is not used in MinGW builds but causes a compiler warning on x86_64 MinGW-W64: conflicting types for built-in function 'fork' Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index

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

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-runtime-3.20.2 - Linux cross-toolchain i686-w64-mingw32 (4.8.2) with

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

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 drop this one. -- To unsubscribe from this list: send the line unsubscribe git in the body of

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

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. IMO, the biggest benefit of using MSVC is not building on legacy systems, but being able to

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

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 ma...@slonopotamus.org 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

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

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-define in mingw-w64, that points to a 64-bit version? If so, looks good. MinGW is x86 only.

Re: [PATCH 10/12] MINGW: config.mak.uname: drop USE_NED_ALLOCATOR

Did you measure that malloc on newer Windows-versions are actually faster? No, I didn't. As I said, real reason for this patch is that Git version of nedalloc fails to compile under MinGW-W64. If we still want to use nedalloc under MinGW, this patch should be replaced with: a) Updating

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

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 ma...@slonopotamus.org 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

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

On Mon, Apr 28, 2014 at 05:17:25PM +0200, Erik Faye-Lund wrote: 1. What are other ways to provide iconv on MinGW? I'm not sure I understand. To set HAVE_LIBCHARSET_H, we need to have libcharset.h. MinGW doesn't supply by default to my knowledge, so we get it from iconv. The THIS_IS_MSYSGIT

Re: [PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

On Mon, Apr 28, 2014 at 12:37:42PM -0500, Felipe Contreras wrote: +CC = $(CROSS_COMPILE)cc Nice. Actually, not. You still have to override CC because it is $(CROSS_COMPILE)*g*cc. Any thoughts how to handle this? - RC = windres -O coff + RC = $(CROSS_COMPILE)windres -O coff I

  1   2   >