Re: [PATCH v3 00/32] nd/multiple-work-trees

2014-09-28 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: On Fri, Sep 26, 2014 at 4:20 AM, Junio C Hamano gits...@pobox.com wrote: It has been a while since the last review exchanges were seen.  Will it be time for v3 soon? Sorry I've been slow on picking up feedback from v2. v3 is rebased on latest

[PATCH] Do not make trace.c/getnanotime an inlined function

2014-09-28 Thread Ben Walton
Oracle Studio compilers don't allow for static variables in functions that are defined to be inline. GNU C does permit this. Let's reference the C99 standard though, which doesn't allow for inline functions to contain modifiable static variables. Signed-off-by: Ben Walton bdwal...@gmail.com ---

[no subject]

2014-09-28 Thread bambecapuno06
N�r��yb�X��ǧv�^�)޺{.n�+ا���ܨ}���Ơz�j:+v���zZ+��+zf���h���~i���z��w���?��)ߢf

Re: [PATCH RFC] git-am: support any number of signatures

2014-09-28 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com On Thu, Sep 25, 2014 at 3:04 AM, Christian Couder christian.cou...@gmail.com wrote: To an existing message ends with Michael's Signed-off-by:, if his git am --trailer arts is called to add these three and then a Signed-off-by: from him, should it add an

Re: [PATCH] init - Honour the global core.filemode setting

2014-09-28 Thread Torsten Bögershausen
On 2014-09-28 02.37, Hilco Wijbenga wrote: If ~/.gitconfig contains a core.filemode entry then git init should honour that setting. Signed-off-by: Hilco Wijbenga hilco.wijbe...@gmail.com --- This bit me at work where I have to work with Windows. Git on Cygwin and the Eclipse Git plugin do

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

2014-09-28 Thread Marat Radchenko
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

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

2014-09-28 Thread Marat Radchenko
All MinGW flavors have inttypes.h, so just include it. However, we need to pass -D__USE_MINGW_ANSI_STDIO=1 to select GNU-compatible macro definitions on MinGW-W64: http://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/ As a side-effect, Git no longer builds with MSVC 2010 due to its lack of

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

2014-09-28 Thread Marat Radchenko
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

2014-09-28 Thread Marat Radchenko
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

2014-09-28 Thread Marat Radchenko
-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

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

2014-09-28 Thread Marat Radchenko
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

2014-09-28 Thread Marat Radchenko
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

2014-09-28 Thread Marat Radchenko
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

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

2014-09-28 Thread Marat Radchenko
HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to msysGit, they're general MinGW settings. Logic behind HAVE_LIBCHARSET_H: if user is on MinGW and has iconv, we expect him to have libcharset.h. If user doesn't have iconv, he has to explicitly say so via NO_ICONV=1 regardless of this

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

2014-09-28 Thread Marat Radchenko
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

2014-09-28 Thread Marat Radchenko
To ease cross-compilation process, introduce a single variable with the prefix to all compiler-related executables. Define CROSS_COMPILE=foo- if your compiler and binary utilities are foo-cc, foo-ar, foo-strip, etc. More specific variables override this, so if you set CC=gcc

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

2014-09-28 Thread Marat Radchenko
1. Unlike MinGW, MinGW-W64 already provides _ReadWriteBarrier macro, so don't try to redefine it. 2. MinGW-W64 has a strange definition FORCEINLINE as extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) 'extern' doesn't work together with 'static', so #undef MinGW-W64

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

2014-09-28 Thread Marat Radchenko
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 +++

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

2014-09-28 Thread 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/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

2014-09-28 Thread Marat Radchenko
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

Re: [PATCH] Do not make trace.c/getnanotime an inlined function

2014-09-28 Thread Johannes Sixt
Am 28.09.2014 um 09:50 schrieb Ben Walton: Oracle Studio compilers don't allow for static variables in functions that are defined to be inline. GNU C does permit this. Let's reference the C99 standard though, which doesn't allow for inline functions to contain modifiable static variables.

Re: [msysGit] MinGW(-W64) compilation

2014-09-28 Thread Johannes Schindelin
Hi Marat, On Sun, 28 Sep 2014, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). Awesome work! I'll have a look at it as soon as I can! Ciao, Johannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a

[PATCH] Use SHELL_PATH as hash bang in test suite askpass helper script.

2014-09-28 Thread Ben Walton
The askpass script that is created for use by the test suite should use SHELL_PATH for its hash bang instead of /bin/sh. Commit 5a4352024 introduced the use of idioms not supported in some legacy /bin/sh implementations. Signed-off-by: Ben Walton bdwal...@gmail.com --- t/lib-credential.sh | 4

Re: [PATCH] Use SHELL_PATH as hash bang in test suite askpass helper script.

2014-09-28 Thread Jeff King
On Sun, Sep 28, 2014 at 11:21:07PM +0100, Ben Walton wrote: The askpass script that is created for use by the test suite should use SHELL_PATH for its hash bang instead of /bin/sh. Commit 5a4352024 introduced the use of idioms not supported in some legacy /bin/sh implementations. Sounds