summaryrefslogtreecommitdiffstats
path: root/git-access.c
diff options
context:
space:
mode:
authorGravatar Patrick Valsecchi <patrick@thus.ch>2015-02-24 08:49:46 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-24 11:41:11 +0100
commit1c55f476621427cdcda36fd8b608fed2bfcc0b91 (patch)
tree379a71e065cdaf4474295ac1a25276004150687a /git-access.c
parente64501574b6d68685082aa478965b11a517b4f48 (diff)
downloadsubsurface-1c55f476621427cdcda36fd8b608fed2bfcc0b91.tar.gz
Fix Ubuntu compilation error.
Ubuntu has git minor version 20 which has less parameters in git-remote-fetch. From ac9516984e4fbc787635b0dfd76649c8e43fab83 Mon Sep 17 00:00:00 2001 From: Patrick Valsecchi <patrick@thus.ch> Date: Tue, 24 Feb 2015 08:45:21 +0100 Subject: [PATCH 2/2] Fix Ubuntu compilation error. Ubuntu has git minor version 20 which has less parameters in git-remote-fetch. Signed-off-by: Patrick Valsecchi <patrick@thus.ch> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'git-access.c')
-rw-r--r--git-access.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-access.c b/git-access.c
index 99dfe3766..bc8903331 100644
--- a/git-access.c
+++ b/git-access.c
@@ -20,7 +20,11 @@
*/
#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR < 22
#define git_remote_lookup(res, repo, name) git_remote_load(res, repo, name)
- #define git_remote_fetch(remote, refspecs, signature, reflog) git_remote_fetch(remote, signature, reflog)
+ #if LIBGIT2_VER_MINOR <= 20
+ #define git_remote_fetch(remote, refspecs, signature, reflog) git_remote_fetch(remote)
+ #else
+ #define git_remote_fetch(remote, refspecs, signature, reflog) git_remote_fetch(remote, signature, reflog)
+ #endif
#endif
static char *get_local_dir(const char *remote, const char *branch)