Git For Windows SDK - cannot build

2017-04-25 Thread Stepan Kasal
dependencies, I'm afraid. Hints or pointers to doc welcome. Stepan Kasal $ make LINK git-credential-store libgit.a(utf8.o): In function `reencode_string_iconv': /usr/src/git/utf8.c:463: undefined reference to `libiconv' /usr/src/git/utf8.c:463:(.text+0xf77): relocation truncated to fit

Re: [PATCH] merge-base: handle --fork-point without reflog

2016-10-13 Thread Stepan Kasal
Hello, thank you for this nice and quick fix of this corner case! Stepan

Re: Bug with git merge-base and a packed ref

2016-10-12 Thread Stepan Kasal
Hello, On Wed, Oct 12, 2016 at 12:32:09PM -0400, Jeff King wrote: > The --fork-point option looks in the reflog [...] > On Wed, Oct 12, 2016 at 12:37:16PM +0200, Stepan Kasal wrote: > > Could you please fix merge-base so that it understands packed refs? I bet you nailed it; nothing

Bug with git merge-base and a packed ref

2016-10-12 Thread Stepan Kasal
Hello, first, I observed a bug with git pull --rebase: if the remote branch got rebased and the loval branch was updated, pull tried to rebase the whole branch, not the local increment. A reproducer would look like that # in repo1: git checkout tmp cd .. git clone repo1 repo2 cd repo1 git

Re: interactive rebase results across shared histories

2016-02-26 Thread Stepan Kasal
Hello Seb, let me add a few things, perhaps they'll clean some misunderstandings. On Fri, Feb 26, 2016 at 03:12:46PM -0600, Seb wrote: > After cleaning up all the mess, I've ended up with a long master branch, > and a series of earlier commits that are not reachable from master. > Fortunately,

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-28 Thread Stepan Kasal
will not encounter any problem. (Supposing you do not change the line ending options, of course.) Finally, let me explain my previous statement: Am 27.04.2015 um 08:11 schrieb Stepan Kasal: Git does not support CRLF as the internal line separator. I'm often asked: How do I set up git so that it uses CRLF

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-27 Thread Stepan Kasal
Hello, On Sun, Apr 26, 2015 at 10:31:11PM -0700, Junio C Hamano wrote: [...] the commit you are proposing to revert [4d4813a5] was a misguided attempt to fix a non issue, [...] yes, it was this. So I propose to remove the whole commit, including the test case and add two new test cases.

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-26 Thread Stepan Kasal
a nice day, Stepan Kasal -- 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: [msysGit] Re: [PATCH 00/13] mingw unicode environment

2014-07-18 Thread Stepan Kasal
Hello Karsten, you wrote: However, if it *did* compile for you, I wonder where ALLOC_GROW (as of #02/13) and alloc_nr (as of #10/13) came from? Or did we recently remove '#include cache.h' from upstream mingw.c? you are right, the include needs to be added. To test my modifications, I

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

2014-07-17 Thread Stepan Kasal
-off-by: Pat Thoyts pattho...@users.sourceforge.net Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t4210-log-i18n.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh index 52a7472..9110404 100755 --- a/t/t4210-log-i18n.sh +++ b/t/t4210

[PATCH 0/6] mingw test fixes

2014-07-17 Thread Stepan Kasal
Hello, this is a collection of quality test suite fixes, hand picked with care, following the expert advice by Karsten. :-) Most of them just switch off the tests on MinGW, one uses `pwd -W' to get the reeal windows path. All of these are time proven, they have been in msysgit since Dec 2013,

[PATCH 3/6] MinGW: disable legacy encoding tests

2014-07-17 Thread Stepan Kasal
encoding in setup, so don't switch to ISO-8859-1 on MinGW. Note that i18n tests that do their encoding tricks via encoded files (such as t3900) are not affected by this. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t3901-i18n-patch.sh | 19

[PATCH 2/6] Disable t0110's high-bit test on Windows

2014-07-17 Thread Stepan Kasal
running strings $(echo -e '\x80') (where strings.exe is a MinGW program, not an MSys one) it will complain about not finding the file called 80. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t0110-urlmatch-normalization.sh | 2

[PATCH 6/6] t800[12]: work around MSys limitation

2014-07-17 Thread Stepan Kasal
. This version does not modify the body of the tests and is active on MinGW only. Commit-message-by: Johannes Schindelin johannes.schinde...@gmx.de Author: Stepan Kasal ka...@ucw.cz Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/annotate

[PATCH 5/6] t9902: mingw-specific fix for gitfile link files

2014-07-17 Thread Stepan Kasal
...@users.sourceforge.net Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t9902-completion.sh | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 1d1c106..f10a752 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh

[PATCH 1/6] MinGW: Skip test redirecting to fd 4

2014-07-17 Thread Stepan Kasal
From: Johannes Schindelin johannes.schinde...@gmx.de ... because that does not work in MinGW. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t0081-line-buffer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t

[PATCH 12/13] Win32: patch Windows environment on startup

2014-07-17 Thread Stepan Kasal
-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 9dc6bf6..6d4ec56 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1250,7

[PATCH 00/13] mingw unicode environment

2014-07-17 Thread Stepan Kasal
Hello, this is the remainder of Karsten's unicode branch, that is a time proven part of msysGit. (If this code is accepted, only one patch would only remain: gitk and git-gui fixes.) When rebasing Karsten's work, I have eliminated two commits: https://github.com/msysgit/git/commit/f967550

[PATCH 01/13] Revert Windows: teach getenv to do a case-sensitive search

2014-07-17 Thread Stepan Kasal
that it works on Windows (i.e. with case-insensitive environment, regardless of the toolset). Revert to the documented behaviour of case-insensitive environment on Windows. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 23

[PATCH 04/13] Win32: fix environment memory leaks

2014-07-17 Thread Stepan Kasal
depends on taking control of char **environ and having our own mingw_putenv (both introduced in Win32: Unicode environment (incoming)). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 10 ++ compat/mingw.h | 1

[PATCH 02/13] Win32: Unicode environment (outgoing)

2014-07-17 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de Convert environment from UTF-8 to UTF-16 when creating other processes. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff

[PATCH 09/13] Win32: reduce environment array reallocations

2014-07-17 Thread Stepan Kasal
in make_environment_block to prevent reallocations. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 62 +- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index

[PATCH 08/13] Win32: don't copy the environment twice when spawning child processes

2014-07-17 Thread Stepan Kasal
make_augmented_environ / free_environ API. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 76 -- compat/mingw.h | 8 ++- run-command.c | 10 ++-- 3 files changed, 30 insertions

[PATCH 13/13] Enable color output in Windows cmd.exe

2014-07-17 Thread Stepan Kasal
-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 4 1 file changed, 4 insertions(+) diff --git a/compat/mingw.c b/compat/mingw.c index 6d4ec56..19975fa 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2112,6 +2112,10 @@ void mingw_startup() setenv(TMPDIR, tmp, 1

[PATCH 06/13] Win32: unify environment function names

2014-07-17 Thread Stepan Kasal
bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index fe869ed..89fe62b 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -898,7 +898,7 @@ static char

[PATCH 10/13] Win32: use low-level memory allocation during initialization

2014-07-17 Thread Stepan Kasal
environment feature, which completely replaces MSVCRT's getenv() implementation. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 43 --- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/compat

[PATCH 03/13] Win32: Unicode environment (incoming)

2014-07-17 Thread Stepan Kasal
Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 15 +++ compat/mingw.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/compat/mingw.c b/compat/mingw.c index bd45950..eadba8a 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1259,6 +1259,12

[PATCH 05/13] Win32: unify environment case-sensitivity

2014-07-17 Thread Stepan Kasal
potential inconsistencies by using case-insensitive comparison in lookup_env (used by putenv, unsetenv and make_augmented_environ). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[PATCH 07/13] Win32: factor out environment block creation

2014-07-17 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 55 --- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c

[PATCH 11/13] Win32: keep the environment sorted

2014-07-17 Thread Stepan Kasal
are better than that in that they are thread-safe with respect to other getenv calls as long as the environment is not modified. Git's indiscriminate use of getenv in background threads currently requires this property. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka

Re: [PATCH 00/13] mingw unicode environment

2014-07-17 Thread Stepan Kasal
Hi, Karsten Blees karsten.bl...@gmail.com writes: I believe we prefer moving code to the right place over forward declarations (IIRC I got bashed for the latter in one of the first rounds of this patch series). If only to justify 'git-blame -M' :-D indeed, my position is the same,

Re: [PATCH 0/3] fix test suite with mingw-unicode patches

2014-07-16 Thread Stepan Kasal
Hello Karsten, thanks for your analysis. Most of the patches you refer to are simply switching off tests for MINGW; let me comment on the remaining ones: * t0110-urlmatch-normalization: 1 Passing binary data on the command line...would have to teach test-urlmatch-normalization.c to read

[PATCH 2/3] Win32: Unicode file name support (dirent)

2014-07-15 Thread Stepan Kasal
by factor three in the worst case). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.c | 30 ++ compat/win32/dirent.h | 2 +- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/compat/win32

[PATCH 0/3] fix test suite with mingw-unicode patches

2014-07-15 Thread Stepan Kasal
name support (except dirent) Win32: Unicode file name support (dirent) Pat Thoyts and Stepan Kasal(1): tests: do not pass iso8859-1 encoded parameter compat/mingw.c | 198 +-- compat/mingw.h | 18 +++- compat/win32/dirent.c

[PATCH 3/3] tests: do not pass iso8859-1 encoded parameter

2014-07-15 Thread Stepan Kasal
to pass the iso8859-1 message using a file or a pipe. Thanks-to: Karsten Blees bl...@dcon.de Author: Stepan Kasal ka...@ucw.cz Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t4041-diff-submodule-option.sh | 6 -- t/t4205-log-pretty-formats.sh| 2 +- t/t6006-rev-list-format.sh | 4 ++-- t

[PATCH 1/3] Win32: Unicode file name support (except dirent)

2014-07-15 Thread Stepan Kasal
resetting GetLastError to ERROR_SUCCESS. Close the find handle in is_dir_empty so that git doesn't block deletion of the directory even after all other applications have released it. Reported-by: John Chen john0...@gmail.com Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka

Re: [PATCH 0/3] fix test suite with mingw-unicode patches

2014-07-15 Thread Stepan Kasal
: Unicode file name support (dirent) Both of theese patches are in msysgit for more than 2 years. Pat Thoyts and Stepan Kasal(1): tests: do not pass iso8859-1 encoded parameter This one is relatively new: replaces git commit -m by git commit -F - to work around a Windows bug^H^H^Hfeature. Stepan

Re: Topic sk/mingw-unicode-spawn-args breaks tests

2014-07-12 Thread Stepan Kasal
Hello Hannes, Am 10.07.2014 22:05, schrieb Johannes Sixt: It looks like I totally missed the topic sk/mingw-unicode-spawn-args. ... Am I doing something wrong? Does the topic depend on a particular version of MSYS (or DLL)? unfortunately, I paused my submissions at random point. I'm

Re: [PATCH 0/7] Second part of msysgit/unicode

2014-06-17 Thread Stepan Kasal
Hello Karsten, On Tue, Jun 17, 2014 at 11:06:52AM +0200, Karsten Blees wrote: Am 11.06.2014 11:37, schrieb Stepan Kasal: This is the second part of the time-proven unicode suport branch from msysgit. This batch is a collection of small independent changes, limited to mingw.c. The only

[PATCH 1/7] Let mingw_execve() return an int

2014-06-11 Thread Stepan Kasal
From: Johannes Schindelin johannes.schinde...@gmx.de Date: Mon, 28 May 2012 21:21:39 -0500 This is in the great tradition of POSIX. Original fix by Olivier Refalo. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 5

[PATCH 5/7] Win32: Unicode arguments (outgoing)

2014-06-11 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de Date: Sun, 16 Jan 2011 18:27:53 +0100 Convert command line arguments from UTF-8 to UTF-16 when creating other processes. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 18 ++ 1 file

[PATCH 6/7] Win32: Unicode arguments (incoming)

2014-06-11 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de Date: Sun, 16 Jan 2011 18:28:27 +0100 Convert command line arguments from UTF-16 to UTF-8 on startup. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 42 -- 1 file

[PATCH 3/7] Win32: fix potential multi-threading issue

2014-06-11 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de Date: Fri, 7 Jan 2011 18:04:16 +0100 ...by removing a static buffer in do_stat_internal. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 2 +- 1 file

[PATCH 4/7] MinGW: disable CRT command line globbing

2014-06-11 Thread Stepan Kasal
-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/compat/mingw.c b/compat/mingw.c index 6849815..1140a13 100644 --- a/compat/mingw.c +++ b/compat

[PATCH 0/7] Second part of msysgit/unicode

2014-06-11 Thread Stepan Kasal
This is the second part of the time-proven unicode suport branch from msysgit. This batch is a collection of small independent changes, limited to mingw.c. The only exception is the last patch: it changes gitk and git-gui. (The third and last part of msysgit/unicode branch will all be about

[PATCH 2/7] Win32: simplify internal mingw_spawn* APIs

2014-06-11 Thread Stepan Kasal
around. Remove the env parameter where it's not needed. This removes the internal mingw_execve abstraction, which is no longer needed. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 23 --- 1 file changed, 8 insertions

[PATCH 7/7] Unicode file name support (gitk and git-gui)

2014-06-11 Thread Stepan Kasal
...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- git-gui/git-gui.sh | 11 +++ git-gui/lib/browser.tcl | 2 +- git-gui/lib/index.tcl | 6 +++--- gitk-git/gitk | 15 --- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/git-gui/git-gui.sh b/git

Re: [PATCH] send-email: do not insert third header

2014-06-10 Thread Stepan Kasal
On Mon, Jun 09, 2014 at 10:38:14PM -0700, Junio C Hamano wrote: two new options [..] would support the recent kernel submission convention better. indeed, but they are not there and I do not volunteer to write them. Instead, I edit the generated patches to add the necessary headers. But if

[PATCH v2 0/2] mingw: macro main(), const warnings

2014-06-07 Thread Stepan Kasal
): Win32: move main macro to a function Stepan Kasal (1): mingw: avoid const warning compat/mingw.c | 15 +++ compat/mingw.h | 14 -- 2 files changed, 19 insertions(+), 10 deletions(-) -- 2.0.0.9635.g0be03cb -- To unsubscribe from this list: send the line unsubscribe

[PATCH v2 2/2] mingw: avoid const warning

2014-06-07 Thread Stepan Kasal
Fix const warnings in http-fetch.c and remote-curl.c main() where is argv declared as const. The fix should work for all future declarations of main, no matter whether the second parameter's type is char**, const char**, or char *[]. Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.h

[PATCH v2 1/2] Win32: move main macro to a function

2014-06-07 Thread Stepan Kasal
...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 15 +++ compat/mingw.h | 14 -- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index a0e13bc..c03bafa 100644 --- a/compat/mingw.c +++ b/compat/mingw.c

Re: [msysGit] Re: [PATCH 3/5] Warn if the Windows console font doesn't support Unicode

2014-06-07 Thread Stepan Kasal
Hi, On Fri, Jun 06, 2014 at 10:18:43PM +0100, Peter Krefting wrote: Stepan Kasal: +switching to a TrueType font such as Lucida Console!); [...] modernizing the suggestion here to recomment Consolas. It is available Indeed. So, I'll keep this patch as it is, for the records

[PATCH v2 1/6] Support Unicode console output on Windows

2014-06-07 Thread Stepan Kasal
-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.h | 2 ++ compat/winansi.c | 26 -- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index 6dc8b1a..d3cffb7 100644

[PATCH v2 4/6] Win32: add Unicode conversion functions

2014-06-07 Thread Stepan Kasal
in subsequent calls to file system APIs). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 85 ++ compat/mingw.h | 104 + 2 files changed, 189

[PATCH v2 5/6] Win32: Thread-safe windows console output

2014-06-07 Thread Stepan Kasal
with these limitations. Many thanks to Atsushi Nakagawa at...@chejz.com for suggesting and reviewing the thread-exit-mechanism. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 9 +- compat/mingw.h | 12 +- compat/winansi.c | 401

[PATCH v2 6/6] Win32: fix broken pipe detection

2014-06-07 Thread Stepan Kasal
...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.h | 2 - compat/winansi.c | 114 ++- 2 files changed, 70 insertions(+), 46 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index 4b638d8..8dac6f9 100644 --- a/compat

[PATCH v2 0/6] First part of Unicode console support for msysgit

2014-06-07 Thread Stepan Kasal
Hello, this patch series is to be applied on top of move main() macro to a function, discussed in another thread. I added the two patches Karsten mentioned: Win32: add Unicode conversion functions Win32: fix broken pipe detection I also copied the links for the fixups incuded. Regards,

[PATCH v2 3/6] Warn if the Windows console font doesn't support Unicode

2014-06-07 Thread Stepan Kasal
-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/winansi.c | 66 1 file changed, 66 insertions(+) diff --git a/compat/winansi.c b/compat/winansi.c index c4be401..bec6713 100644 --- a/compat

[PATCH v2 2/6] Detect console streams more reliably on Windows

2014-06-07 Thread Stepan Kasal
Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/winansi.c | 50 ++ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/compat/winansi.c b/compat/winansi.c index abe0fea..c4be401 100644 --- a/compat/winansi.c +++ b/compat/winansi.c

[PATCH] send-email: do not insert third header

2014-06-07 Thread Stepan Kasal
there is a second header already inserted in the patch file. Signed-off-by: Stepan Kasal ka...@ucw.cz --- git-send-email.perl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index 9949db0..891df13 100755 --- a/git-send-email.perl +++ b/git

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

2014-06-06 Thread Stepan Kasal
Hi, On Thu, Jun 05, 2014 at 11:44:22PM +0200, Karsten Blees wrote: I think the most time-preserving option is to send it upstream as unchanged as possible (probably with the bugfix-patches squashed). I plan to submit one by one or in a small series. Agreed about the squashes, I have several of

Re: [msysGit] [PATCH] mingw: redefine the wrapper macro after the corresponding function

2014-06-06 Thread Stepan Kasal
Hello, On Fri, Jun 06, 2014 at 12:00:51AM +0200, Karsten Blees wrote: Am 05.06.2014 18:56, schrieb Johannes Sixt: Within mingw.c, if some other function inside mingw.c wants to use mingw_unlink, then it should be written as 'mingw_unlink(foo)', not 'unlink(foo)'. I very much like this

[PATCH v2] mingw: redefine the wrapper macro after the corresponding function

2014-06-06 Thread Stepan Kasal
From 624d15bd5d2d06035abc17415127a7cf37b5f981 Mon Sep 17 00:00:00 2001 From: Stepan Kasal ka...@ucw.cz Date: Thu, 5 Jun 2014 09:17:17 +0200 mingw.c defines several wrapper functions, e.g., mingw_unlink(). These wrappers are deployed by macros like this: #define unlink mingw_unlink

Re: [msysGit] [PATCH] mingw: redefine the wrapper macro after the corresponding function

2014-06-06 Thread Stepan Kasal
Hi Karsten, On Fri, Jun 06, 2014 at 11:43:03AM +0200, Karsten Blees wrote: [...] Assume all other callers are written 'mingw_foo', as suggested by Hannes, and no one except 'mingw_foo' has the need to call MSVCRT's 'foo' directly. Then its irrelevant whether the #undef is at the top or

[PATCH 2/5] Detect console streams more reliably on Windows

2014-06-06 Thread Stepan Kasal
to reliably detect console handles (also don't initialize internal state from an uninitialized CONSOLE_SCREEN_BUFFER_INFO structure if the function fails). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka

[PATCH 0/5] Windows dirent patches

2014-06-06 Thread Stepan Kasal
Hello, This is a series of dirent modifications, 4 tiny ones and one bigger. As the date indicates, these are battle tested in mysgit for several years. Regards, Stepan Karsten Blees (5): Win32 dirent: remove unused dirent.d_ino member Win32 dirent: remove unused dirent.d_reclen

[PATCH 5/5] Win32: Thread-safe windows console output

2014-06-06 Thread Stepan Kasal
at...@chejz.com for suggesting and reviewing the thread-exit-mechanism. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 9 +- compat/mingw.h | 12 +- compat/winansi.c | 402 --- 3

[PATCH 0/5] First part of Unicode console support for msysgit

2014-06-06 Thread Stepan Kasal
Hello, this is first part of the unicode support pathes from msysgit. The first three patches originate in Jun 2010, though some fixups from 2012 have been squashed in. The fourth one is just a trivial prerequisite for the last one, that was written in Jan 2012, with a fixup from Mar 2012.

[PATCH 3/5] Warn if the Windows console font doesn't support Unicode

2014-06-06 Thread Stepan Kasal
...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/winansi.c | 66 1 file changed, 66 insertions(+) diff --git a/compat/winansi.c b/compat/winansi.c index c4be401..bec6713 100644 --- a/compat/winansi.c +++ b/compat/winansi.c

[PATCH 5/5] Win32 dirent: improve dirent implementation

2014-06-06 Thread Stepan Kasal
failing with ENOMEM and letting git work on incomplete directory listings (error handling in dir.c is quite sparse). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.c | 113

[PATCH 1/5] Support Unicode console output on Windows

2014-06-06 Thread Stepan Kasal
johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.h | 2 ++ compat/winansi.c | 26 -- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index 3eaf822..a465d1e 100644 --- a/compat/mingw.h +++ b/compat

[PATCH 4/5] Win32 dirent: clarify #include directives

2014-06-06 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de Git-compat-util.h is two dirs up, and already includes dirent.h (which is the same as dirent.h due to -Icompat/win32 in the Makefile). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka

[PATCH 1/5] Win32 dirent: remove unused dirent.d_ino member

2014-06-06 Thread Stepan Kasal
-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.h | 1 - config.mak.uname | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h index 927a25c..b38973b 100644 --- a/compat/win32/dirent.h +++ b/compat/win32/dirent.h @@ -9,7

[PATCH 3/5] Win32 dirent: change FILENAME_MAX to MAX_PATH

2014-06-06 Thread Stepan Kasal
). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h index 7f4e6c7..8838cd6

[PATCH 4/5] Win32: move main macro to a function

2014-06-06 Thread Stepan Kasal
From: Karsten Blees bl...@dcon.de The code in the MinGW main macro is getting more and more complex, move to a separate initialization function for readabiliy and extensibility. Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan

[PATCH 2/5] Win32 dirent: remove unused dirent.d_reclen member

2014-06-06 Thread Stepan Kasal
...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.h | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h index b38973b..7f4e6c7 100644 --- a/compat/win32/dirent.h +++ b/compat/win32/dirent.h @@ -10,10 +10,7

Re: [msysGit] Re: [PATCH 0/5] First part of Unicode console support for msysgit

2014-06-06 Thread Stepan Kasal
Hello Karsten, On Fri, Jun 06, 2014 at 07:44:33PM +0200, Karsten Blees wrote: Nicely done, thanks! thank you for your kind words. Please hold back, I will re-submit in a few days. Note: this one was submitted seperately on May 29 and May 1 (can't find it in the gmane archive, though). It

[PATCH 0/5] Windows dirent patches

2014-06-06 Thread Stepan Kasal
On Fri, Jun 06, 2014 at 06:33:27PM +0200, Karsten Blees wrote: The dates are actually missing from the patches, [...] oops, this was first time I tried to use git-send-email. I hope this time it'll work better. Stepan Hello, This is a series of dirent modifications, 4 tiny ones and one bigger.

[PATCH 3/5] Win32 dirent: change FILENAME_MAX to MAX_PATH

2014-06-06 Thread Stepan Kasal
we're copying the dirent data). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/win32/dirent.h b/compat/win32

[PATCH 4/5] Win32 dirent: clarify #include directives

2014-06-06 Thread Stepan Kasal
...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c index 7a0debe..fac7f25 100644 --- a/compat/win32/dirent.c +++ b/compat/win32/dirent.c @@ -1,5 +1,4 @@ -#include

[PATCH 2/5] Win32 dirent: remove unused dirent.d_reclen member

2014-06-06 Thread Stepan Kasal
-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.h | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h index b38973b..7f4e6c7 100644 --- a/compat/win32/dirent.h +++ b/compat

[PATCH 5/5] Win32 dirent: improve dirent implementation

2014-06-06 Thread Stepan Kasal
will die() if out of memory, rather than failing with ENOMEM and letting git work on incomplete directory listings (error handling in dir.c is quite sparse). Signed-off-by: Karsten Blees bl...@dcon.de Signed-off-by: Erik Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat

[PATCH 1/5] Win32 dirent: remove unused dirent.d_ino member

2014-06-06 Thread Stepan Kasal
Faye-Lund kusmab...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/win32/dirent.h | 1 - config.mak.uname | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h index 927a25c..b38973b 100644 --- a/compat/win32/dirent.h

Re: [msysGit] Re: [PATCH 0/5] First part of Unicode console support for msysgit

2014-06-06 Thread Stepan Kasal
Hello, On Fri, Jun 06, 2014 at 07:44:33PM +0200, Karsten Blees wrote: Karsten Blees (5): Support Unicode console output on Windows [..] you could have squashed half of Win32: fix segfault in WriteConsoleW when debugging in gdb [2] (second half in [5/5]). Detect console streams

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

2014-06-05 Thread Stepan Kasal
From: Johannes Schindelin johannes.schinde...@gmx.de Date: Wed, 2 Jun 2010 00:41:33 +0200 If HOME is not set, use $HOMEDRIVE$HOMEPATH Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- Hello Karsten, thanks for your explanation

[PATCH] mingw: redefine the wrapper macro after the corresponding function

2014-06-05 Thread Stepan Kasal
wrapper definition. Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 20 1 file changed, 20 insertions(+) diff --git a/compat/mingw.c b/compat/mingw.c index a0e13bc..e7193c0 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -224,6 +224,7 @@ int mingw_unlink

[PATCH v3] Add a Windows-specific fallback to getenv(HOME);

2014-06-05 Thread Stepan Kasal
From: Johannes Schindelin johannes.schinde...@gmx.de Date: Wed, 2 Jun 2010 00:41:33 +0200 If HOME is not set, use $HOMEDRIVE$HOMEPATH Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- On Thu, Jun 05, 2014 at 10:32:44AM +0200, Torsten

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

2014-06-05 Thread Stepan Kasal
Hello, On Thu, Jun 05, 2014 at 11:40:50AM +0200, Karsten Blees wrote: Am 05.06.2014 10:03, schrieb Stepan Kasal: I hope you can ack this patch as a step forward. No, not really. It's sure better than introducing a special get_home_directory(), but it still increases the diff between

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

2014-06-05 Thread Stepan Kasal
Hi, On Thu, Jun 05, 2014 at 02:03:39PM +0200, Johannes Schindelin wrote: Render me even more convinced that the API call is the cleanest way to go, But not me. In a paralel post, Duy Nguyen wrote: Thank you for working on pushing msysgit patches upstream. I don't use git on windows, but

Re: [msysGit] Re: [PATCH] mingw: redefine the wrapper macro after the corresponding function

2014-06-05 Thread Stepan Kasal
Hello Karsten, On Thu, Jun 05, 2014 at 04:51:39PM +0200, Karsten Blees wrote: In the current msysgit HEAD, most of these #undef's can simply be removed or have already been removed [...] not most of. According to my quick count, 6 of 20 have been removed, 2 more can be removed. The remaining

[PATCH] t5000, t5003: do not use test_cmp to compare binary files

2014-06-04 Thread Stepan Kasal
(introduced in commit 4d715ac0). This function usually speeds things up, as fork is extremly slow on Windows. But no wonder that this function is extremely slow and sometimes even crashes when comparing large tar or zip files. Signed-off-by: Stepan Kasal ka...@ucw.cz --- t/t5000-tar-tree.sh

[PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Stepan Kasal
From: Johannes Schindelin johannes.schinde...@gmx.de Date: Wed, 2 Jun 2010 00:41:33 +0200 If HOME is not set, use $HOMEDRIVE/$HOMEPATH Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Stepan Kasal ka...@ucw.cz --- Hi, this patch is present in msysGit for 4 years

Re: [PATCH] t5000, t5003: do not use test_cmp to compare binary files

2014-06-04 Thread Stepan Kasal
Hello Thomas, On Wed, Jun 04, 2014 at 02:13:44PM +0200, Thomas Braun wrote: Wouldn't a function like test_cmp_bin() be better suited for all? I also considered it. The advantage is that is shows that this intentionally differs from test_cmp. The windows folks can then use cmp inside

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

2014-06-04 Thread Stepan Kasal
Hello, On Wed, Jun 04, 2014 at 08:47:58PM +0700, Duy Nguyen wrote: setenv(HOME) if it's missing instead? MinGW port already replaces main(). Extra initialization should not be a problem. well, I would be afraid to modify the environment for subprocesses. It could hit back in certain

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

2014-06-04 Thread Stepan Kasal
Hi dscho, On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: No. Git is not always called through Bash or the git-wrapper, unfortunately. but you have to admit, that in most cases it is called through bash or the git wrapper. The problem arises

[PATCH v2] t5000, t5003: do not use test_cmp to compare binary files

2014-06-04 Thread Stepan Kasal
(introduced in commit 4d715ac0). This function usually speeds things up, as fork is extremly slow on Windows. But no wonder that this function is extremely slow and sometimes even crashes when comparing large tar or zip files. Signed-off-by: Stepan Kasal ka...@ucw.cz --- Hi Thomas, On Wed, Jun 04

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

2014-06-04 Thread Stepan Kasal
Hi dscho, your arguments seem really strong. (Especially the four years of battle testing, with the memories of constant problems with HOME before.) I hope they are strong enough to convince Junio to accept this patch; that would help. Stepan PS (about mingwGitDevEnv): plan is to switch to

[PATCH 0/2] mingw: macro main(), const warnings

2014-05-29 Thread Stepan Kasal
of the integration into msysGit if this patch gets accepted. To make it easier, I'm submitting a patch that has been part of msysGit for 3 years. Karsten Blees (1): Win32: move main macro to a function Stepan Kasal (1): mingw: avoid const warning compat/mingw.c | 15 +++ compat/mingw.h

[PATCH 1/2] Win32: move main macro to a function

2014-05-29 Thread Stepan Kasal
...@gmail.com Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.c | 15 +++ compat/mingw.h | 14 -- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index a0e13bc..c03bafa 100644 --- a/compat/mingw.c +++ b/compat/mingw.c

[PATCH 2/2] mingw: avoid const warning

2014-05-29 Thread Stepan Kasal
Fix const warnings in http-fetch.c and remote-curl.c main() where is argv declared as const. The fix should work for all future declarations of main, no matter whether the second parameter's type is char**, const char**, or char *[]. Signed-off-by: Stepan Kasal ka...@ucw.cz --- compat/mingw.h

  1   2   >