[libgit2-glib] Fix submodule status.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] Fix submodule status.
- Date: Sat, 29 Sep 2012 11:50:19 +0000 (UTC)
commit 5238a7805505f5f50d84b1f4f75f188bff9cf430
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Sat Sep 29 13:31:38 2012 +0200
Fix submodule status.
Still missing the documentation
libgit2-glib/ggit-types.c | 18 ++++++++++++++----
libgit2-glib/ggit-types.h | 23 +++++++++++++++--------
2 files changed, 29 insertions(+), 12 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 19333c2..0a04123 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -114,10 +114,20 @@ ASSERT_ENUM (GGIT_STATUS_WORKING_TREE_DELETED, GIT_STATUS_WT_DELETED);
ASSERT_ENUM (GGIT_STATUS_IGNORED, GIT_STATUS_IGNORED);
-ASSERT_ENUM (GGIT_SUBMODULE_IGNORE_ALL, GIT_SUBMODULE_IGNORE_ALL);
-ASSERT_ENUM (GGIT_SUBMODULE_IGNORE_DIRTY, GIT_SUBMODULE_IGNORE_DIRTY);
-ASSERT_ENUM (GGIT_SUBMODULE_IGNORE_UNTRACKED, GIT_SUBMODULE_IGNORE_UNTRACKED);
-ASSERT_ENUM (GGIT_SUBMODULE_IGNORE_NONE, GIT_SUBMODULE_IGNORE_NONE);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_IN_HEAD, GIT_SUBMODULE_STATUS_IN_HEAD);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_IN_INDEX, GIT_SUBMODULE_STATUS_IN_INDEX);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_IN_CONFIG, GIT_SUBMODULE_STATUS_IN_CONFIG);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_IN_WD, GIT_SUBMODULE_STATUS_IN_WD);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_INDEX_ADDED, GIT_SUBMODULE_STATUS_INDEX_ADDED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_INDEX_DELETED, GIT_SUBMODULE_STATUS_INDEX_DELETED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_INDEX_MODIFIED, GIT_SUBMODULE_STATUS_INDEX_MODIFIED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_UNINITIALIZED, GIT_SUBMODULE_STATUS_WD_UNINITIALIZED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_ADDED, GIT_SUBMODULE_STATUS_WD_ADDED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_DELETED, GIT_SUBMODULE_STATUS_WD_DELETED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_MODIFIED, GIT_SUBMODULE_STATUS_WD_MODIFIED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED, GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_WD_MODIFIED, GIT_SUBMODULE_STATUS_WD_WD_MODIFIED);
+ASSERT_ENUM (GGIT_SUBMODULE_STATUS_WD_UNTRACKED, GIT_SUBMODULE_STATUS_WD_UNTRACKED);
ASSERT_ENUM (GGIT_SUBMODULE_UPDATE_CHECKOUT, GIT_SUBMODULE_UPDATE_CHECKOUT);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 9e88457..e4c208a 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -482,18 +482,25 @@ typedef enum {
/**
* GgitSubmoduleIgnore:
- * @GGIT_SUBMODULE_IGNORE_ALL: never dirty.
- * @GGIT_SUBMODULE_IGNORE_DIRTY: only dirty if HEAD moved.
- * @GGIT_SUBMODULE_IGNORE_UNTRACKED: dirty if tracked files change.
- * @GGIT_SUBMODULE_IGNORE_NONE: any change or untracked == dirty.
+ * FIXME
*
* Describes which submodules should be ignored.
*/
typedef enum {
- GGIT_SUBMODULE_IGNORE_ALL = 0,
- GGIT_SUBMODULE_IGNORE_DIRTY = 1,
- GGIT_SUBMODULE_IGNORE_UNTRACKED = 2,
- GGIT_SUBMODULE_IGNORE_NONE = 3
+ GGIT_SUBMODULE_STATUS_IN_HEAD = 1 << 0,
+ GGIT_SUBMODULE_STATUS_IN_INDEX = 1 << 1,
+ GGIT_SUBMODULE_STATUS_IN_CONFIG = 1 << 2,
+ GGIT_SUBMODULE_STATUS_IN_WD = 1 << 3,
+ GGIT_SUBMODULE_STATUS_INDEX_ADDED = 1 << 4,
+ GGIT_SUBMODULE_STATUS_INDEX_DELETED = 1 << 5,
+ GGIT_SUBMODULE_STATUS_INDEX_MODIFIED = 1 << 6,
+ GGIT_SUBMODULE_STATUS_WD_UNINITIALIZED = 1 << 7,
+ GGIT_SUBMODULE_STATUS_WD_ADDED = 1 << 8,
+ GGIT_SUBMODULE_STATUS_WD_DELETED = 1 << 9,
+ GGIT_SUBMODULE_STATUS_WD_MODIFIED = 1 << 10,
+ GGIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED = 1 << 11,
+ GGIT_SUBMODULE_STATUS_WD_WD_MODIFIED = 1 << 12,
+ GGIT_SUBMODULE_STATUS_WD_UNTRACKED = 1 << 13
} GgitSubmoduleIgnore;
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]