Re: git config error message

2012-10-27 Thread Andreas Schwab
Angelo Borsotti angelo.borso...@gmail.com writes: git config --get issues an error message when the specified value contains a section that does not exist, but does not issue any message when the value contains a key that does not exist while in both cases returning a status 1. E.g. $ git

Re: git config error message

2012-10-27 Thread Andreas Schwab
Angelo Borsotti angelo.borso...@gmail.com writes: I wrote value, but I meant name. The first example I made contains a name with a nonexistent section, the second a name with a nonexistent key. And a nonexistent key is a valid key, so not an error. Andreas. -- Andreas Schwab,

Re: [PATCH] mergetools/p4merge: Handle /dev/null

2012-10-27 Thread Jeremy Morton
Sorry to be replying to this so late; I hadn't noticed the post until now! I've tried putting that code in my p4merge script and yes it does indeed work fine. However, it puts a temporary file in the working directory which I'm not sure is a good idea? If we look at this patch which

Re: git config error message

2012-10-27 Thread Ben Walton
On Sat, Oct 27, 2012 at 9:32 AM, Angelo Borsotti angelo.borso...@gmail.com wrote: Hi Angelo, I wrote value, but I meant name. The first example I made contains a name with a nonexistent section, the second a name with a nonexistent key. This still wouldn't be an error condition though,

Re: git config error message

2012-10-27 Thread Angelo Borsotti
Hi Ben This still wouldn't be an error condition though, especially in terms of how git config should treat it. The man page says: This command will fail with non-zero status upon error. Of course, one might claim that this does not mean the truth of the reverse condition, i.e. that when

Re: git config error message

2012-10-27 Thread Andreas Schwab
Angelo Borsotti angelo.borso...@gmail.com writes: Besides that, it is common practice in *nix OSs to consider a return != 0 as an error. Is grep not finding a match an error? Is cmp finding a difference an error? It all depends on the context. How can otherwise the user tell a corrupted

Re: Strange behaviour of git diff branch1 ... branch2

2012-10-27 Thread Nguyen Thai Ngoc Duy
On Sat, Oct 27, 2012 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: Notice the --cc in the first line, which is combined diff. Usually combined-diff is between two points and one parent. Though somehow git passes 4 parents down

Re: git config error message

2012-10-27 Thread Angelo Borsotti
Hi Andreas, Is grep not finding a match an error? Is cmp finding a difference an error? It all depends on the context. Manpage of grep, exit staus: Normally, the exit status is 0 if selected lines are found and 1 otherwise. But the exit status is 2 if an error occurred, ... cmp uses

Re: git config error message

2012-10-27 Thread Andreas Schwab
Angelo Borsotti angelo.borso...@gmail.com writes: when the section or key is absent When the key is malformed you get an error, otherwise not. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

crash on git diff-tree -Ganything tree for new files with textconv filter

2012-10-27 Thread Peter Oberndorfer
Hi, It seems git diff-tree -Ganything tree crashes[1] with a null pointer dereference when run on a commit that adds a file (pdf) with a textconv filter. It can be reproduced with vanilla git by having a commit on top that adds a file with a textconv filter and executing git diff-tree -Ganything

Re: Workflow for templates?

2012-10-27 Thread Enrico Weigelt
Hi, snip I'd suggest a 3 level branch hierachy (IOW: the lower level is rebased ontop of the next higher level): * #0: upstream branch * #1: generic local maintenance branch * #2: per-instance cutomization branches Normal additions go to the lowest level #2. When you've got some generic

Re: [PATCH] Fix t9200 on case insensitive file systems

2012-10-27 Thread Ben Walton
On Fri, Oct 26, 2012 at 5:18 PM, Torsten Bögershausen tbo...@web.de wrote: t/t9200-git-cvsexportcommit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index b59be9a..69934b2 100755 ---

[PATCH] mailmap: avoid out-of-bounds memory access

2012-10-27 Thread Romain Francoise
AddressSanitizer (http://clang.llvm.org/docs/AddressSanitizer.html) complains of a one-byte buffer underflow in parse_name_and_email() while running the test suite. And indeed, if one of the lines in the mailmap begins with '', we dereference the address just before the beginning of the buffer

Re: Can't understand the behaviour of git-diff --submodule

2012-10-27 Thread Jens Lehmann
Am 26.10.2012 22:43, schrieb Francis Moreau: On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann jens.lehm...@web.de wrote: [...] That is weird, git diff --submodule should show that too. Is there anything unusual about your setup? (The only explanation I can come up with after checking the code

[PATCH v4 01/13] Add new remote-hg transport helper

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 356 1 file changed, 356 insertions(+) create mode 100755 contrib/remote-hg/git-remote-hg diff --git a/contrib/remote-hg/git-remote-hg

[PATCH v4 02/13] remote-hg: add support for bookmarks

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index c771182..4ba9ee6 100755 ---

[PATCH v4 03/13] remote-hg: add support for pushing

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 215 +++- 1 file changed, 213 insertions(+), 2 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index 4ba9ee6..4021a7d

[PATCH v4 04/13] remote-hg: add support for remote pushing

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index 4021a7d..b10e7d1 100755 ---

[PATCH v4 05/13] remote-hg: add support to push URLs

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index b10e7d1..c96e1a8 100755 ---

[PATCH v4 06/13] remote-hg: make sure the encoding is correct

2012-10-27 Thread Felipe Contreras
Independently of the environment. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index

[PATCH v4 07/13] remote-hg: match hg merge behavior

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 15 +++ 1 file changed, 15 insertions(+) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index 1689573..57e54c2 100755 --- a/contrib/remote-hg/git-remote-hg

[PATCH v4 08/13] remote-hg: add support for hg-git compat mode

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 102 +--- 1 file changed, 95 insertions(+), 7 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index 57e54c2..47bb7c1

[PATCH v4 09/13] remote-hg: add compat for hg-git author fixes

2012-10-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 59 - 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index 47bb7c1..3bb3192

[PATCH v4 10/13] remote-hg: fake bookmark when there's none

2012-10-27 Thread Felipe Contreras
Or at least no current bookmark. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index

[PATCH v4 11/13] remote-hg: add support for fake remote

2012-10-27 Thread Felipe Contreras
Helpful while testing. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-hg/git-remote-hg | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index e8e3791..092020f 100755 ---

[PATCH v4 12/13] remote-hg: add tests to compare with hg-git

2012-10-27 Thread Felipe Contreras
The base commands come from the tests of the hg-git project. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5802-remote-hg-hg-git.sh | 445 1 file changed, 445 insertions(+) create mode 100755 t/t5802-remote-hg-hg-git.sh diff

Re: [PATCH v2] Add new remote-hg transport helper

2012-10-27 Thread Felipe Contreras
On Sat, Oct 20, 2012 at 5:43 PM, Mike Hommey m...@glandium.org wrote: On Sat, Oct 20, 2012 at 05:00:06PM +0200, Felipe Contreras wrote: Changes since v1: * Improved documentation * Use more common 'python' binary * Warn, don't barf when a branch has multiple heads * Fixed marks to fetch