[PATCH 1/2] Call load_command_list() only when it is needed

2013-12-30 Thread Sebastian Schuberth
This avoids list_commands_in_dir() being called when not needed which is quite slow due to file I/O in order to list matching files in a directory. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- builtin/help.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH 2/2] Speed up is_git_command() by checking early for internal commands

2013-12-30 Thread Sebastian Schuberth
Since 2dce956 is_git_command() was a bit slow as it does file I/O in the call to list_commands_in_dir(). Avoid the file I/O by adding an early check for internal commands. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- builtin/help.c | 5 ++ git.c | 242

Re: [PATCH 2/2] Speed up is_git_command() by checking early for internal commands

2014-01-02 Thread Sebastian Schuberth
a bit unfortunate that we seem to use the terms builtin and internal command interchangeably. I'll probably add a patch to address this. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH v2 0/4]

2014-01-02 Thread Sebastian Schuberth
to the existing builtin.h, * finally moves all builtin-related definitions to a new builtin.c file. Sebastian Schuberth (4): Consistently use the term builtin instead of internal command Call load_command_list() only when it is needed Speed up is_git_command() by checking early for internal

[PATCH v2 3/4] Speed up is_git_command() by checking early for internal commands

2014-01-02 Thread Sebastian Schuberth
Since 2dce956 is_git_command() is a bit slow as it does file I/O in the call to list_commands_in_dir(). Avoid the file I/O by adding an early check for internal commands. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/technical/api-builtin.txt | 4 +- builtin.h

[PATCH v2 2/4] Call load_command_list() only when it is needed

2014-01-02 Thread Sebastian Schuberth
This avoids list_commands_in_dir() being called when not needed which is quite slow due to file I/O in order to list matching files in a directory. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- builtin/help.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH v2 1/4] Consistently use the term builtin instead of internal command

2014-01-02 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/technical/api-builtin.txt | 2 +- git.c | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/technical/api-builtin.txt b/Documentation

[PATCH v2 4/4] Move builtin-related implementations to a new builtin.c file

2014-01-02 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/technical/api-builtin.txt | 2 +- Makefile| 1 + builtin.c | 225 ++ builtin.h | 21 +++ git.c

[PATCH] Fix safe_create_leading_directories() for Windows

2014-01-02 Thread Sebastian Schuberth
See https://github.com/msysgit/git/pull/80. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- sha1_file.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index

Re: [PATCH] Fix safe_create_leading_directories() for Windows

2014-01-02 Thread Sebastian Schuberth
of pull requests in order to follow the link and read the text in there. -- Sebastian Schuberth -- 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] Fix safe_create_leading_directories() for Windows

2014-01-02 Thread Sebastian Schuberth
was that IMHO the commit does not *depend* on the information provided in the link; for me the commit was simply self-evident, and I just added link as optional information, not to replace any inline text that I would have written otherwise. -- Sebastian Schuberth -- To unsubscribe from this list: send

Re: [PATCH v2 1/4] Consistently use the term builtin instead of internal command

2014-01-02 Thread Sebastian Schuberth
it clear that this is a low-level error. Right, I'll change this in a re-roll (using single-quotes for the command name). The rest of the patch looks good. Thanks for the review. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH] Fix safe_create_leading_directories() for Windows

2014-01-07 Thread Sebastian Schuberth
and using / accepting pull requests :-) In any case, I do think that the contributions we got via pull requests were in general contributions we would not otherwise have gotten. I absolutely think so, too. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH] Fix safe_create_leading_directories() for Windows

2014-01-18 Thread Sebastian Schuberth
-specific input. In other words, I would expect the word safe to be applied not only to the output (the creation of the directory hierarchy with any missing parent directories) but also to the input (the arguments to the function). -- Sebastian Schuberth -- To unsubscribe from this list: send the line

Re: [PATCH] Fix safe_create_leading_directories() for Windows

2014-01-18 Thread Sebastian Schuberth
Dscho made valid points in his other mail that the better solution still is to make safe_create_leading_directories() actually safe, also regarding its arguments. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH v2] safe_create_leading_directories(): on Windows, \ can separate path components

2014-01-19 Thread Sebastian Schuberth
slash_character than the was_slash variable name. -- Sebastian Schuberth -- 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 v2 03/17] safe_create_leading_directories(): add explicit slash pointer

2014-01-19 Thread Sebastian Schuberth
to take Michael's patch that applies cleanly on top of v3 of his mh/safe-create-leading-directories instead of your merge conflict resolution. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH v2 3/4] Speed up is_git_command() by checking early for internal commands

2014-01-22 Thread Sebastian Schuberth
On 05.01.2014 14:42, Sebastian Schuberth wrote: Since 2dce956 is_git_command() is a bit slow as it does file I/O in the call to list_commands_in_dir(). Avoid the file I/O by adding an early check for internal commands. Considering the purpose of the series is it better to say builtin instead

Re: [PATCH v2 1/4] Consistently use the term builtin instead of internal command

2014-01-22 Thread Sebastian Schuberth
On 02.01.2014 22:05, Sebastian Schuberth wrote: would just leave me wondering I never claimed it was built-in; what's going on? I think it would be simplest to keep it as $ git whatever fatal: cannot handle whatever internally which at least makes it clear

[PATCH] t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

2014-03-19 Thread Sebastian Schuberth
of it. This was discovered in the context of the mingwGitDevEnv project and only did not surface before with msysgit because the latter does not ship rsync. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- t/t5510-fetch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t

Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-19 Thread Sebastian Schuberth
://sourceforge.net/p/mingw/bugs/1823/ -- Sebastian Schuberth -- 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: Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-19 Thread Sebastian Schuberth
On Sat, Apr 19, 2014 at 8:42 PM, Heiko Voigt hvo...@hvoigt.net wrote: But AFAIK its not ready for production use yet. I guess Sebastian would not mind contributions. Not at all! -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [msysGit] Re: Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-21 Thread Sebastian Schuberth
/0015-msys.dll-support-ALT-NUMPAD-console-input.patch [4] https://github.com/msysgit/msysgit/blob/msys/src/rt/patches/0016-msys.dll-backport-multibyte-support-functions-from-n.patch -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: What is missing from Git v2.0

2014-04-21 Thread Sebastian Schuberth
just search GitHub) which are again likely to differ (slightly), hindering interoperability. [1] https://github.com/github/msysgit/pull/27 [2] https://github.com/sschuberth/dev-scripts/blob/master/git/.gitconfig -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe

Re: What is missing from Git v2.0

2014-04-21 Thread Sebastian Schuberth
it: cherry-pick is somewhat like copying commits, thus cp makes much sense to me. FTR color.ui = true is not needed any more, also hopefully mergetool.prompt = false wouldn't be either [1]. Thanks! -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git

Re: What is missing from Git v2.0

2014-04-22 Thread Sebastian Schuberth
Git, caused by some rethinking and structural changes in some big companies. -- Sebastian Schuberth -- 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: What is missing from Git v2.0

2014-04-22 Thread Sebastian Schuberth
. -- Sebastian Schuberth -- 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] MSVC: link dynamically to the CRT

2014-04-30 Thread Sebastian Schuberth
seeing a patch from Erik or J6t, is it unnecessary for me to do so for a patch from you? I'm putting Marat in CC who has been recently active in building Git with MSVC. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH/RFC] Makefile: do not depend on curl-config

2014-04-30 Thread Sebastian Schuberth
environment. The environment is just that: The environment to build Git for Windows. This means that patches on top of Git for Windows could still be maintained in msysgit/git (or a fork thereof) on GitHub. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH/RFC] Makefile: do not depend on curl-config

2014-05-05 Thread Sebastian Schuberth
for Windows. This means that patches on top of Git for Windows could still be maintained in msysgit/git (or a fork thereof) on GitHub. Thanks for the heads up. Even so, are you guys OK with me pushing this patch to our downstream repo? Fine with me. -- Sebastian Schuberth -- To unsubscribe from

Re: Watchman support for git

2014-05-08 Thread Sebastian Schuberth
/posts/218678814984400/scaling-mercurial-at-facebook/ -- Sebastian Schuberth -- 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 1/2] subtree: Add an install-html target

2014-10-15 Thread Sebastian Schuberth
Also adjust ignore rules accordingly. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- contrib/subtree/.gitignore | 3 ++- contrib/subtree/Makefile | 9 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore

[PATCH 2/2] contacts: Add a Makefile to generate docs and install

2014-10-15 Thread Sebastian Schuberth
Also add a gitignore file for generated files. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- contrib/contacts/.gitignore | 3 ++ contrib/contacts/Makefile | 71 + 2 files changed, 74 insertions(+) create mode 100644 contrib/contacts

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Sebastian Schuberth
araxis bc bc3 codecompare Why keep bc3 here? And shouldn't we update git-gui/lib/mergetool.tcl, too? -- Sebastian Schuberth -- 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

[PATCH] git-gui/gitk: Do not depend on Cygwin's kill command on Windows

2014-10-23 Thread Sebastian Schuberth
Windows XP Professional. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- git-gui/git-gui.sh | 4 +--- gitk-git/gitk | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index b186329..a1c823e 100755 --- a/git-gui/git-gui.sh

[PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-06 Thread Sebastian Schuberth
For custom builds of Git it sometimes is inconvenient to annotate tags because there simply is nothing to say, so do not require an annotation. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- GIT-VERSION-GEN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GIT

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-07 Thread Sebastian Schuberth
than not setting an annotation at all, because I would assume if an annotation is set it's not empty, and if it is, I would expect this to be a user error. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-07 Thread Sebastian Schuberth
On Fri, Sep 6, 2013 at 11:40 PM, Junio C Hamano gits...@pobox.com wrote: For custom builds of Git it sometimes is inconvenient to annotate tags because there simply is nothing to say, so do not require an annotation. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- H

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-07 Thread Sebastian Schuberth
I've seen so far are just trivial variations of the tag name, anyway. a case where you have your own tag that points at the exact version as I tagged? In such a case, do you have a preference on which tag No. I always carry patches on top. -- Sebastian Schuberth -- To unsubscribe from

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-10 Thread Sebastian Schuberth
to the same commit. -- Sebastian Schuberth -- 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] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-10 Thread Sebastian Schuberth
and reducing the linecount to change it to remove one. Fair enough! -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Sebastian Schuberth
This is necessary so that read_mailmap() can obtain a pointer to the function. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- git-compat-util.h | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index be1c494

[PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Sebastian Schuberth
With MinGW runtime version 4.0 this interferes with the previous definition from sdkddkver.h. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- compat/nedmalloc/malloc.c.h | 2 ++ git-compat-util.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/compat/nedmalloc

Re: [PATCH 3/3] MSVC: fix stat definition hell

2013-09-11 Thread Sebastian Schuberth
of changes in mingwrt-4.0 see: http://sourceforge.net/p/mingw/mingw-org-wsl/ci/4.0.0/tree/NEWS Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- compat/mingw.c | 1 - compat/mingw.h | 9 + config.mak.uname | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git

Re: [PATCH 0/3] Fix MSVC compile errors and cleanup stat definitions

2013-09-11 Thread Sebastian Schuberth
to review, suggest improvements on, and/or judge these patches. I'm Cc'ing regulars who work on mingw port for their help and Ack. Acked-by: Sebastian Schuberth sschube...@gmail.com -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Sebastian Schuberth
other issues with Git 1.8.4 on Windows first. I'd be grateful if you could wiggle it in. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Sebastian Schuberth
* __sz2, size_t __sizeMaxCompare) {return _strnicmp (__sz1, __sz2, __sizeMaxCompare);} #else #define strncasecmp _strnicmp #endif [1] http://sourceforge.net/p/mingw/mingw-org-wsl/ci/master/tree/include/string.h#l107 -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-12 Thread Sebastian Schuberth
believe it's good to have these guards for both MinGW and MSVC, actually. Here is what I tentatively queued on top of the three from Karsten, and your Fix stat definitions. Looks good to me, thanks! -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-12 Thread Sebastian Schuberth
__attribute__((__cdecl__)) __attribute__ ((__nothrow__)) strncasecmp (const char * __sz1, const char * __sz2, size_t __sizeMaxCompare) {return _strnicmp (__sz1, __sz2, __sizeMaxCompare);} -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-12 Thread Sebastian Schuberth
. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-12 Thread Sebastian Schuberth
definition of strncasecmp aka _strnicmp. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-13 Thread Sebastian Schuberth
with another patch. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-13 Thread Sebastian Schuberth
*/ #ifndef _WIN32_WINNT -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-13 Thread Sebastian Schuberth
. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-13 Thread Sebastian Schuberth
including winsock.h */ @@ -99,10 +118,6 @@ #include stddef.h #include stdlib.h #include stdarg.h -#include string.h -#ifdef HAVE_STRINGS_H -#include strings.h /* for strcasecmp() */ -#endif #include errno.h #include limits.h #ifdef NEEDS_SYS_PARAM_H -- Sebastian Schuberth -- To unsubscribe from

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-13 Thread Sebastian Schuberth
IMHO should do so. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-13 Thread Sebastian Schuberth
. -- Sebastian Schuberth -- 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] git-compat-util: Avoid strcasecmp() being inlined

2013-09-15 Thread Sebastian Schuberth
it even more ugly and less comprehensible, IMHO. [1] http://www.spinics.net/lists/git/msg217546.html -- Sebastian Schuberth -- 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

[PATCH v2 resend] gitk: Use an external icon file on Windows

2012-08-08 Thread Sebastian Schuberth
Git for Windows now ships with the new Git icon from git-scm.com. Use that icon file instead of the old procedurally drawn one if it exists. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- gitk-git/gitk | 49 ++--- 1 file changed, 26

Re: [PATCH v2 resend] gitk: Use an external icon file on Windows

2012-08-09 Thread Sebastian Schuberth
%28software%29#External_links [3] https://github.com/msysgit/msysgit/issues/44 -- Sebastian Schuberth -- 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] Add Code Compare v2.80.4 as a merge / diff tool for Windows

2012-08-09 Thread Sebastian Schuberth
send a v2 that changes merge-config.txt and diff-config.txt to refer to git-mergetool --tool-help and git-difftool --tool-help instead of naming any actual tools. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH v2 resend] gitk: Use an external icon file on Windows

2012-08-09 Thread Sebastian Schuberth
, I'll include the patch into Git for Windows, because that's what our users ask for. -- Sebastian Schuberth -- 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] Add Code Compare v2.80.4 as a merge / diff tool for Windows

2012-08-09 Thread Sebastian Schuberth
in the short term, as you yourself say the topic to make use of --tool-help is a long term goal. -- Sebastian Schuberth -- 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

Re: [PATCH] mergetool,difftool: Document --tool-help consistently

2012-08-10 Thread Sebastian Schuberth
tools that may be used with `--tool`. + This should say list of merge tools, however. [1] http://thread.gmane.org/gmane.comp.version-control.git/201913/focus=201922 -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

[PATCH v2] Add Code Compare v2.80.4 as a merge / diff tool for Windows

2012-08-10 Thread Sebastian Schuberth
with according to these rules: http://www.mingw.org/wiki/Posix_path_conversion Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- contrib/completion/git-completion.bash |2 +- git-mergetool--lib.sh |2 +- mergetools/codecompare | 25

Re: The GitTogether

2012-09-20 Thread Sebastian Schuberth
not in the first week of October. As I'm a local, I could probably also help with finding a location if necessary. -- Sebastian Schuberth -- 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

Re: The GitTogether

2012-09-21 Thread Sebastian Schuberth
of the many co-working locations in Berlin [1] to be a good fit. [1] http://www.coworking.de/regions/1-berlin -- Sebastian Schuberth -- 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

[PATCH] Do not call built-in aliases from scripts

2013-06-27 Thread Sebastian Schuberth
-off-by: Sebastian Schuberth sschube...@gmail.com --- git-am.sh| 6 ++--- git-archimport.perl | 68 git-cvsexportcommit.perl | 18 ++--- git-cvsserver.perl | 50 +-- git-merge

Re: [PATCH] Do not call built-in aliases from scripts

2013-06-27 Thread Sebastian Schuberth
to blindly do this conversion with sed/perl and fail to spot misconversion before sending it out. At least the test suite (running on Linux) did not throw any failures at me after applying this patch. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] Do not call built-in aliases from scripts

2013-06-28 Thread Sebastian Schuberth
to see documentation changes in a patch separate from a do not call git-foo form patch. I'll send a new version of the patch next week to address this and also use quotes when replacing a hyphenated form in prose. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe

Re: [msysGit] [PATCH] Do not call built-in aliases from scripts

2013-06-28 Thread Sebastian Schuberth
-resolve.sh @@ -45,7 +45,7 @@ then exit 0 else echo Simple merge failed, trying Automatic merge. - if git-merge-index -o git-merge-one-file -a + if git merge-index -o git-merge-one-file -a As above, with -octopus. Sorry, I can't follow you here. -- Sebastian Schuberth

Re: [RFC] Add basic syntax check on shell scripts

2012-12-05 Thread Sebastian Schuberth
\) is bad. Use egrep (or grep -E) if you want to use ERE. Yet more thing that is probably worth catching, although not related to bashism: Avoid the use of which in favor of e.g. type. In any case, having this check as a local pre-commit hook would be great! -- Sebastian Schuberth

Exploiting SHA1's XOR weakness allows for faster hash calculation

2012-12-05 Thread Sebastian Schuberth
] https://hashcat.net/p12/js-sha1exp_169.pdf -- Sebastian Schuberth -- 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: Exploiting SHA1's XOR weakness allows for faster hash calculation

2012-12-06 Thread Sebastian Schuberth
of keeping the padding constant in the rest of theinput buffer, this particular optimization would't apply.) In any case, it's not at all applicable for general purpose checksum calculations, and hence wouldn't apply to git. Thanks for the explanation. -- Sebastian Schuberth -- To unsubscribe

[PATCH] nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2

2012-12-11 Thread Sebastian Schuberth
On MinGW, GCC 4.7.2 complains about operation on 'p-m[end]' may be undefined Fix this by replacing the faulty lines with those of 69825ca from https://github.com/ned14/nedmalloc/blob/master/nedmalloc.c Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- compat/nedmalloc

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread Sebastian Schuberth
)vimdiff, so loosing these on that platform would not be so nice. -- Sebastian Schuberth -- 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 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread Sebastian Schuberth
On Fri, Jan 25, 2013 at 11:34 AM, Sebastian Schuberth sschube...@gmail.com wrote: I thought Git did something sensible there like create a normal file? It does not. Also see my answer over here: http://stackoverflow.com/questions/11412028/git-not-storing-symlink-as-a-symlink-on-windows

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

2013-02-01 Thread Sebastian Schuberth
file.txt (including 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 -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe

Re: SSH version on Git 1.8.1.2 for Windows is outdated.

2013-03-16 Thread Sebastian Schuberth
[2] https://github.com/sschuberth/mingwGitDevEnv/pull/5 -- Sebastian Schuberth -- 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: SSH version on Git 1.8.1.2 for Windows is outdated.

2013-03-16 Thread Sebastian Schuberth
anticipated. But I realize I need to make contributing easier, and also find the time to merge some outstanding pull requests. I hope to be able to make some significant improvements at the end of March. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git

[PATCH] git-svn: Support custom tunnel schemes instead of SSH only

2013-03-26 Thread Sebastian Schuberth
This originates from an msysgit pull request, see: https://github.com/msysgit/git/pull/58 Signed-off-by: Eric Wieser wieser.e...@gmail.com Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- perl/Git/SVN/Ra.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Git

Unifying mergetool configuration between git and git-gui

2012-07-22 Thread Sebastian Schuberth
the mergetool. Or, in case that git gui needs to use a different tool than the one configured as mergetool, that mergetool.tcl somehow uses the configuration from mergetools/*. Thanks for any insights. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git

[PATCH] gitk: Use an external icon file on Windows

2012-07-22 Thread Sebastian Schuberth
Git for Windows now ships with the new Git icon from git-scm.com. Use that icon file instead of the old procedurally drawn one. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- gitk-git/gitk | 49 ++--- 1 file changed, 26 insertions(+), 23

Re: [PATCH 2/5] difftool: Eliminate global variables

2012-07-23 Thread Sebastian Schuberth
On 23.07.2012 05:42, David Aguilar wrote: Organize the script so that it has a single main() function which calls out to dir_diff() and file_diff() functions. This eliminates dir-diff-specific variables that do not need to be calculated when performing a regular file-diff. Funny, I just have

Re: [PATCH 2/5] difftool: Eliminate global variables

2012-07-23 Thread Sebastian Schuberth
just tried it now. They work outside of a repository. Great, thanks! I'm dropping my patch then. -- Sebastian Schuberth -- 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

[PATCH 0/4] Various merge / diff tool related minor clean-ups and improvements

2012-07-23 Thread Sebastian Schuberth
This series introduce various minor clean-ups and improvements to the merge / diff tool scripts and documentation. Sebastian Schuberth (4): Use variables for the lists of tools that support merging / diffing Explicitly list all valid diff tools and document --tool-help as an option

[PATCH v2 0/5] Various merge / diff tool related minor clean-ups and improvements

2012-07-23 Thread Sebastian Schuberth
This series introduces various minor clean-ups and improvements to the merge / diff tool scripts and documentation. Sorry, the first version was missing a patch. Sebastian Schuberth (5): Sort the list of tools that support both merging and diffing alphabetically Use variables

[PATCH v2 2/5] Use variables for the lists of tools that support merging / diffing

2012-07-23 Thread Sebastian Schuberth
Also, add a few comments that clarify the meaning of these variables. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- contrib/completion/git-completion.bash | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b

[PATCH v2 1/5] Sort the list of tools that support both merging and diffing alphabetically

2012-07-23 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- contrib/completion/git-completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 5be9dee..f2c4894 100755 --- a/contrib

[PATCH v2 4/5] Make sure to use Araxis' compare and not e.g. ImageMagick's

2012-07-23 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- mergetools/araxis | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mergetools/araxis b/mergetools/araxis index 64f97c5..aeba1b9 100644 --- a/mergetools/araxis +++ b/mergetools/araxis @@ -16,5 +16,11 @@ merge_cmd

[PATCH v2 5/5] Add a few more code comments and blank lines in guess_merge_tool

2012-07-23 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- git-mergetool--lib.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index ed630b2..ac9a8f0 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -112,14 +112,17

[PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option

2012-07-23 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/git-difftool.txt | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 31fc2e3..5dd54f1 100644 --- a/Documentation/git

[PATCH 1/4] Use variables for the lists of tools that support merging / diffing

2012-07-23 Thread Sebastian Schuberth
Also, add a few comments that clarify the meaning of these variables and sort the list of tools alphabetically. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- contrib/completion/git-completion.bash | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git

Re: mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
and blank lines in guess_merge_tool and parts of [PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option and adjusted the docs for git-mergetool accordingly. -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

[PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
This way we do not have to risk the list of tools go out of sync between the implementation and the documentation. Adjust the documentation accordingly to not explicitly list the tools but refer to --tool-help. Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Sebastian Schuberth

[PATCH] Make sure to use Araxis' compare and not e.g. ImageMagick's

2012-07-23 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- mergetools/araxis | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mergetools/araxis b/mergetools/araxis index 64f97c5..f8899f8 100644 --- a/mergetools/araxis +++ b/mergetools/araxis @@ -16,5 +16,12

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
it is just clearer what places need to be modified if there are no places that list an arbitrary subset of tools. -- Sebastian Schuberth -- 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

Re: [PATCH] Make sure to use Araxis' compare and not e.g. ImageMagick's

2012-07-23 Thread Sebastian Schuberth
but are in PATH. Please feel free to ignore the patch if you feel the heuristics is not sufficiently safe. I'm currently unable to come up with a safer solution while maintaining portability, i.e. not use which or doing rather laborious string parsing on the output of type. -- Sebastian Schuberth

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
want to keep --tool-help being mentioned inline as part of the --tool option documentation only? -- Sebastian Schuberth -- 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

Re: [PATCH] Make sure to use Araxis' compare and not e.g. ImageMagick's

2012-07-23 Thread Sebastian Schuberth
dialog with usage info in that case, so it's not controllable, unfortunately. -- Sebastian Schuberth -- 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

  1   2   3   >