[PATCH v2] MSVC: Unbreak real_path for Windows paths

2019-04-09 Thread Sven Strickroth
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)

2019-04-09 Thread Sven Strickroth
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)

2019-04-08 Thread Sven Strickroth
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 v3] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-02-03 Thread Sven van Haastregt
` in the submodule directory. Keep the old method using `cut` as a fallback. Signed-off-by: Sven van Haastregt --- Differences since v2: Simplify code as suggested by Eric Sunshine and suppress stderr. git-submodule.sh | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a

[PATCH v2] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-01-27 Thread Sven van Haastregt
` in the submodule directory. Keep the old method using `cut` as a fallback. Signed-off-by: Sven van Haastregt --- Differences since v1: Keep the old method using `cut` as a fallback. git-submodule.sh | 8 1 file changed, 8 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh

Re: [PATCH] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-01-22 Thread Sven van Haastregt
On 22/01/19 20:22, Junio C Hamano wrote: One thing it is not clear to me is that this codepath is prepared to handle sha1_src and sha1_dst referring to an object that does not exist (i.e. $missing_(src|dst)=t); the original code will still give us 7 hexdigit to show on the headline, but does the

[PATCH] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-01-21 Thread Sven van Haastregt
Until now, `git submodule summary` was always emitting 7-character SHA-1s that have a higher chance of being ambiguous for larger repositories. Use `git rev-parse --short` instead, which will determine suitable short SHA-1 lengths. Signed-off-by: Sven van Haastregt --- git-submodule.sh | 4

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

2018-11-20 Thread 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

2018-11-19 Thread Sven Strickroth
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

2018-11-18 Thread Sven Strickroth
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

2017-05-13 Thread Sven Strickroth
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

2017-05-13 Thread Sven Strickroth
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

2017-03-04 Thread Sven Strickroth
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

2016-10-22 Thread Sven Strickroth
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

core.fscache on Windows trashes system

2016-06-16 Thread Sven
behavior. We have Kaspersky Endpoint Security 10 running that quarantines git.exe from time to time, maybe this could cause issues. -- Ciao, Sven -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordo

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

2016-03-30 Thread Sven Strickroth
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

2016-03-29 Thread Sven Strickroth
[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

2016-03-29 Thread Sven Strickroth
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

2016-03-29 Thread Sven Strickroth
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

2016-03-29 Thread Sven Strickroth
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

2016-03-21 Thread Sven Strickroth
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

2016-03-13 Thread Sven Strickroth
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

2016-03-08 Thread Sven Strickroth
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

2016-03-08 Thread Sven Strickroth
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

2016-03-07 Thread Sven Strickroth
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

2016-03-05 Thread Sven Strickroth
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

Re: Alternative to manual editing with git add --patch

2015-10-15 Thread Sven Helmberger
want to split at 'x'" to doing so seems just fine. More than "Ok.. let's find the match I want to search for to have the split I want", which seems like the opposite of usable. There are 13 options now not counting help. Not sure it matters much if we increase that to 14

Re: Alternative to manual editing with git add --patch

2015-10-15 Thread Sven Helmberger
mmand. Which would point to either a solution along the lines of "s" being the split-by-line and "s/" being the split-by-regex? Or is this an argument for introducing yet another interaction mode entered when "s" fails to split further -- with simple "/&

Re: Alternative to manual editing with git add --patch

2015-10-14 Thread Sven Helmberger
Am 14.10.2015 um 19:50 schrieb Junio C Hamano: > Sven Helmberger writes: > > As a quick-and-dirty change, you could invent a new variant of > 's'plit that breaks a N-line hunk into N hunks with 1-line each, but > obviously that would not be a pleasant-enough UI to be

Alternative to manual editing with git add --patch

2015-10-14 Thread Sven Helmberger
anually editing just annoying, it seems overly arcane, but it also prevents me from really recommending "add --patch" as best practice. I think it's a really good idea for many reasons to do so, but I can't really tell people already struggling with using git that I expect them to ed

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

2015-08-14 Thread Sven Strickroth
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

2015-08-14 Thread Sven Strickroth
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

2015-08-14 Thread Sven Strickroth
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

2015-08-14 Thread Sven Strickroth
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

2015-08-14 Thread Sven Strickroth
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

2015-08-14 Thread Sven Strickroth
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

Re: Arrow keys broken in gitk

2015-07-24 Thread Sven van Haastregt
s in Tk 8.6 are causing the problem. Quoting http://wiki.tcl.tk/22115 : ``The text widget's default bindings seem to have changed pretty considerably - a lot of things are now handled via custom events instead of direct bindings (notably things which move the cursor and alter selection

RFC: git status --amend

2015-03-31 Thread Sven Strickroth
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

[PATCH] Documentation: fix version numbering

2015-01-22 Thread Sven van Haastregt
Version numbers in asciidoc-generated content (such as man pages) went missing as of da8a366 (Documentation: refactor common operations into variables). Fix by putting the underscore back in the variable name. Signed-off-by: Sven van Haastregt --- Documentation/Makefile | 2 +- 1 file changed

Re: [PATCH] git-cat-file: fix output when format string contains no variables

2013-11-06 Thread Sven Brauch
seems more like a proper fix. I would prefer it over my suggestion. It is illogical that sha1_loose_object_info sometimes returns an error if the object does not exist and sometimes not, depending on which properties are requested. Sven -- To unsubscribe from this list: send the line "unsu

[PATCH] git-cat-file: fix output when format string contains no variables

2013-11-05 Thread Sven Brauch
>From 2e7b5aed771faeff654a447346bb0b57570d9569 Mon Sep 17 00:00:00 2001 From: Sven Brauch Date: Tue, 5 Nov 2013 20:06:21 +0100 Subject: [PATCH] git-cat-file: fix output when format string contains no variables When the format string for git-cat-object --batch-check contained no variables,

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

2013-05-09 Thread Sven Strickroth
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

2013-05-09 Thread Sven Strickroth
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

2013-05-08 Thread Sven Strickroth
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

2013-05-08 Thread Sven Strickroth
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

2013-05-08 Thread Sven Strickroth
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

2013-05-08 Thread Sven Strickroth
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

2013-05-08 Thread Sven Strickroth
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

2013-05-08 Thread Sven Strickroth
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

2013-03-09 Thread Sven Strickroth
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

2013-02-07 Thread Sven Strickroth
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

2013-02-06 Thread Sven Strickroth
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

2013-02-01 Thread Sven Strickroth
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

2013-02-01 Thread Sven Strickroth
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

2013-02-01 Thread Sven Strickroth
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

2013-02-01 Thread Sven Strickroth
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

2013-01-27 Thread Sven Strickroth
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

2013-01-25 Thread Sven Strickroth
-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

2013-01-25 Thread 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 version. Signed-off-by: Sven Strickroth --- mergetools/tortoisemerge | 11

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

2013-01-25 Thread 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 version. Signed-off-by: Sven Strickroth --- mergetools/tortoisemerge | 11

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

2013-01-25 Thread Sven Strickroth
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

2013-01-25 Thread Sven Strickroth
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

2013-01-25 Thread Sven Strickroth
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

2013-01-24 Thread Sven Strickroth
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

2013-01-24 Thread Sven Strickroth
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

2013-01-21 Thread Sven Strickroth
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

2013-01-21 Thread Sven Strickroth
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

2013-01-20 Thread Sven Strickroth
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 3/3] git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

2012-12-17 Thread Sven Strickroth
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

2012-12-17 Thread Sven Strickroth
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

2012-12-17 Thread Sven Strickroth
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

2012-12-17 Thread Sven Strickroth
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

2012-11-24 Thread Sven Strickroth
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

2012-11-11 Thread Sven Strickroth
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

2012-11-11 Thread Sven Strickroth
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

2012-11-11 Thread Sven Strickroth
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

2012-10-06 Thread Sven Strickroth
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

2012-08-11 Thread Sven Strickroth
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

2012-08-10 Thread Sven Strickroth
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

2012-08-10 Thread Sven Strickroth
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

Re: gitweb feature request: tarball for each commit

2005-09-08 Thread Sven Verdoolaege
On Thu, Sep 08, 2005 at 04:30:22PM +1200, Martin Langhoff wrote: > Actually... should get it done. I'll see if I can sneak it in sometime > soon... This has been done at least twice already. See e.g., http://www.liacs.nl/~sverdool/gitweb.cgi?p=gitweb.git;a=summary Check the archives for the othe

Re: [PATCH] gitweb - XMMS2 project customisations

2005-08-26 Thread Sven Verdoolaege
On Fri, Aug 26, 2005 at 07:16:05PM +0800, Sham Chukoury wrote: > G'day. > > I figured you folks might be interested in a number of modifications the > XMMS2 team have made to gitweb. All the changes can be seen at > http://git.xmms.se > > 1) Navbar refactoring (gitweb-xmms2navbar.diff) > 3) Sna

Re: [PATCH] gitweb - Use instead of .

2005-08-18 Thread Sven Verdoolaege
On Thu, Aug 18, 2005 at 11:30:41PM +0900, Yasushi SHOJI wrote: > Use instead of . > Hmm in snownews this gets displayed as "Use instead of .". (http://www.liacs.nl/~sverdool/gitweb.cgi?p=gitweb.git;a=rss) Is that a problem with snownews or with gitweb ? skimo - To unsubscribe from this li

Re: [PATCH] Add merge detection to git-cvsimport

2005-08-16 Thread Sven Verdoolaege
On Tue, Aug 16, 2005 at 10:35:27PM +1200, Martin Langhoff wrote: > + > +sub get_headref($$) { If you want to check whether a ref is valid, then it is better to use git-rev-parse... > +my $name= shift; > +my $git_dir = shift; > +my $sha; > + > +if (open(C,"$git_dir/refs/he

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Sven Verdoolaege
On Mon, Aug 15, 2005 at 12:38:53PM +0200, Matthias Urlichs wrote: > Hi, Wolfgang Denk wrote: > > > Assume I know exactly where the merge back happenend - is there any > > way to tell git about it, so I don't see all these dangling heads any > > more? > > Two ways: > - you can enhance cvs2git to

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Sven Verdoolaege
blame cvsps, I think cvsimport should use the > "-ko" flag to disable keyword expansion or whatever the magic flag is. > > Sven, Matthias, opinions? I've never used CVS keyword expansion, and > always felt it was pointless, but hey.. > I don't have any strong opini

Re: gitweb: not all files listed in commit list

2005-08-04 Thread Sven Verdoolaege
On Wed, Aug 03, 2005 at 08:49:16PM -0500, Olof Johansson wrote: > Hi, > > My apologies if this has already been found and reported; I'm not > tracking the list closely. > > It seems that newly introduced files are not shown in gitweb. > For example, see the following commit: > > http://kernel.or

[PATCH] git-cvsimport-script: parse multidigit revisions

2005-07-12 Thread Sven Verdoolaege
git-cvsimport-script: parse multidigit revisions. Previously, git-cvsimport-script would fail on revisions with more than one digit. Signed-off-by: Sven Verdoolaege <[EMAIL PROTECTED]> --- commit 7b5f7bcc470528beb4a0b6ef1c93ce634aaa0158 tree db66d0759f97016bd123e2351aa0e77585e3177b

[PATCH] git-cvsimport-script: add "import only" option

2005-07-11 Thread Sven Verdoolaege
git-cvsimport-script: add "import only" option. Acked-by: Matthias Urlichs <[EMAIL PROTECTED]> Signed-off-by: Sven Verdoolaege <[EMAIL PROTECTED]> --- commit 1be6fbebb010083a083d8e2ee69fced7b6ae1261 tree a69017b2d10fd0a2655070d177f7cf59ab21882f parent a3eb250f996bf5e123

Re: [PATCH] rev-list: add "--full-objects" flag.

2005-07-10 Thread Sven Verdoolaege
snapshots. --- commit f76a442a0e2166b3f17db0e496545a600a33f94c tree f8f089ab738864e69e0155b10262dbec832b4a11 parent 8392280de17a89a451c1f7db4e268f2047d4aa83 author Sven Verdoolaege <[EMAIL PROTECTED]> Sun, 10 Jul 2005 23:56:42 +0200 committer Sven Verdoolaege <[EMAIL PROTECTED]> Sun, 10 Jul 2005

Re: cogito Mac OS X compatibility

2005-07-09 Thread Sven Verdoolaege
On Fri, Jul 08, 2005 at 07:34:55PM -0400, Bryan Larsen wrote: > This appears to be some sort of weird shell thing. I've got bash 3.0 > compiling in the background to see if that fixes the problem. > Sounds like you're missing "stat" from coreutils. skimo - To unsubscribe from this list: send th

Re: cvsimport: rewritten in Perl

2005-07-05 Thread Sven Verdoolaege
; Matthias? That was my mistake, actually. Thanks for spotting this. skimo -- git-cvsimport-script: close temporary file. --- commit 6b6fdaa290f7dfd178a518fcafb9e14e652eb8ac tree 725e7c6ecc75a0e90a6bc002ce540bd74dca999e parent f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba author Sven Verdoolaege <[EMAIL P

Re: [PATCH] cvsimport: rewritten in Perl

2005-07-04 Thread Sven Verdoolaege
28537171e7ec23c8677ea6e77c208583f95caa28 tree ca80ed2fad05b150984c14a5364dac8d3e307120 parent 6e7e37b0bfc921aa1f0cb30560fc128e87a41966 author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 17:10:06 +0200 committer Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 17:10:06 +0200 git-cvsimport-script |9 +--

[PATCH] git-cvsimport-script: update cvsps cache instead of rebuilding it

2005-07-04 Thread Sven Verdoolaege
12a9303d4ba4566d9e081b2c375648685ce41e93 parent 46e63efc072bc440e4c6aad33d3157b70f5172b6 author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 15:35:30 +0200 committer Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 15:35:30 +0200 git-cvsimport-script |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

[PATCH] git-cvsimport-script: fix branch switching

2005-07-04 Thread Sven Verdoolaege
git-cvsimport-script: fix branch switching Previous patch broke branch switching. --- commit 46e63efc072bc440e4c6aad33d3157b70f5172b6 tree 2c4fd7286e29e6041808d07874ef2151e3876676 parent 79ee456cf222982f7ee3f003440c57b5f7cffa8b author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005

Re: [PATCH] cvsimport: rewritten in Perl

2005-07-04 Thread Sven Verdoolaege
On Mon, Jul 04, 2005 at 03:53:27PM +0200, Matthias Urlichs wrote: > Hi, > > Sven Verdoolaege: > > Why not an explicit '-z' option as in the current git-cvsimport-script ? > > Because my code doesn't support compressed cvs connections: > a -z that doesn

Re: [PATCH] cvsimport: rewritten in Perl

2005-07-04 Thread Sven Verdoolaege
On Thu, Jun 30, 2005 at 11:00:23PM +0200, Matthias Urlichs wrote: > Sven Verdoolaege: > > It would also be nice if the user could pass extra options > > to cvsps (notably '-z'). > > > Ditto. ;-) Why not an explicit '-z' option as in the current gi

[PATCH] git-cvsimport-script: use private index.

2005-07-04 Thread Sven Verdoolaege
git-cvsimport-script: use private index. --- commit 79ee456cf222982f7ee3f003440c57b5f7cffa8b tree c27c7f8bafa48d81a4d9f7562b851681984a9c7e parent 2eb6d82eaa869a1faf4ba3326fd628f76f9f93a8 author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 13:36:59 +0200 committer Sven Verdoolaege &

[PATCH] git-cvsimport-script: leave working directory alone.

2005-07-04 Thread Sven Verdoolaege
git-cvsimport-script: leave working directory alone. --- commit 2eb6d82eaa869a1faf4ba3326fd628f76f9f93a8 tree 3e59c8c298e51a8ae20102b4b139c84c79fa54a0 parent 866d13108e969773347828daa9b7f3476ec70cb8 author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 00:43:26 +0200 committe

Re: [PATCH] cvsimport: rewritten in Perl

2005-07-04 Thread Sven Verdoolaege
Hi, On Mon, Jul 04, 2005 at 03:49:48AM +0200, Matthias Urlichs wrote: > Sven Verdoolaege: > > Note how the patchsets with the same date have somehow > > been reversed. Any ideas ? > > > No. I process the lines from cvsps in the order I get them... > Ok, I reran cvs

  1   2   >