[gnome-builder/wip/gtk4-port: 1402/1774] plugins/git: fix warning in notify of current branch
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/gtk4-port: 1402/1774] plugins/git: fix warning in notify of current branch
- Date: Mon, 11 Jul 2022 22:31:44 +0000 (UTC)
commit 6788caa9c1434beb280ef39dc9b64d681ca5f5cd
Author: Christian Hergert <chergert redhat com>
Date: Tue Jun 7 16:59:58 2022 -0700
plugins/git: fix warning in notify of current branch
Likely only visible on first commit.
src/plugins/git/daemon/ipc-git-repository-impl.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c
b/src/plugins/git/daemon/ipc-git-repository-impl.c
index 61df7a4c4..8fe7b60cc 100644
--- a/src/plugins/git/daemon/ipc-git-repository-impl.c
+++ b/src/plugins/git/daemon/ipc-git-repository-impl.c
@@ -64,9 +64,10 @@ static void
ipc_git_repository_impl_monitor_changed_cb (IpcGitRepositoryImpl *self,
IpcGitIndexMonitor *monitor)
{
+ g_autoptr(GgitRef) head_ref = NULL;
+ const char *shortname = NULL;
GHashTableIter iter;
gpointer key;
- g_autoptr(GgitRef) head_ref = NULL;
g_assert (IPC_IS_GIT_REPOSITORY_IMPL (self));
g_assert (IPC_IS_GIT_INDEX_MONITOR (monitor));
@@ -79,9 +80,16 @@ ipc_git_repository_impl_monitor_changed_cb (IpcGitRepositoryImpl *self,
ipc_git_change_monitor_impl_reset (change_monitor);
}
- head_ref = ggit_repository_get_head (self->repository, NULL);
- g_assert (GGIT_IS_REF (head_ref));
- ipc_git_repository_set_branch ((IpcGitRepository *)self, ggit_ref_get_shorthand (head_ref));
+ if ((head_ref = ggit_repository_get_head (self->repository, NULL)))
+ {
+ g_assert (GGIT_IS_REF (head_ref));
+ shortname = ggit_ref_get_shorthand (head_ref);
+ }
+
+ if (shortname == NULL)
+ shortname = "main";
+
+ ipc_git_repository_set_branch ((IpcGitRepository *)self, shortname);
ipc_git_repository_emit_changed (IPC_GIT_REPOSITORY (self));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]