Re: [PATCH] remote: Ignore failure to remove missing branch..merge

On Tue, Feb 21, 2017 at 11:32:54AM -0800, Junio C Hamano wrote: > Ross Lagerwall <rosslagerw...@gmail.com> writes: > > > If a branch is configured with a default remote but no > > branch..merge and then the remote is removed, git fails to remove > > the remote wit

[PATCH] remote: Ignore failure to remove missing branch..merge

Signed-off-by: Ross Lagerwall <rosslagerw...@gmail.com> --- builtin/remote.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/remote.c b/builtin/remote.c index e52cf3925..5dd22c2eb 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -769,7 +769,9 @@ static int rm

git grep performance regression

jn.av...@free.fr Signed-off-by: Junio C Hamano gits...@pobox.com Regards -- Ross Lagerwall -- 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: git grep performance regression

ENOENT open(usr//.gitattributes, O_RDONLY) = -1 ENOENT open(usr//.gitattributes, O_RDONLY) = -1 ENOENT (and yes, the whitespace was damaged by Gmail!) Regards -- Ross Lagerwall -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org

Re: [PATCH] difftool: silence warning

; or is it better to explicitly check for undef using defined($diffrtn) like was done in this patch? I would assume that explicit is preferred. It seems like defined() is used throughout git-difftool so I just used that. Regards -- Ross Lagerwall signature.asc Description: OpenPGP digital

[PATCH] difftool: silence warning

Silence a warning given when running git difftool --dir-diff and there are no changes. This is because command_oneline returns undef when the command has no output, not ''. Signed-off-by: Ross Lagerwall rosslagerw...@gmail.com --- git-difftool.perl | 2 +- 1 file changed, 1 insertion(+), 1