80 lines
4.4 KiB
Diff
80 lines
4.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
|
Date: Sun, 5 Jan 2025 01:37:27 +0100
|
|
Subject: [PATCH] Adjust API for libgit2 1.9.0
|
|
|
|
---
|
|
libgit2-glib/ggit-types.c | 4 +++-
|
|
libgit2-glib/ggit-types.h | 6 ++++--
|
|
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
|
|
index df8ed6e56ad1..3b3c8bc96b85 100644
|
|
--- a/libgit2-glib/ggit-types.c
|
|
+++ b/libgit2-glib/ggit-types.c
|
|
@@ -250,26 +250,28 @@ ASSERT_ENUM (GGIT_ATTRIBUTE_CHECK_NO_SYSTEM, GIT_ATTR_CHECK_NO_SYSTEM);
|
|
ASSERT_ENUM (GGIT_PACKBUILDER_STAGE_ADDING_OBJECTS, GIT_PACKBUILDER_ADDING_OBJECTS);
|
|
ASSERT_ENUM (GGIT_PACKBUILDER_STAGE_DELTAFICATION, GIT_PACKBUILDER_DELTAFICATION);
|
|
|
|
-ASSERT_ENUM (GGIT_CHECKOUT_NONE, GIT_CHECKOUT_NONE);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_SAFE, GIT_CHECKOUT_SAFE);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_FORCE, GIT_CHECKOUT_FORCE);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_RECREATE_MISSING, GIT_CHECKOUT_RECREATE_MISSING);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_ALLOW_CONFLICTS, GIT_CHECKOUT_ALLOW_CONFLICTS);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_REMOVE_UNTRACKED, GIT_CHECKOUT_REMOVE_UNTRACKED);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_REMOVE_IGNORED, GIT_CHECKOUT_REMOVE_IGNORED);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_UPDATE_ONLY, GIT_CHECKOUT_UPDATE_ONLY);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_DONT_UPDATE_INDEX, GIT_CHECKOUT_DONT_UPDATE_INDEX);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_NO_REFRESH, GIT_CHECKOUT_NO_REFRESH);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_SKIP_UNMERGED, GIT_CHECKOUT_SKIP_UNMERGED);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_USE_OURS, GIT_CHECKOUT_USE_OURS);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_USE_THEIRS, GIT_CHECKOUT_USE_THEIRS);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH, GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES, GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_DONT_OVERWRITE_IGNORED, GIT_CHECKOUT_DONT_OVERWRITE_IGNORED);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_CONFLICT_STYLE_MERGE, GIT_CHECKOUT_CONFLICT_STYLE_MERGE);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3, GIT_CHECKOUT_CONFLICT_STYLE_DIFF3);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_DONT_REMOVE_EXISTING, GIT_CHECKOUT_DONT_REMOVE_EXISTING);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_DONT_WRITE_INDEX, GIT_CHECKOUT_DONT_WRITE_INDEX);
|
|
+ASSERT_ENUM (GGIT_CHECKOUT_DRY_RUN, GIT_CHECKOUT_DRY_RUN);
|
|
+ASSERT_ENUM (GGIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3, GIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3);
|
|
+ASSERT_ENUM (GGIT_CHECKOUT_NONE, GIT_CHECKOUT_NONE);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_UPDATE_SUBMODULES, GIT_CHECKOUT_UPDATE_SUBMODULES);
|
|
ASSERT_ENUM (GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED, GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED);
|
|
|
|
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
|
|
index 2a2ed99e5511..8cf932a854a8 100644
|
|
--- a/libgit2-glib/ggit-types.h
|
|
+++ b/libgit2-glib/ggit-types.h
|
|
@@ -990,26 +990,28 @@ typedef enum
|
|
|
|
typedef enum
|
|
{
|
|
- GGIT_CHECKOUT_NONE = 0,
|
|
- GGIT_CHECKOUT_SAFE = (1u << 0),
|
|
+ GGIT_CHECKOUT_SAFE = 0,
|
|
GGIT_CHECKOUT_FORCE = (1u << 1),
|
|
GGIT_CHECKOUT_RECREATE_MISSING = (1u << 2),
|
|
GGIT_CHECKOUT_ALLOW_CONFLICTS = (1u << 4),
|
|
GGIT_CHECKOUT_REMOVE_UNTRACKED = (1u << 5),
|
|
GGIT_CHECKOUT_REMOVE_IGNORED = (1u << 6),
|
|
GGIT_CHECKOUT_UPDATE_ONLY = (1u << 7),
|
|
GGIT_CHECKOUT_DONT_UPDATE_INDEX = (1u << 8),
|
|
GGIT_CHECKOUT_NO_REFRESH = (1u << 9),
|
|
GGIT_CHECKOUT_SKIP_UNMERGED = (1u << 10),
|
|
GGIT_CHECKOUT_USE_OURS = (1u << 11),
|
|
GGIT_CHECKOUT_USE_THEIRS = (1u << 12),
|
|
GGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1u << 13),
|
|
GGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = (1u << 18),
|
|
GGIT_CHECKOUT_DONT_OVERWRITE_IGNORED = (1u << 19),
|
|
GGIT_CHECKOUT_CONFLICT_STYLE_MERGE = (1u << 20),
|
|
GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = (1u << 21),
|
|
GGIT_CHECKOUT_DONT_REMOVE_EXISTING = (1u << 22),
|
|
GGIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23),
|
|
+ GGIT_CHECKOUT_DRY_RUN = (1u << 24),
|
|
+ GGIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3 = (1u << 25),
|
|
+ GGIT_CHECKOUT_NONE = (1u << 30),
|
|
GGIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16),
|
|
GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17)
|
|
} GgitCheckoutStrategy;
|