From 289045115432562f5fb4ddc721bd9008e8df4ad5 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Fri, 27 May 2022 21:29:14 +0200 Subject: Revert "remain compatible with slightly older libgit versions for now" This reverts commit 70541c5e2cbdc141ba94e76899aba5f07047cecf. Reported by Anton: The last commit[1] is not correct as GIT_OPT_SET_OWNER_VALIDATION is not a preprocessor directive but rather an enum. Causing the branch to never be entered. --- stagit-index.c | 2 -- stagit.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/stagit-index.c b/stagit-index.c index d2f22a5..735775b 100644 --- a/stagit-index.c +++ b/stagit-index.c @@ -188,10 +188,8 @@ main(int argc, char *argv[]) git_libgit2_init(); for (i = 1; i <= GIT_CONFIG_LEVEL_APP; i++) git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, i, ""); -#ifdef GIT_OPT_SET_OWNER_VALIDATION /* do not require the git repository to be owned by the current user */ git_libgit2_opts(GIT_OPT_SET_OWNER_VALIDATION, 0); -#endif #ifdef __OpenBSD__ if (pledge("stdio rpath", NULL) == -1) diff --git a/stagit.c b/stagit.c index 911643e..2a9c3fe 100644 --- a/stagit.c +++ b/stagit.c @@ -1235,10 +1235,8 @@ main(int argc, char *argv[]) git_libgit2_init(); for (i = 1; i <= GIT_CONFIG_LEVEL_APP; i++) git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, i, ""); -#ifdef GIT_OPT_SET_OWNER_VALIDATION /* do not require the git repository to be owned by the current user */ git_libgit2_opts(GIT_OPT_SET_OWNER_VALIDATION, 0); -#endif #ifdef __OpenBSD__ if (unveil(repodir, "r") == -1) -- cgit v1.2.3-54-g00ecf