[libgit2-glib] Add new reset enum.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] Add new reset enum.
- Date: Tue, 4 Dec 2012 12:52:16 +0000 (UTC)
commit 11fa8b299aed7e13452cf91f3558fafa73b9139a
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Dec 4 13:39:02 2012 +0100
Add new reset enum.
libgit2-glib/ggit-types.c | 2 ++
libgit2-glib/ggit-types.h | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index b6b1c0d..5d91ae1 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -26,6 +26,7 @@
#include <git2/types.h>
#include <git2/config.h>
#include <git2/stash.h>
+#include <git2/reset.h>
#include "ggit-types.h"
@@ -111,6 +112,7 @@ ASSERT_ENUM (GGIT_REF_LISTALL, GIT_REF_LISTALL);
ASSERT_ENUM (GGIT_RESET_SOFT, GIT_RESET_SOFT);
ASSERT_ENUM (GGIT_RESET_MIXED, GIT_RESET_MIXED);
+ASSERT_ENUM (GGIT_RESET_HARD, GIT_RESET_HARD);
ASSERT_ENUM (GGIT_STASH_DEFAULT, GIT_STASH_DEFAULT);
ASSERT_ENUM (GGIT_STASH_KEEP_INDEX, GIT_STASH_KEEP_INDEX);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index fc0ad83..b56e064 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -462,12 +462,14 @@ typedef enum {
* @GGIT_RESET_SOFT: The head will be moved to the commit.
* @GGIT_RESET_MIXED: the head will be moved to the commit and the index
* will be replaced with the content of the commit tree.
+ * @GGIT_RESET_HARD: MIXED plus changes in working tree discarded.
*
* Describes the type of reset to perform.
*/
typedef enum {
GGIT_RESET_SOFT = 1,
- GGIT_RESET_MIXED = 2
+ GGIT_RESET_MIXED = 2,
+ GGIT_RESET_HARD = 3
} GgitResetType;
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]