From ddb273d9d207bd36cead41ae3107a6cc07808745 Mon Sep 17 00:00:00 2001 From: James Liggett Date: Wed, 23 Apr 2008 16:17:06 -0700 Subject: [PATCH] Improve the default error handler in GitCommand. The handler now shows all error messages, not just the ones that match the pattern. --- plugins/git/git-command.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/git/git-command.c b/plugins/git/git-command.c index 1782944b..998c768c 100644 --- a/plugins/git/git-command.c +++ b/plugins/git/git-command.c @@ -222,6 +222,8 @@ git_command_error_handler (GitCommand *self, const gchar *output) g_string_append (self->priv->error_string, error); g_free (error); } + else + g_string_append (self->priv->error_string, output); } static void @@ -248,8 +250,8 @@ git_command_init (GitCommand *self) G_CALLBACK (git_command_child_exited), self); - self->priv->error_regex = g_regex_new ("^(?:warning|fatal): (.*)", 0, 0, - NULL); + self->priv->error_regex = g_regex_new ("^(?:warning|fatal|error): (.*)", 0, + 0, NULL); self->priv->error_string = g_string_new (""); self->priv->info_queue = g_queue_new (); } -- 2.11.4.GIT