[libgit2-glib] Map flags related to conflicts

[Alberto Fanjul <albfan src gnome org>]

commit 05a4fb1aa0263a30cd004da36dd7cba0843bf701
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Mon Mar 14 07:11:40 2022 +0100

    Map flags related to conflicts

 libgit2-glib/ggit-types.c |  6 ++++++
 libgit2-glib/ggit-types.h | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 8173ffc..df8ed6e 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -53,6 +53,9 @@ ASSERT_ENUM (GGIT_DELTA_RENAMED,    GIT_DELTA_RENAMED);
 ASSERT_ENUM (GGIT_DELTA_COPIED,     GIT_DELTA_COPIED);
 ASSERT_ENUM (GGIT_DELTA_IGNORED,    GIT_DELTA_IGNORED);
 ASSERT_ENUM (GGIT_DELTA_UNTRACKED,  GIT_DELTA_UNTRACKED);
+ASSERT_ENUM (GGIT_DELTA_TYPECHANGE, GIT_DELTA_TYPECHANGE);
+ASSERT_ENUM (GGIT_DELTA_UNREADABLE, GIT_DELTA_UNREADABLE);
+ASSERT_ENUM (GGIT_DELTA_CONFLICTED, GIT_DELTA_CONFLICTED);
 
 ASSERT_ENUM (GGIT_DIFF_FORMAT_PATCH,         GIT_DIFF_FORMAT_PATCH);
 ASSERT_ENUM (GGIT_DIFF_FORMAT_PATCH_HEADER,  GIT_DIFF_FORMAT_PATCH_HEADER);
@@ -179,7 +182,10 @@ ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_NEW,        GIT_STATUS_WT_NEW);
 ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_MODIFIED,   GIT_STATUS_WT_MODIFIED);
 ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_DELETED,    GIT_STATUS_WT_DELETED);
 ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_TYPECHANGE, GIT_STATUS_WT_TYPECHANGE);
+ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_RENAMED,    GIT_STATUS_WT_RENAMED);
+ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_UNREADABLE, GIT_STATUS_WT_UNREADABLE);
 ASSERT_ENUM (GGIT_STATUS_IGNORED,                 GIT_STATUS_IGNORED);
+ASSERT_ENUM (GGIT_STATUS_CONFLICTED,              GIT_STATUS_CONFLICTED);
 
 
 ASSERT_ENUM (GGIT_SUBMODULE_IGNORE_UNSPECIFIED, GIT_SUBMODULE_IGNORE_UNSPECIFIED);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 4d5accf..7e28975 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -393,7 +393,11 @@ typedef enum {
        GGIT_DELTA_RENAMED    = 4,
        GGIT_DELTA_COPIED     = 5,
        GGIT_DELTA_IGNORED    = 6,
-       GGIT_DELTA_UNTRACKED  = 7
+       GGIT_DELTA_UNTRACKED  = 7,
+       GGIT_DELTA_TYPECHANGE = 8,
+       GGIT_DELTA_UNREADABLE = 9,
+       GGIT_DELTA_CONFLICTED = 10,
+
 } GgitDeltaType;
 
 /**
@@ -800,7 +804,10 @@ typedef enum {
        GGIT_STATUS_WORKING_TREE_MODIFIED   = 1 << 8,
        GGIT_STATUS_WORKING_TREE_DELETED    = 1 << 9,
        GGIT_STATUS_WORKING_TREE_TYPECHANGE = 1 << 10,
-       GGIT_STATUS_IGNORED                 = 1 << 14
+       GGIT_STATUS_WORKING_TREE_RENAMED    = 1 << 11,
+       GGIT_STATUS_WORKING_TREE_UNREADABLE = 1 << 12,
+       GGIT_STATUS_IGNORED                 = 1 << 14,
+       GGIT_STATUS_CONFLICTED              = 1 << 15,
 } GgitStatusFlags;
 
 /**