On Tue, Feb 21, 2017 at 11:32:54AM -0800, Junio C Hamano wrote:
> Ross Lagerwall 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 with:
> > "fa
g removed.
Signed-off-by: Ross Lagerwall
---
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(in
open("usr//.gitattributes", O_RDONLY) = -1 ENOENT
open("usr//.gitattributes", O_RDONLY) = -1 ENOENT
open("usr//.gitattributes", O_RDONLY) = -1 ENOENT
open("usr//.gitattributes", O_RDONLY) = -1 ENOENT
(and yes, the whitespace was damaged by Gmail!)
Re
a
Signed-off-by: Junio C Hamano
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
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
---
git-difftool.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
di
er say this?
>
>exit(0) unless $diffrtn;
>
> 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.
Re
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
---
git-difftool.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
di
7 matches
Mail list logo
