[PATCH v2] MSVC: Unbreak real_path for Windows paths

ed from mingw.c which is included by msvc.c to a separate file. Then, the new file "compat/win32/path-utils.h" was only included for the __CYGWIN__ and __MINGW32__ cases in git-compat-util.h, the case for _MSC_VER was missing. Signed-off-by: Sven Strickroth --- config.mak.uname | 1

Re: [PATCH] Unbreak real_path on Windows for already absolute paths (with Visual Studio)

t/win32/path-utils.o > for the Windows build. > In the git-for windows codebase I see > COMPAT_OBJS +=compat/win32/path-utils I don't use config.mak.uname and never did, so I can't tell you about that. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server

[PATCH] Unbreak real_path on Windows for already absolute paths (with Visual Studio)

A path such as 'c:/somepath/submodule/../.git/modules/submodule' wasn't resolved correctly any more, because the *nix variant of offset_1st_component is used instead of the Win32 specific version. Regression was introduced in commit 25d90d1cb72ce51407324259516843406142fe89. Sign

[PATCH] .mailmap: record canonical email address for Sven Strickroth

Signed-off-by: Sven Strickroth --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index f165222a78..a30f409f39 100644 --- a/.mailmap +++ b/.mailmap @@ -235,6 +235,8 @@ Steven Grimm Steven Grimm kor...@midwinter.com Steven Walter Steven Walter +Sven

[PATCH] msvc: Directly use MS version (_stricmp) of strcasecmp

This also removes an implicit conversion from size_t (unsigned) to int (signed). _stricmp as well as _strnicmp are both available since VS2012. Signed-off-by: Sven Strickroth --- compat/msvc.h | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compat/msvc.h b/compat

[PATCH] msvc: Directly use MS version (_stricmp) of strcasecmp

This also removes an implicit conversion from size_t (unsigned) to int (signed). _stricmp as well as _strnicmp are both available since VS2012. Signed-off-by: Sven Strickroth --- compat/msvc.h | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compat/msvc.h b/compat

[PATCH] Use https links to Wikipedia to avoid http redirects

Signed-off-by: Sven Strickroth --- Documentation/gitweb.txt | 2 +- bisect.c | 2 +- gitweb/gitweb.perl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 96156e5e1..88450589a 100644 --- a

[PATCH] doc: use https link to Wikipeai to avoid http redirect

Signed-off-by: Sven Strickroth --- Documentation/gitweb.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 96156e5e1..88450589a 100644 --- a/Documentation/gitweb.txt +++ b/Documentation/gitweb.txt @@ -84,7 +84,7

git init --separate-git-dir does not update symbolic .git links for submodules

ot updated and still points to the .git directory of the parent repository which now is a file. This issue is present for me in Git 2.12.0. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server

Stash pop/apply conflict and --theirs and --ours

and ours should be swapped in git index, so that git checkout --theirs and --ours work as expected. PS: I'm sorry if this was already discussed, I haven't found any discussion. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server

Re: [PATCH 2/2 V3] MSVC: Use shipped headers instead of fallback definitions

VS2010 comes with stdint.h [1] VS2013 comes with inttypes.h [2] [1] https://stackoverflow.com/a/2628014/3906760 [2] https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/ Signed-off-by: Sven Strickroth --- compat/mingw.h | 2 +- compat

Re: [PATCH 1/2] MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

[1] https://msdn.microsoft.com/en-us/library/1kt27hek.aspx Signed-off-by: Sven Strickroth --- compat/snprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/snprintf.c b/compat/snprintf.c index 42ea1ac..0b11688 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c @@

Re: [PATCH 2/2 V2] MSVC: VS2013 comes with inttypes.h

Signed-off-by: Sven Strickroth --- compat/mingw.h | 2 +- compat/vcbuild/include/unistd.h | 4 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat/mingw.h index 6b6d695..137f42e 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -415,7

[PATCH 2/2] MSVC: VS2013 comes with inttypes.h

Reduce the number of defines which need to be managed within vanilal git. Signed-off-by: Sven Strickroth --- compat/mingw.h | 2 +- compat/vcbuild/include/unistd.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat/mingw.h index

[PATCH 1/2] MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

In MSVC2015 the behavior of vsnprintf was changed. W/o this fix there is one character missing at the end. Signed-off-by: Sven Strickroth --- compat/snprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/snprintf.c b/compat/snprintf.c index 42ea1ac..0b11688 100644

[PATCH] commit: do not lose SQUASH_MSG contents

commit log skeleton first when concluding a normal merge, and then show the "# Conflicts:" list, to help the user write the log message for the resulting commit. Test by Junio C Hamano . Signed-off-by: Sven Strickroth --- builtin/commit.c | 11 ++- t/t7600-merge.sh | 28 +

[PATCH] commit: do not lose SQUASH_MSG contents

commit log skeleton first when concluding a normal merge, and then show the "# Conflicts:" list, to help the user write the log message for the resulting commit. Signed-off-by: Sven Strickroth --- builtin/commit.c | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/b

[PATCH] commit: do not lose SQUASH_MSG contents

When concluding a conflicted "git merge --squash", the command failed to read SQUASH_MSG that was prepared by "git merge", and showed only the "# Conflicts:" list of conflicted paths. Signed-off-by: Sven Strickroth --- builtin/commit.c | 20

Re: [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred

sts(git_path_squash_msg())) { > read SQUASH_MSG; > } > if (file_exists(git_path_merge_msg())) > read MERGE_MSG; > } > hook_arg1 = "merge"; > } Here hook_arg1 would be always "merge&qu

[PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred

After a merge --squash with a conflict the commit message did not contain the information about the squashed commits, but only the "# Conflicts:" information. Signed-off-by: Sven Strickroth --- builtin/commit.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/builtin/commit.c

Commit message not helpful after merge squash with conflicts

ssues/1902 -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- 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

[PATCH] Correctly close config file handle in case of error

Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- config.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index 9fd275f..83caa25 100644 --- a/config.c +++ b/config.c @@ -1935,7

[PATCH] Correctly close config file handle in case of error

Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config.c b/config.c index 9fd275f..8138d5d 100644 --- a/config.c +++ b/config.c @@ -2065,6 +2065,7 @@ int

[PATCH] Correctly close config file handle in case of error

Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- config.c | 4 1 file changed, 4 insertions(+) diff --git a/config.c b/config.c index 9fd275f..c06dc2f 100644 --- a/config.c +++ b/config.c @@ -2010,6 +2010,7 @@ int

[PATCH] vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

W/o this fix there is one character missing at the end. Signed-off-by: Sven Strickroth --- compat/snprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/snprintf.c b/compat/snprintf.c index 42ea1ac..0b11688 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c

Re: [PATCH] Close config file handle if the entry to unset is not found

Am 14.08.2015 um 21:35 schrieb Eric Sunshine: >> Signed-off-by: Sup Yut Sum >> Signed-off-by: Sven Strickroth >> --- >> diff --git a/config.c b/config.c >> index 9fd275f..89b49e3 100644 >> --- a/config.c >> +++ b/config.c >> @@ -2048,6 +2048,7 @

[PATCH] Close config file handle if the entry to unset is not found

Without this patch there might be open handle leaks. Signed-off-by: Sup Yut Sum Signed-off-by: Sven Strickroth --- config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/config.c b/config.c index 9fd275f..89b49e3 100644 --- a/config.c +++ b/config.c @@ -2048,6 +2048,7 @@ int

RFC: git status --amend

uot; parameter (or a parameter with a better naming) to "git status". What do you think of this idea? -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH 1/5] msvc: Fix compilation errors caused by poll.h emulation

oblem for me was, that _WIN32_WINNT was set to 0x0600 and thus winsck2.h was also declaring pollfd. Building libgit works now. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- 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 3/3] Initialize variables with values

Am 09.05.2013 15:21 schrieb Jonathan Nieder: > Sven Strickroth wrote: > >> With MSVC initializing a variable with "int a=a" causes a warning about >> using an uninitialized value. > [...] >> --- a/builtin/rev-list.c >> +++ b/builtin/rev-list.c >&

Re: [PATCH 1/5] msvc: Fix compilation errors caused by poll.h emulation

hich also doesn't exist for MSVC. Including compat/poll into the includes path causes redefinition errors. How have you tested this? I think the check in git-compat-util.h has to be extended to only include any poll.h if _MSC_VER is defined. -- Best regards, Sven Strickroth PGP key id F5A

Re: [PATCH 1/3] poll.h lies in the same folder, so use normal quotes for include

Am 09.05.2013 03:12 schrieb Sven Strickroth: > Some compilers, like Visual C++ complain when <> is used instead of > double quotes for non system includes. I just noticed that this patch isn't necessary for 1.8.3 (since 41f2999180f5a58f2a4214d896359c1587c9024f) any more. Sorry

[PATCH 0/3] MSVC fixes

Hi, I've 3 patches fixing warnings and errors when compiling with latest MSVC (2012). -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

[PATCH 3/3] Initialize variables with values

With MSVC initializing a variable with "int a=a" causes a warning about using an uninitialized value. Signed-off-by: Sven Strickroth --- builtin/rev-list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 67701be..13af

[PATCH 1/3] poll.h lies in the same folder, so use normal quotes for include

Some compilers, like Visual C++ complain when <> is used instead of double quotes for non system includes. Signed-off-by: Sven Strickroth --- compat/poll/poll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index 7d226ec..b

[PATCH 2/3] mingw.h: Define only if necessary

Since the latest version of MSVC EWOULDBLOCK, EAFNOSUPPORT and ECONNABORTED are defined in errno.h. When used with MSVC mingw.h is included from msvc.h and causes warnings about redefinitions. Signed-off-by: Sven Strickroth --- compat/mingw.h | 6 ++ 1 file changed, 6 insertions(+) diff

Re: [PATCH] connect.c: Tell *PLink to always use ssh protocol

Am 07.02.2013 00:22 schrieb Jeff King: > On Wed, Feb 06, 2013 at 10:58:49PM +0100, Sven Strickroth wrote: > >> Default values for *plink can be set using PuTTY. If a user makes >> telnet the default in PuTTY this breaks ssh clones in git. >> >> Since git clones of t

Re: [PATCH] connect.c: Tell *PLink to always use ssh protocol

Am 07.02.2013 00:22 schrieb Jeff King: > On Wed, Feb 06, 2013 at 10:58:49PM +0100, Sven Strickroth wrote: > >> Default values for *plink can be set using PuTTY. If a user makes >> telnet the default in PuTTY this breaks ssh clones in git. >> >> Since git clones of t

[PATCH] connect.c: Tell *PLink to always use ssh protocol

Default values for *plink can be set using PuTTY. If a user makes telnet the default in PuTTY this breaks ssh clones in git. Since git clones of the type user@host:path use ssh, tell *plink to use ssh and override PuTTY defaults for the protocol to use. Signed-off-by: Sven Strickroth

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

nd this, TortoiseGitMerge does not require the ":" after the arguments anymore which fixes handling file names with spaces [2] (as written above). [1] http://www.mingw.org/wiki/Posix_path_conversion [2] https://github.com/msysgit/msysgit/issues/57 Signed-off-by: Sven Strickroth Reported-by: Seb

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with

the quotes). To work around this, TortoiseGitMerge does not >> require the ":" after the arguments anymore which fixes handling file >> names with spaces. >> >> [1] http://www.mingw.org/wiki/Posix_path_conversion > > Sven? I just mailed a new patch. Thanks to Sebas

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with

Am 01.02.2013 21:07 schrieb Sebastian Schuberth: > mergetools: Teach tortoisemerge about TortoiseGitMerge This subject doesn't make any sense if we don't combine the two patches. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this l

[PATCH] mergetools: Enable tortoisemerge to handle filenames with

er, TortoiseGitMerge was modified in order to handle filenames with spaces correctly. The "-key value" form was choosen because this way no escaping for quotes within quotes is necessary; see https://github.com/msysgit/msysgit/issues/57 Signed-off-by: Sven Strickroth Reported-by: Sebast

Re: [PATCH 2/2] mergetools: Make tortoisemerge work with

e improved its syntax to allow for file paths > with spaces. Detect when it is installed and prefer it over > TortoiseMerge. This message implies, that I have to combine two patches again?! -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this li

[PATCH 2/2] mergetools: Make tortoisemerge work with

-values by space instead of colons as TortoiseSVN TortoiseMerge does and supports filesnames with spaces in it this way now. Signed-off-by: Sven Strickroth Reported-by: Sebastian Schuberth --- mergetools/tortoisemerge | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a

[PATCH 1/2] mergetools: Added support for TortoiseGitMerge

The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that this one has special support for git and prevent confusion with the TortoiseSVN TortoiseMerge version. Signed-off-by: Sven Strickroth --- mergetools/tortoisemerge | 11

Re: [PATCH] mergetools: Enhance tortoisemerge to work with

The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that this one has special support for git and prevent confusion with the TortoiseSVN TortoiseMerge version. Signed-off-by: Sven Strickroth --- mergetools/tortoisemerge | 11

Re: [PATCH] mergetools: Enhance tortoisemerge to work with

Am 25.01.2013 19:28 schrieb Junio C Hamano:> Sven Strickroth writes: > >> TortoiseGitMerge and filenames with spaces > > ??? ECANNOTPARSE. > > ... ah, wait. Is this a broken-off tail of your subject line? Yes. >> +touch "$BACKUP&qu

[PATCH] mergetools: Enhance tortoisemerge to work with

TortoiseSVN TortoiseMerge version. - The tortoisemerge mergetool does not work with filenames which have a space in it. Fixing this required changes in git and also in TortoiseGitMerge; see https://github.com/msysgit/msysgit/issues/57. Signed-off-by: Sven Strickroth Reported-by: Sebastian

[PATCH] mergetools: Enhance tortoisemerge to work with

TortoiseSVN TortoiseMerge version. - The tortoisemerge mergetool does not work with filenames which have a space in it. Fixing this required changes in git and also in TortoiseGitMerge; see https://github.com/msysgit/msysgit/issues/57. Signed-off-by: Sven Strickroth Reported-by: Sebastian

Re: [PATCH] mergetools: Add tortoisegitmerge helper

Am 24.01.2013 20:51 schrieb Junio C Hamano: > Sven Strickroth writes: > >> - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe >> (starting with 1.8.0) in order to make clear that this one has special >> support for git and prevent confus

Re: [PATCH] mergetools: Add tortoisegitmerge helper

Am 21.01.2013 09:26 schrieb Sven Strickroth: > - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe > (starting with 1.8.0) in order to make clear that this one has special > support for git and prevent confusion with the TortoiseSVN TortoiseMerge > vers

[PATCH] mergetools: Add tortoisegitmerge helper

have a space in it. Fixing this required changes in git and also in TortoiseGitMerge; see https://github.com/msysgit/msysgit/issues/57. The new tortoisegitmerge helper was added so that people can still use TortoiseMerge from TortoiseSVN (and older TortoiseGit versions). Signed-off-by: Sven

[PATCH] mergetools: Add tortoisegitmerge helper

have a space in it. Fixing this required changes in git and also in TortoiseGitMerge; see https://github.com/msysgit/msysgit/issues/57. The new tortoisegitmerge helper was added so that people can still use TortoiseMerge from TortoiseSVN (and older TortoiseGit versions). Signed-off-by: Sven

[PATCH] mergetools: Add tortoisegitmerge helper

ls/tortoisegitmerge b/mergetools/tortoisegitmerge new file mode 100644 index 000..5b802a7 --- /dev/null +++ b/mergetools/tortoisegitmerge @@ -0,0 +1,17 @@ +can_diff () { + return 1 +} + +merge_cmd () { + if $base_present + then + touch "$BACKUP" + "$merge_tool_pa

[PATCH 3/3] git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

for non password queries, and makes use of it instead of using hand-rolled prompt-response code that only works with the interactive terminal. Signed-off-by: Sven Strickroth --- perl/Git.pm| 28 +--- perl/Git/SVN/Prompt.pm | 16 +++- 2 files changed

[PATCH 2/3] perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

If GIT_ASKPASS environment variable is not set, git-svn does not try to use SSH_ASKPASS as git-core does. This change adds a fallback to SSH_ASKPASS. Signed-off-by: Sven Strickroth --- perl/Git.pm | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/perl/Git.pm b/perl

[PATCH 1/3] git-svn, perl/Git.pm: add central method for prompting passwords

to solve this issue, but was incomplete as described above. Instead of using hand-rolled prompt-response code that only works with the interactive terminal, a reusable prompt() method is introduced in this commit. Signed-off-by: Sven Strickroth --- perl/Git.pm| 45

Re: [PATCH 0/2] second try

Hi, Am 26.11.2012 05:50 schrieb Junio C Hamano: > Sven Strickroth writes: > >> Am 11.11.2012 17:40 schrieb Sven Strickroth: >>> Am 06.10.2012 20:28 schrieb Junio C Hamano: >>>> It is either that it was simply forgotten, or after I wrote the part >>&g

Re: [PATCH 0/2] second try

Hi, Am 11.11.2012 17:40 schrieb Sven Strickroth: > Am 06.10.2012 20:28 schrieb Junio C Hamano: >> It is either that it was simply forgotten, or after I wrote the part >> you quoted early in January there were discussions later that showed >> the patch was not desirable for

[PATCH 2/2] git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

for non password queries, and makes use of it instead of using hand-rolled prompt-response code that only works with the interactive terminal. Signed-off-by: Sven Strickroth --- perl/Git.pm| 28 +--- perl/Git/SVN/Prompt.pm | 16 +++- 2 files changed

[PATCH 1/2] git-svn, perl/Git.pm: add central method for prompting passwords honoring GIT_ASKPASS and SSH_ASKPASS

introduced in this commit. This change also adds a fallback to SSH_ASKPASS. Signed-off-by: Sven Strickroth --- perl/Git.pm| 48 +++- perl/Git/SVN/Prompt.pm | 20 +--- 2 files changed, 48 insertions(+), 20 deletions(-) diff

[PATCH 0/2] second try

possible problems, so I try again. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- 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 2/2] git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

there a reason why these changes did not get merged? The issues are still there. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- 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 archive --format zip utf-8 issues

s umlauts and other unicode chars like (國立1-.txt) the Windows 7 build-in zip displays them correctly, too. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to m

Re: git archive --format zip utf-8 issues

TF-8. (see APPENDIX D) -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- 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

git archive --format zip utf-8 issues

ve: 1.zip 4490a6dab1df5404f91ab3eb871f133154bff0bf Length DateTimeName - -- - 6 2012-08-10 23:41 +?+?++.txt - --- 6 1 file -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-se