Commit Diff

Commit:
289045115432562f5fb4ddc721bd9008e8df4ad5
From:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
Message:
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.
Actions:
Patch | Tree
commit - 70541c5e2cbdc141ba94e76899aba5f07047cecf
commit + 289045115432562f5fb4ddc721bd9008e8df4ad5
blob - d2f22a5e5ec5c18b6a621db6a717e5fb7b74b852
blob + 735775b1ccbe8eef2434db2efa4ef90e8ae253f4
--- stagit-index.c
+++ 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)
blob - 911643e9e86a34a9abda835995be222cdfcbdf51
blob + 2a9c3fe7bcb19dade7bf44f7496e67d0ec154308
--- stagit.c
+++ 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)