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 <[email protected]>
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 <[email protected]>
---
 git-access.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/git-access.c b/git-access.c
index 99dfe37..bc89033 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)
-- 
2.1.0

_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to