stagit

commit 3a1da08cae1ffbe1cc78e7041ba79cb0ec326b78
parent 6db146c9002cd977caeb5986765d54803ef14710
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri, 27 May 2022 21:29:14 +0200

Revert "remain compatible with slightly older libgit versions for now"

This reverts commit 6db146c9002cd977caeb5986765d54803ef14710.

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.

Diffstat:
M
stagit-index.c
 | 
2
--
M
stagit.c
 | 
2
--

2 files changed, 0 insertions(+), 4 deletions(-)
diff --git 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
@@ -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)