diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 13:57:12 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 13:57:12 -0700 |
| commit | c22adebebe9792fc0471a5f4c2cab9de6aff1d6e (patch) | |
| tree | 25a872afa0650a30c036fbf09aa872babfb5714b /save-git.c | |
| parent | ab255e07ea6060d1a36a5195f6be9cccd3e0ffcc (diff) | |
| parent | 72817ff47f8a990aa043603ebe2d3ead1ff811c9 (diff) | |
| download | subsurface-c22adebebe9792fc0471a5f4c2cab9de6aff1d6e.tar.gz | |
Merge branch 'gitMerge'
Diffstat (limited to 'save-git.c')
| -rw-r--r-- | save-git.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/save-git.c b/save-git.c index 9ae1d572e..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) \ @@ -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; |