Re: [PATCH 1/2] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

2014-02-16 Thread Kirill Smelkov
On Fri, Feb 14, 2014 at 09:37:00AM -0800, Junio C Hamano wrote: Kirill Smelkov k...@mns.spb.ru writes: Previously diff_tree(), which is now named __diff_tree_sha1(), was That name with two leading underscores is a rather unfortunate, especially for a function that is not a file scope

Re: [PATCH 0/3] Wider exposure for index-v4

2014-02-16 Thread Thomas Gummerer
Duy Nguyen pclo...@gmail.com writes: On Sun, Feb 16, 2014 at 2:23 AM, Thomas Gummerer t.gumme...@gmail.com wrote: Hi, since index-v5 didn't seem to generate enough interest to be merged, I I thought there were some comments last time that you were going to address and resubmit? Yes, there

Re: [PATCH 2/2] check-attr: move to the top of working tree when in non-bare repository

2014-02-16 Thread Michael Haggerty
On 02/06/2014 09:17 PM, Jonathan Nieder wrote: How do I use the only-look-at-HEAD mode from a non-bare repo? If I want attributes with respect to some other commit instead of HEAD, is there a syntax for that? The command doesn't seem to have been well thought out. I agree that it would be

[PATCH] config: teach git config --file - to read from the standard input

2014-02-16 Thread Kirill A. Shutemov
The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov kir...@shutemov.name --- builtin/config.c

Re: [BUG?] git http connection reuse

2014-02-16 Thread Daniel Stenberg
On Sat, 15 Feb 2014, Kyle J. McKay wrote: If pipelining is off (the default) and total connections is not 1 it sounds to me from the description above that the requests will be executed on separate connections until the maximum number of connections is in use and then there might be some

Re: [BUG?] git http connection reuse

2014-02-16 Thread Daniel Stenberg
On Sun, 16 Feb 2014, Daniel Stenberg wrote: Right, the problem is there to make sure that a NTLM-auth connection with different credentials aren't re-used. NTLM with its connection-oriented authentication breaks the traditional HTTP paradigms and before this change there was a risk that

Re: [RFH] hackday and GSoC topic suggestions

2014-02-16 Thread Duy Nguyen
On Sun, Feb 9, 2014 at 2:03 AM, Thomas Rast t...@thomasrast.ch wrote: Easy: * Add -p 'e' when it fails to apply should offer an obvious way of starting from the original hunk (not the broken one) or both If it's too easy, you can add a command to change diff display settings (--color-words,

Re: [RFH] hackday and GSoC topic suggestions

2014-02-16 Thread Thomas Rast
Duy Nguyen pclo...@gmail.com writes: On Sun, Feb 9, 2014 at 2:03 AM, Thomas Rast t...@thomasrast.ch wrote: Easy: * Add -p 'e' when it fails to apply should offer an obvious way of starting from the original hunk (not the broken one) or both If it's too easy, you can add a command to

Re: Profiling support?

2014-02-16 Thread Thomas Rast
David Kastrup d...@gnu.org writes: Looking in the Makefile, I just find support for coverage reports using gcov. Whatever is there with profile in it seems to be for profile-based compilation rather than using gprof. [...] Is there a reason there are no prewired recipes or advice for using

Re: Profiling support?

2014-02-16 Thread David Kastrup
Thomas Rast t...@thomasrast.ch writes: David Kastrup d...@gnu.org writes: Looking in the Makefile, I just find support for coverage reports using gcov. Whatever is there with profile in it seems to be for profile-based compilation rather than using gprof. [...] Is there a reason there are

[PATCH 0/5] Miscellaneous fixes from static analysis

2014-02-16 Thread John Keeping
The first two of these fix real bugs, the rest just clean up some of the less obviously not actually a problem issues identified by Clang's static analyzer [1] and stack[2]. Stack is interesting in that it is designed to detect potentially undesirable optimizations where undefined behaviour may

[PATCH 2/5] utf8: fix iconv error detection

2014-02-16 Thread John Keeping
iconv(3) returns (size_t) -1 on error. Make sure that we cast the -1 properly when checking for this. Signed-off-by: John Keeping j...@keeping.me.uk --- utf8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utf8.c b/utf8.c index 0d20e0a..24c3c5c 100644 --- a/utf8.c +++

[PATCH 3/5] utf8: use correct type for values in interval table

2014-02-16 Thread John Keeping
We treat these as unsigned everywhere and compare against unsigned values, so declare them using the typedef we already have for this. While we're here, fix the indentation as well. Signed-off-by: John Keeping j...@keeping.me.uk --- utf8.c | 4 ++-- 1 file changed, 2 insertions(+), 2

[PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly

2014-02-16 Thread John Keeping
If we carry on after outputting config_error_nonbool then we're guaranteed to dereference a null pointer. Signed-off-by: John Keeping j...@keeping.me.uk --- notes-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notes-utils.c b/notes-utils.c index 2975dcd..4aa7023

[PATCH 5/5] streaming: simplify attaching a filter

2014-02-16 Thread John Keeping
We are guaranteed that 'nst' is non-null because it is allocated with xmalloc(), and in fact we rely on this three lines later by unconditionally dereferencing it. Signed-off-by: John Keeping j...@keeping.me.uk --- streaming.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git

Re: [PATCH] web--browse: Use powershell on Windows

2014-02-16 Thread Eric Sunshine
On Sun, Feb 16, 2014 at 2:22 AM, Steven Penny svnp...@gmail.com wrote: On Windows you can have either MinGW or Cygwin. As has been shown in this script MinGW uses start while Cygwin uses cygstart. The cygstart command is robust but the start command breaks on certain URLs $ git

[PATCH 4/5] builtin/mv: don't use memory after free

2014-02-16 Thread John Keeping
If 'src' already ends with a slash, then add_slash() will just return it, meaning that 'free(src_with_slash)' is actually 'free(src)'. Since we use 'src' later, this will result in use-after-free. In fact, this cannot happen because 'src' comes from internal_copy_pathspec() without the

Re: [PATCH 1/3] wt-status.c: make cut_lines[] const to shrink .data section a bit

2014-02-16 Thread brian m. carlson
On Sun, Feb 16, 2014 at 10:37:18AM +0700, Nguyễn Thái Ngọc Duy wrote: -static char cut_line[] = +static const char cut_line[] = Your subject says cut_lines[], but the variable is cut_line[] (no s). -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 |

Re: [PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly

2014-02-16 Thread David Kastrup
John Keeping j...@keeping.me.uk writes: If we carry on after outputting config_error_nonbool then we're guaranteed to dereference a null pointer. Not really relevant to this patch, but looking at the output of git grep config_error_nonbool seems like a serious amount of ridiculousness going

[PATCH] diff: do not reuse_worktree_file for submodules

2014-02-16 Thread Thomas Rast
The GIT_EXTERNAL_DIFF calling code attempts to reuse existing worktree files for the worktree side of diffs, for performance reasons. However, that code also tries to do the same with submodules. This results in calls to $GIT_EXTERNAL_DIFF where the old-file is a file of the form Submodule commit

Re: Profiling support?

2014-02-16 Thread Thomas Rast
David Kastrup d...@gnu.org writes: Thomas Rast t...@thomasrast.ch writes: David Kastrup d...@gnu.org writes: Looking in the Makefile, I just find support for coverage reports using gcov. Whatever is there with profile in it seems to be for profile-based compilation rather than using

Re: Profiling support?

2014-02-16 Thread David Kastrup
Thomas Rast t...@thomasrast.ch writes: David Kastrup d...@gnu.org writes: Thomas Rast t...@thomasrast.ch writes: David Kastrup d...@gnu.org writes: Looking in the Makefile, I just find support for coverage reports using gcov. Whatever is there with profile in it seems to be for

How to delete all merged branches?

2014-02-16 Thread Stefan Beller
Hi, so I tend to accumulate lots of branches as I'd do one branch per feature. When cleaning up, I'd like to delete all branches, which have been merged. I could use $ git branch -d (which was merged already?) ^C $ git branch --merged # let's find out ... $ #

Re: [PATCH v2] reset: optionally setup worktree and refresh index on --mixed

2014-02-16 Thread Patrick Palka
On Sat, Feb 15, 2014 at 9:28 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Refreshing index requires work tree. So we have to options: always set up work tree (and refuse to reset if failing to do so), or make refreshing index optional. As refreshing index is not the main task, it makes

Re: How to delete all merged branches?

2014-02-16 Thread Jamie Couture
On Sun, Feb 16, 2014 at 06:37:12PM +0100, Stefan Beller wrote: Hi, so I tend to accumulate lots of branches as I'd do one branch per feature. When cleaning up, I'd like to delete all branches, which have been merged. I could use $ git branch -d (which was merged already?) ^C

Ambiguous branch names...

2014-02-16 Thread Ingo Rohloff
Hello, while trying out git (version 1.7.9.5), I did this: git clone -- ssh://myserver/~rohloff/git/w1.git w1 So I just cloned a test repository. The in the cloned w1 repository I executed: git branch origin/master git branch remotes/origin/master git branch refs/remotes/origin/master I now

Re: Ambiguous branch names...

2014-02-16 Thread Duy Nguyen
On Mon, Feb 17, 2014 at 3:34 AM, Ingo Rohloff lund...@gmx.de wrote: Hello, while trying out git (version 1.7.9.5), I did this: git clone -- ssh://myserver/~rohloff/git/w1.git w1 So I just cloned a test repository. The in the cloned w1 repository I executed: git branch origin/master git

Re: diff weirdness (bug?)

2014-02-16 Thread Dario Bertini
On 02/14/2014 09:03 PM, Junio C Hamano wrote: This is a combined diff, and yaml-related lines are added relative to your _other_ branch you are merging (notice these + are indented by one place). Relative to what you had at the tip of your branch before you started this operation that ended

Serious flaws in git cvsimport

2014-02-16 Thread Mojca Miklavec
Hello, I really hate working with CVS, so I have set up a cronjob running git cvsimport on regular basis to create a mirror of gnuplot sources. I would use another tool, but until a few days ago I wasn't aware of anything else that supported incremental updates, so that I could run the conversion

git svn clone not work. It's stop with no error message.

2014-02-16 Thread youngseonkim
Hi, I really wonder about this happen. I want svn→git migrate, and I use this command. git svn clone https://my.svn.repo/url --stdlayout When I test a small svn repository and 'real working repository 1' with same this command, it's complete successfully. But it's not work in a 'real working