[PATCH] branch: reject -D/-d without branch name

2013-01-25 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 873f624..1d3e842 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -837,7 +837,7 @@ int cmd_branch(int

Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-25 Thread Alexey Shumkin
Maybe, some time ;) Actually, I'm not TCL-programmer. With one of these patches I just have solved one my problem (to run tortoisemerge with git-gui) when I was showing to my collegue how to work with Git, and on the side I fixed another two bugs. So, I decided to sumbit these patches, to avoid

Re: [PATCH] branch: reject -D/-d without branch name

2013-01-25 Thread Matthieu Moy
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/builtin/branch.c b/builtin/branch.c index 873f624..1d3e842 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -837,7 +837,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) colopts = 0;

Re: [PATCH] branch: reject -D/-d without branch name

2013-01-25 Thread Duy Nguyen
On Fri, Jan 25, 2013 at 3:45 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/builtin/branch.c b/builtin/branch.c index 873f624..1d3e842 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -837,7 +837,7 @@ int

Re: [PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index c248509..4db43a4 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh ... @@ -112,12 +133,12 @@ commit $head2 commit $head1 EOF

[PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Sven Strickroth
TortoiseGitMerge and filenames with spaces - 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, (uses spaces as cli parameter key-value separators) and prevent confusion with the

Re: [PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: The following two commands are expected to give the same output to a terminal: $ git log --oneline --no-color $ git log --pretty=format:'%h %s' However, the former pays attention to i18n.logOutputEncoding configuration, while

Re: [PATCH v4 2/4] t7102 (reset): refactoring: don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- Looks good ( refactoring: in the title may not want to be there, though). oops,

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-25 Thread John Keeping
On Thu, Jan 24, 2013 at 10:55:57PM -0600, Chris Rorvick wrote: On Wed, Jan 23, 2013 at 3:12 PM, John Keeping j...@keeping.me.uk wrote: The existing script (git-cvsimport.perl) won't ever work with cvsps-3 since features it relies on have been removed. Not reporting the ancestry branch

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 130 + 1

Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for --tool-help

2013-01-25 Thread John Keeping
On Thu, Jan 24, 2013 at 09:29:58PM -0800, David Aguilar wrote: On Thu, Jan 24, 2013 at 11:55 AM, John Keeping j...@keeping.me.uk wrote: The --tool-help option to git-difftool currently displays incorrect output since it uses the names of the files in $GIT_EXEC_PATH/mergetools/ rather than

[PATCH 0/7] mergetool-lib improvements for --tool-help

2013-01-25 Thread David Aguilar
I ran with John's idea and simplified a few more things so that the --tool-help output shows the correct results. My final commit is dependent on John's commits but the other two could be picked up independently since they are general improvements. This does add a few symlinks to the repo for

[PATCH 3/7] git-mergetool: don't hardcode 'mergetool' in show_tool_help

2013-01-25 Thread David Aguilar
From: John Keeping j...@keeping.me.uk When using show_tool_help from git-difftool we will want it to print git difftool not git mergetool so use git ${TOOL_MODE}tool. Signed-off-by: John Keeping j...@keeping.me.uk Signed-off-by: David Aguilar dav...@gmail.com --- git-mergetool--lib.sh | 6

[PATCH 4/7] git-difftool: use git-mergetool--lib for --tool-help

2013-01-25 Thread David Aguilar
From: John Keeping j...@keeping.me.uk The --tool-help option to git-difftool currently displays incorrect output since it uses the names of the files in $GIT_EXEC_PATH/mergetools/ rather than the list of command names in git-mergetool--lib. Fix this by simply delegating the --tool-help argument

[PATCH 5/7] mergetools/vim: Remove redundant diff command

2013-01-25 Thread David Aguilar
vimdiff and vimdiff2 differ only by their merge command so remove the logic in the diff command since it's not actually needed. Signed-off-by: David Aguilar dav...@gmail.com --- mergetools/vim | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mergetools/vim

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

2013-01-25 Thread David Aguilar
git difftool --tool-help and git mergetool --tool-help incorreclty list vim as being an unavailable tool. This is because they attempt to find a tool named according to the mergetool scriptlet instead of the Git- recognized tool name. vimdiff, vimdiff2, gvimdiff, and gvimdiff2 are all provided

[PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread David Aguilar
Check the can_diff and can_merge functions before deciding whether to add the tool to the available/unavailable lists. This makes --tool-help context- sensitive so that git mergetool --tool-help displays merge tools only and git difftool --tool-help displays diff tools only. Signed-off-by:

[PATCH 1/7] git-mergetool: move show_tool_help to mergetool--lib

2013-01-25 Thread David Aguilar
From: John Keeping j...@keeping.me.uk This is the first step in unifying git difftool --tool-help and git mergetool --tool-help. Signed-off-by: John Keeping j...@keeping.me.uk Signed-off-by: David Aguilar dav...@gmail.com --- git-mergetool--lib.sh | 37 +

[PATCH 2/7] git-mergetool: remove redundant assignment

2013-01-25 Thread David Aguilar
From: John Keeping j...@keeping.me.uk TOOL_MODE is set at the top of git-mergetool.sh so there is no need to set it again in show_tool_help. Removing this lets us re-use show_tool_help in git-difftool. Signed-off-by: John Keeping j...@keeping.me.uk Signed-off-by: David Aguilar dav...@gmail.com

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-25 Thread John Keeping
On Thu, Jan 24, 2013 at 11:54:25PM -0800, David Aguilar wrote: On Thu, Jan 24, 2013 at 11:21 PM, Junio C Hamano gits...@pobox.com wrote: Is there a way for me to programatically tell what merge.tool and diff.tool could be enabled for a particular source checkout of Git regardless of what

Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for --tool-help

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 1:19 AM, John Keeping j...@keeping.me.uk wrote: On Thu, Jan 24, 2013 at 09:29:58PM -0800, David Aguilar wrote: On Thu, Jan 24, 2013 at 11:55 AM, John Keeping j...@keeping.me.uk wrote: The --tool-help option to git-difftool currently displays incorrect output since it

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

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 1:06 AM, Sven Strickroth sven.strickr...@tu-clausthal.de wrote: TortoiseGitMerge and filenames with spaces - 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

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

2013-01-25 Thread Sebastian Schuberth
On 2013/01/25 10:43 , David Aguilar wrote: Remove the exception for vim and allow the scriptlets to be found naturally by using symlinks to a single vimdiff scriptlet. This I guess that won't work on platforms where Git does not support symlinks, then, like Windows. But Windows has

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

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 2:23 AM, Sebastian Schuberth sschube...@gmail.com wrote: On 2013/01/25 10:43 , David Aguilar wrote: Remove the exception for vim and allow the scriptlets to be found naturally by using symlinks to a single vimdiff scriptlet. This I guess that won't work on platforms

git merge error question: The following untracked working tree files would be overwritten by merge

2013-01-25 Thread Carsten Fuchs
Hi all, in my repo, I'm doing this: $ git status # On branch master # Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. # # Untracked files: # (use git add file... to include in what will be committed) # # obsolete/ nothing added to commit but

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

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote: git difftool --tool-help and git mergetool --tool-help incorreclty list vim as being an unavailable tool. This is because they attempt to find a tool named according to the mergetool scriptlet instead of the Git- recognized tool

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

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 2:38 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote: git difftool --tool-help and git mergetool --tool-help incorreclty list vim as being an unavailable tool. This is because they attempt to find a tool named

Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for --tool-help

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 01:55:03AM -0800, David Aguilar wrote: list_merge_tool_candidates() has a bunch of other special cases for $EDITOR, $DISPLAY, $GNOME-something and such so I think we should keep using it only for the guess_merge_tool() path. I honestly want to remove

[PATCH v2] add: warn when -u or -A is used without filepattern

2013-01-25 Thread Matthieu Moy
Most git commands that can be used with our without a filepattern are tree-wide by default, the filepattern being used to restrict their scope. A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'. The inconsistancy of 'git add -u' and 'git add -A' are particularly

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Why do we want whatever_7 variables and use cut -c1-7 to produce them? Is 7 something we care deeply about? I think what we care a lot more than 7 that happens to be the current default value is to make sure that, if we ever update the default abbreviation length to a larger value, the

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:

[PATCH v2 1/3] branch: reject -D/-d without branch name

2013-01-25 Thread Nguyễn Thái Ngọc Duy
--- builtin/branch.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 873f624..50fcacc 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -837,9 +837,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)

[PATCH v2 2/3] branch: give a more helpful message on redundant arguments

2013-01-25 Thread Nguyễn Thái Ngọc Duy
While at there, do not stop user from editing a branch description when the unrelated HEAD is detached. --- builtin/branch.c | 12 ++-- t/t3200-branch.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 50fcacc..ca61c5b

[PATCH v2 3/3] branch: mark more strings for translation

2013-01-25 Thread Nguyễn Thái Ngọc Duy
--- builtin/branch.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index ca61c5b..597b578 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -466,7 +466,7 @@ static void add_verbose_info(struct strbuf *out, struct

[PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Sven Strickroth
TortoiseGitMerge and filenames with spaces - 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, (uses spaces as cli parameter key-value separators) and prevent confusion with the

git-core vs git package on ubuntu

2013-01-25 Thread Mario Michael Krell
Dear git developers, In your documentation you say, that git should be installed on Unix using apt-get install git-core Unfortunately it tells the user, that this package is obsolete and git should be used instead. Is this an error in the package manager or in the website documentation?

Re: git-core vs git package on ubuntu

2013-01-25 Thread Matthieu Moy
Mario Michael Krell supermari...@googlemail.com writes: Dear git developers, In your documentation you say, Which documentation? that git should be installed on Unix using apt-get install git-core A quick grep shows that this is not the case in the documentation provided with Git, and

Re: git-core vs git package on ubuntu

2013-01-25 Thread Konstantin Khomoutov
On Fri, 25 Jan 2013 14:50:24 +0100 Mario Michael Krell supermari...@googlemail.com wrote: In your documentation you say, that git should be installed on Unix using apt-get install git-core Note that Ubuntu is not Unix. Unfortunately it tells the user, that this package is obsolete and

Re: git-core vs git package on ubuntu

2013-01-25 Thread Matthieu Moy
Cc-ing the Git list again. Mario Michael Krell supermari...@googlemail.com writes: I am sorry for being so unspecific. I had problems finding your mentioned website and quickly went through the getting started tutorial and found the mentioned command at:

[PATCH] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Alexey Shumkin
Firefox on Windows by default is placed in C:\Program Files\Mozilla Firefox folder, i.e. its path contains spaces. Before running this browser git-web--browse tests version of Firefox to decide whether to use -new-tab option or not. Quote browser path to avoid error during this test.

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: Why do we want whatever_7 variables and use cut -c1-7 to produce them? Is 7 something we care deeply about? I think what we care a lot more than 7 that happens to be the current default value is to make sure that, if we ever update the default

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: Why do we want whatever_7 variables and use cut -c1-7 to produce them? Is 7 something we care deeply about? I think what we care a lot more than 7 that happens to be the current default value is to make sure that, if we ever update the

[PATCH] send-email: Honor multi-part email messages

2013-01-25 Thread Alexey Shumkin
git format-patch --attach/--inline generates multi-part messages. Every part of such messages can contain non-ASCII characters with its own Content-Type and Content-Transfer-Encoding headers. But git-send-mail script interprets a patch-file as one-part message and does not recognize multi-part

Re: segmentation fault (nullpointer) with git log --submodule -p

2013-01-25 Thread Junio C Hamano
Jonathon Mah j...@me.com writes: Just to note, the proposals so far don't prevent a smart-ass function from freeing the buffer when it's called underneath the use/release scope, as in: with_commit_buffer(commit); { fn1_needing_buffer(commit); walk_rev_tree_or_something();

Re: [PATCH] send-email: Honor multi-part email messages

2013-01-25 Thread Krzysztof Mazur
On Fri, Jan 25, 2013 at 07:28:54PM +0400, Alexey Shumkin wrote: git format-patch --attach/--inline generates multi-part messages. Every part of such messages can contain non-ASCII characters with its own Content-Type and Content-Transfer-Encoding headers. But git-send-mail script interprets a

Re: git merge error question: The following untracked working tree files would be overwritten by merge

2013-01-25 Thread Junio C Hamano
Carsten Fuchs carsten.fu...@cafu.de writes: Hi all, in my repo, I'm doing this: $ git status # On branch master # Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. # # Untracked files: # (use git add file... to include in what will be committed) # #

Re: [PATCH resent] send-email: Honor multi-part email messages

2013-01-25 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: This function is used to determine broken (non-ASCII) headers (to be encode them) The problem is if Subject is not broken, but message body contains non-ASCII chars, subject is marked as broken and encoded again. I think that is not a problem

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

2013-01-25 Thread 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? It may be a sign that you are doing too many unrelated things in a single patch when your subject does not fit

Re: [PATCH] t9902: protect test from stray build artifacts

2013-01-25 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Jan 24, 2013 at 08:19:30PM -0800, Junio C Hamano wrote: Ahh, ok, we show one element per line and just make sure bundle is there, and we do not care what other buns appear in the output. Not so quick, though. The lower level read from help -a is

Re: [regression] Re: [PATCHv2 10/15] drop length limitations on gecos-derived names and emails

2013-01-25 Thread Junio C Hamano
Jeff King p...@peff.net writes: (with a proper commit message, of course). Will queue this one, to be merged to 'maint' and 'master'. -- 8 -- From: Jonathan Nieder jrnie...@gmail.com Date: Thu, 24 Jan 2013 15:21:46 -0800 Subject: [PATCH] ident: do not drop username when reading from

Re: [PATCH 6/7] read-cache: refuse to create index referring to external objects

2013-01-25 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Even when cache-tree is not involved, I do not want the index to point to an non-existing SHA-1 (git diff --cached may fail next time, for example). I think we have tests that explicitly add SHA-1 that names an object that does not exist to the index

Re: [PATCH v2 1/3] branch: reject -D/-d without branch name

2013-01-25 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: --- builtin/branch.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Forgot to sign-off? Is this a real problem? I do not see it particularly wrong to succeed after deleting 0 or more given branch names. diff --git

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

2013-01-25 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: On Fri, Jan 25, 2013 at 2:38 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote: git difftool --tool-help and git mergetool --tool-help incorreclty list vim as being an unavailable tool. This is

Re: [PATCH v2] add: warn when -u or -A is used without filepattern

2013-01-25 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Most git commands that can be used with our without a filepattern are tree-wide by default, the filepattern being used to restrict their scope. A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'. The inconsistancy of 'git

Re: [PATCH] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: Firefox on Windows by default is placed in C:\Program Files\Mozilla Firefox folder, i.e. its path contains spaces. Before running this browser git-web--browse tests version of Firefox to decide whether to use -new-tab option or not. Quote

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 01:43:54AM -0800, David Aguilar wrote: Check the can_diff and can_merge functions before deciding whether to add the tool to the available/unavailable lists. This makes --tool-help context- sensitive so that git mergetool --tool-help displays merge tools only and git

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: +tool=$(basename $i) Quotes are unnecessary here. Yeah, the outer quotes aren't needed; the inner ones are. +if test $tool = defaults +then +continue +elif merge_mode ! can_merge

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 07:54:46PM +, John Keeping wrote: On Fri, Jan 25, 2013 at 01:43:54AM -0800, David Aguilar wrote: Check the can_diff and can_merge functions before deciding whether to add the tool to the available/unavailable lists. This makes --tool-help context- sensitive

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Actually, can we just change all of the above part of the loop to: test $tool = defaults continue merge_tool_path=$( setup_tool $tool /dev/null 21 translate_merge_tool_path $tool ) || continue Meaning

Re: [PATCH v3 2/8] git_remote_helpers: fix input when running under Python 3

2013-01-25 Thread Brandon Casey
On Wed, Jan 23, 2013 at 12:36 PM, Junio C Hamano gits...@pobox.com wrote: Sverre Rabbelier srabbel...@gmail.com writes: On Wed, Jan 23, 2013 at 11:47 AM, John Keeping j...@keeping.me.uk wrote: When did we last revisit what minimal python version we are ok with requiring? I was wondering if

[PATCH 1/2] git-p4.py: support Python 2.5

2013-01-25 Thread Brandon Casey
Python 2.5 and older do not accept None as the first argument to translate() and complain with: TypeError: expected a character buffer object Satisfy this older python by calling maketrans() to generate an empty translation table and supplying that to translate(). This allows git-p4 to be

[PATCH 0/2] git-p4 support for older python

2013-01-25 Thread Brandon Casey
Offered for consideration. These two patches allow git-p4 to run on python 2.4 which is shipped on RHEL 5.X. The changes are minor and unintrusive in my opinion, but please feel free to reject one or both of them for any reason (in which case the version check at the top of git-p4.py should be

[PATCH 2/2] git-p4.py: support Python 2.4

2013-01-25 Thread Brandon Casey
Python 2.4 lacks the following features: subprocess.check_call struct.pack_into Take a cue from 460d1026 and provide an implementation of the CalledProcessError exception. Then replace the calls to subproccess.check_call with calls to subprocess.call that check the return status and raise

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 12:16:42PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Actually, can we just change all of the above part of the loop to: test $tool = defaults continue merge_tool_path=$( setup_tool $tool /dev/null 21

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Fri, Jan 25, 2013 at 12:16:42PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Actually, can we just change all of the above part of the loop to: test $tool = defaults continue merge_tool_path=$(

Re: [PATCH 0/2] git-p4 support for older python

2013-01-25 Thread Junio C Hamano
Both patches look simple enough. Pete, what do you think? -- 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 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 12:56:37PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Fri, Jan 25, 2013 at 12:16:42PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Actually, can we just change all of the above part of the loop to:

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: It doesn't - the || continue is to catch errors from setup_tool. Ugh. Is that targeted at my suggestion at the top of this email or calling exit in setup_tool? At the fact that you had to go a convoluted route because you cannot just run setup_tool

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 01:47:59PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: With the patch above, the block of code at the top becomes: test $tool = defaults continue setup_tool $tool 2/dev/null || continue

[PATCH 8/7] mergetool--lib: don't call exit in setup_tool

2013-01-25 Thread John Keeping
This will make it easier to use setup_tool in places where we expect that the selected tool will not support the current mode. Signed-off-by: John Keeping j...@keeping.me.uk --- git-mergetool--lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-mergetool--lib.sh

[PATCH 9/7] mergetool--lib: fix path lookup in guess_merge_tool

2013-01-25 Thread John Keeping
guess_merge_tool calls translate_merge_tool_path in order to get the correct name of the tool to check whether it can be found on the user's system. But this function is designed to be overridden by tool scriptlets so it does nothing if the relevant scriptlet has not been sourced. Fix this by

Re: [PATCH] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Jeff King
On Fri, Jan 25, 2013 at 06:44:13PM +0400, Alexey Shumkin wrote: test_web_browse () { - # browser=$1 url=$2 + # browser=$1 url=$2 sleep_timeout=$3 + sleep_timeout=$3 git web--browse --browser=$1 $2 actual + # if $3 is set + # as far as Firefox is run in

Re: [PATCH] t9902: protect test from stray build artifacts

2013-01-25 Thread Jeff King
On Fri, Jan 25, 2013 at 10:34:56AM -0800, Junio C Hamano wrote: Not so quick, though. The lower level read from help -a is only run once and its output kept in a two-level cache hierarchy; we need to reset both. Ugh, I didn't even think about that. I wonder if it would be simpler

Re: [regression] Re: [PATCHv2 10/15] drop length limitations on gecos-derived names and emails

2013-01-25 Thread Jeff King
On Fri, Jan 25, 2013 at 10:46:48AM -0800, Junio C Hamano wrote: Will queue this one, to be merged to 'maint' and 'master'. -- 8 -- From: Jonathan Nieder jrnie...@gmail.com Date: Thu, 24 Jan 2013 15:21:46 -0800 Subject: [PATCH] ident: do not drop username when reading from /etc/mailname

Re: [PATCH] send-email: Honor multi-part email messages

2013-01-25 Thread Jeff King
On Fri, Jan 25, 2013 at 06:47:00PM +0100, Krzysztof Mazur wrote: On Fri, Jan 25, 2013 at 07:28:54PM +0400, Alexey Shumkin wrote: git format-patch --attach/--inline generates multi-part messages. Every part of such messages can contain non-ASCII characters with its own Content-Type and

[RFC] test-lint-duplicates: check numbering in contrib/remote-helpers

2013-01-25 Thread Torsten Bögershausen
Running make inside contrib/remote-helpers failes in test-lint-duplicates This was because the regexp to check for duplicate numbers strips everything after the first - in the filename, including the prefix. As a result, 2 pathnames like /contrib/remote-helpers/test-bzr.sh and

[RFC] test-lint-duplicates: check numbering in contrib/remote-helpers

2013-01-25 Thread Torsten Bögershausen
Running make inside contrib/remote-helpers failes in test-lint-duplicates This was because the regexp to check for duplicate numbers strips everything after the first - in the filename, including the prefix. As a result, 2 pathnames like /contrib/remote-helpers/test-bzr.sh and

Re: [PATCH] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Shumkin Alexey
2013/1/26 Jeff King p...@peff.net: On Fri, Jan 25, 2013 at 06:44:13PM +0400, Alexey Shumkin wrote: test_web_browse () { - # browser=$1 url=$2 + # browser=$1 url=$2 sleep_timeout=$3 + sleep_timeout=$3 git web--browse --browser=$1 $2 actual + # if $3 is set + #

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-25 Thread Mark Levedahl
On 01/22/2013 01:31 PM, Ramsay Jones wrote: include order. ;-) As I have mentioned here before, the claim that WIN32 is not defined on cygwin is simply nonsense - it depends on if/when certain header files are included. For example, *as soon as* you include windows.h (and, I suspect, many

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-25 Thread Junio C Hamano
Mark Levedahl mleved...@gmail.com writes: Cygwin and Windows should be treated as completely separate platforms: if __CYGWIN__ is defined, do one thing, if not, go ahead and check WIN32, but the WIN32 macro should never be tested once we know the platform is CYGWIN - these really are

What's cooking in git.git (Jan 2013, #09; Fri, 25)

2013-01-25 Thread Junio C Hamano
What's cooking in git.git (Jan 2013, #09; Fri, 25) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. As usual, this cycle is expected to last

Re: [PATCH 8/7] mergetool--lib: don't call exit in setup_tool

2013-01-25 Thread Junio C Hamano
Applying this one on top of 1/7 thru 5/7 and 7/7 seems to break t7610 rather badly. --- 8 -- 8 -- 8 -- 8 -- 8 -- 8 --- ... ok 1 - setup expecting success: git checkout -b test1 branch1 git submodule update -N test_must_fail git merge master /dev/null 21 (

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-25 Thread Eric Blake
On 01/25/2013 05:11 PM, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: Cygwin and Windows should be treated as completely separate platforms: if __CYGWIN__ is defined, do one thing, if not, go ahead and check WIN32, but the WIN32 macro should never be tested once we know the

[PATCH v2 0/2] git-web--browser: avoid errors in terminal when running

2013-01-25 Thread Alexey Shumkin
Reroll patch after all suggestions Alexey Shumkin (2): t9901-git-web--browse.sh: Use write_script helper git-web--browser: avoid errors in terminal when running Firefox on Windows git-web--browse.sh | 2 +- t/t9901-git-web--browse.sh | 59

[PATCH v2 1/2] t9901-git-web--browse.sh: Use write_script helper

2013-01-25 Thread Alexey Shumkin
Use write_script helper as suggested by Junio C Hamano. Also, replace `pwd` with $(pwd) call convention. Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t9901-git-web--browse.sh | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-)

[PATCH v2 2/2] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Alexey Shumkin
Firefox on Windows by default is placed in C:\Program Files\Mozilla Firefox folder, i.e. its path contains spaces. Before running this browser git-web--browse tests version of Firefox to decide whether to use -new-tab option or not. Quote browser path to avoid error during this test.

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 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 +

[PATCH/RFC] mingw: rename WIN32 cpp macro to NATIVE_WINDOWS

2013-01-25 Thread Jonathan Nieder
Throughout git, it is assumed that the WIN32 preprocessor symbol is defined on native Windows setups (mingw and msvc) and not on Cygwin. On Cygwin, most of the time git can pretend this is just another Unix machine, and Windows-specific magic is generally counterproductive. Unfortunately Cygwin

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 em...@cs-ware.de ---

[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 em...@cs-ware.de ---

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

2013-01-25 Thread Sven Strickroth
tortoisegitmerge and filesnames with space 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. TortoiseGitMerge now separates cli parameter

Re: [PATCH v2 1/3] branch: reject -D/-d without branch name

2013-01-25 Thread Duy Nguyen
On Sat, Jan 26, 2013 at 2:04 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: --- builtin/branch.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Forgot to sign-off? Yes Is this a real problem? Yes. My thoughts yesterday when I

[PATCH] mergetools: Simplify how we handle vim and defaults

2013-01-25 Thread David Aguilar
Remove the exceptions for vim and defaults in the mergetool library so that every filename in mergetools/ matches 1:1 with the name of a valid built-in tool. Make common functions available in $MERGE_TOOLS_DIR/include/. Signed-off-by: David Aguilar dav...@gmail.com --- This should make things ok

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-01-25 Thread Torsten Bögershausen
On 15.01.13 21:38, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: What do we think about something like this for fishing for which: --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -644,6 +644,10 @@ yes () { : done } +which () { + echo 2

Re: [PATCH 8/7] mergetool--lib: don't call exit in setup_tool

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 4:24 PM, Junio C Hamano gits...@pobox.com wrote: Applying this one on top of 1/7 thru 5/7 and 7/7 seems to break t7610 rather badly. I just sent a replacement for the vim/symlink issue stuff. I tried to keep the patch small. John, can you rebase this patch on top of it?

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

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 5:17 PM, Sven Strickroth sven.strickr...@tu-clausthal.de wrote: TortoiseGitMerge now separates cli parameter key-values by space instead of colons as TortoiseSVN TortoiseMerge does and supports filesnames with spaces in it this way now. These patches look correct (I do