From 471af6c2fd63fa6139682aade26aa5039df911c0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 23 Aug 2015 11:33:15 -0700 Subject: Cloud storage: clean up after the merge Make sure the branch is pointing at the merge commit, etc. Signed-off-by: Dirk Hohndel --- save-git.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'save-git.c') diff --git a/save-git.c b/save-git.c index 9ae1d572e..3cd8a8a2c 100644 --- a/save-git.c +++ b/save-git.c @@ -997,7 +997,7 @@ static git_tree *get_git_tree(git_repository *repo, git_object *parent) return tree; } -static int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree) +int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; -- cgit v1.2.3-70-g09d2 From a45c5f1acf728d28449f00d6ed37d9449c9e0ee1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 23 Aug 2015 18:14:27 -0700 Subject: When building against libgit2 v0.23 or newer we can assume API23 Signed-off-by: Dirk Hohndel --- git-access.c | 2 +- save-git.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'save-git.c') diff --git a/git-access.c b/git-access.c index 2b44cb6b3..b98b373a1 100644 --- a/git-access.c +++ b/git-access.c @@ -40,7 +40,7 @@ /* * api break introduced in libgit2 master after 0.22 - let's guess this is the v0.23 API */ -#if USE_LIBGIT23_API +#if USE_LIBGIT23_API || (!LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR >= 23) #define git_branch_create(out, repo, branch_name, target, force, signature, log_message) \ git_branch_create(out, repo, branch_name, target, force) #endif diff --git a/save-git.c b/save-git.c index 3cd8a8a2c..9e6819322 100644 --- a/save-git.c +++ b/save-git.c @@ -40,7 +40,7 @@ /* * api break introduced in libgit2 master after 0.22 - let's guess this is the v0.23 API */ -#if USE_LIBGIT23_API +#if USE_LIBGIT23_API || (!LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR >= 23) #define git_branch_create(out, repo, branch_name, target, force, signature, log_message) \ git_branch_create(out, repo, branch_name, target, force) #define git_reference_set_target(out, ref, id, author, log_message) \ -- cgit v1.2.3-70-g09d2