4490a6dab1df5404f91ab3eb871f133154bff0bf
Length DateTimeName
- -- -
6 2012-08-10 23:41 +?+?++.txt
- ---
6 1 file
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server
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
) 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
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
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
is introduced in this commit.
This change also adds a fallback to SSH_ASKPASS.
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
perl/Git.pm| 48 +++-
perl/Git/SVN/Prompt.pm | 20 +---
2 files changed, 48 insertions(+), 20
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 em...@cs-ware.de
---
perl/Git.pm| 28 +---
perl/Git/SVN/Prompt.pm | 16
Hi,
Am 26.11.2012 05:50 schrieb Junio C Hamano:
Sven Strickroth sven.strickr...@tu-clausthal.de 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
you quoted early in January
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 em...@cs-ware.de
---
perl/Git.pm| 45
$REMOTE -merged $MERGED
+ check_unchanged
+ else
+ echo TortoiseGitMerge cannot be used without a base 12
+ return 1
+ fi
+}
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server
--
To unsubscribe from this list: send the line
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
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
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
version
Am 24.01.2013 20:51 schrieb Junio C Hamano:
Sven Strickroth sven.strickr...@tu-clausthal.de 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 confusion
with the 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 em...@cs-ware.de
Reported
Am 25.01.2013 19:28 schrieb Junio C Hamano: Sven Strickroth
sven.strickr...@tu-clausthal.de writes:
TortoiseGitMerge and filenames with spaces
??? ECANNOTPARSE.
... ah, wait. Is this a broken-off tail of your subject line?
Yes.
+touch $BACKUP
+basename
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 em...@cs-ware.de
---
mergetools
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 em...@cs-ware.de
---
mergetools
-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 em...@cs-ware.de
Reported-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/tortoisemerge | 14 +++---
1 file changed, 11
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 list: send the line unsubscribe git
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 em...@cs-ware.de
Reported-by: Sebastian Schuberth sschube
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 list: send
://www.mingw.org/wiki/Posix_path_conversion
Sven?
I just mailed a new patch. Thanks to Sebastian for pointing this out!
@Junio: Feel free to optimize the commit message.
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server
--
To unsubscribe from this list: send the line
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 em...@cs-ware.de
Reported-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/tortoisemerge
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 em...@cs
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 the type user@host:path use ssh, tell
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 the type user@host:path use ssh, tell
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 em...@cs-ware.de
---
compat/mingw.h | 6 ++
1 file changed, 6
Some compilers, like Visual C++ complain when is used instead of
double quotes for non system includes.
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
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
With MSVC initializing a variable with int a=a causes a warning about
using an uninitialized value.
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
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
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 F5A9D4C4 @ any key-server
--
To unsubscribe from this list: send the line
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
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
Am 14.08.2015 um 21:35 schrieb Eric Sunshine:
Signed-off-by: Sup Yut Sum ch3co...@gmail.com
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
diff --git a/config.c b/config.c
index 9fd275f..89b49e3 100644
--- a/config.c
+++ b/config.c
@@ -2048,6 +2048,7 @@ int
Without this patch there might be open file handle leaks.
Signed-off-by: Sven Strickroth em...@cs-ware.de
Signed-off-by: Sup Yut Sum ch3co...@gmail.com
---
config.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 9fd275f..83caa25 100644
W/o this fix there is one character missing at the end.
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
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
Without this patch there might be open file handle leaks.
Signed-off-by: Sven Strickroth em...@cs-ware.de
Signed-off-by: Sup Yut Sum ch3co...@gmail.com
---
config.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config.c b/config.c
index 9fd275f..8138d5d 100644
--- a/config.c
+++ b
Without this patch there might be open handle leaks.
Signed-off-by: Sup Yut Sum ch3co...@gmail.com
Signed-off-by: Sven Strickroth em...@cs-ware.de
---
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
Without this patch there might be open file handle leaks.
Signed-off-by: Sven Strickroth em...@cs-ware.de
Signed-off-by: Sup Yut Sum ch3co...@gmail.com
---
config.c | 4
1 file changed, 4 insertions(+)
diff --git a/config.c b/config.c
index 9fd275f..c06dc2f 100644
--- a/config.c
+++ b
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 <s...@cs-ware.de>
---
builtin/commit.c | 11 ++-
1 file changed, 10 insertions(+),
Reduce the number of defines which need to be managed within vanilal git.
Signed-off-by: Sven Strickroth <s...@cs-ware.de>
---
compat/mingw.h | 2 +-
compat/vcbuild/include/unistd.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/
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 <s...@cs-ware.de>
---
compat/snprintf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/snprintf.c b/compat/snprintf.c
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 <gits...@pobox.com>.
Signed-off-by: Sven Strickroth <s...@cs-ware.de>
---
buil
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 <s...@cs-ware.de>
---
builtin/commit.c | 6 ++
1 file changed, 6 insertions(+)
diff
sg())) {
> read SQUASH_MSG;
> }
> if (file_exists(git_path_merge_msg()))
> read MERGE_MSG;
> }
> hook_arg1 = "merge";
> }
Here hook_arg1 would be always "merge" and never "squash"... Before
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 <em...@cs-ware.de>
---
builtin/commit.c | 20
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
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 <s...@cs-ware.de>
---
compat/m
Signed-off-by: Sven Strickroth <em...@cs-ware.de>
---
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/
[1] https://msdn.microsoft.com/en-us/library/1kt27hek.aspx
Signed-off-by: Sven Strickroth <s...@cs-ware.de>
---
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/c
urs
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
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
Signed-off-by: Sven Strickroth <em...@cs-ware.de>
---
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/gitw
Signed-off-by: Sven Strickroth <em...@cs-ware.de>
---
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..884
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
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
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
57 matches
Mail list logo
