logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://hacktivis.me/git/etc_portage.git

0001-fix-compile-libgit2-0.28-changed-giterr_last-to-git_.patch (1691B)

    

  1. From 583c44395ccc0e052c8db5217bd51fc21f7ffbb7 Mon Sep 17 00:00:00 2001
  2. From: Hiltjo Posthuma <hiltjo@codemadness.org>
  3. Date: Sun, 3 Feb 2019 15:24:34 +0100
  4. Subject: [PATCH 01/22] fix compile: libgit2 0.28 changed giterr_last to
  5.  git_error_last
  7. libgit2 commit:
  8. https://github.com/libgit2/libgit2/commit/a27a4de6f8003961d38958893c6c637395c7cc04
  9. ---
  10.  stagit-index.c | 4 +---
  11.  stagit.c       | 4 +---
  12.  2 files changed, 2 insertions(+), 6 deletions(-)
  14. diff --git a/stagit-index.c b/stagit-index.c
  15. index e019793..ab47e48 100644
  16. --- a/stagit-index.c
  17. +++ b/stagit-index.c
  18. @@ -147,7 +147,6 @@ err:
  19.  int
  20.  main(int argc, char *argv[])
  21.  {
  22. -	const git_error *e = NULL;
  23.  	FILE *fp;
  24.  	char path[PATH_MAX], repodirabs[PATH_MAX + 1];
  25.  	const char *repodir;
  26. @@ -174,8 +173,7 @@ main(int argc, char *argv[])
  27.  
  28.  		if (git_repository_open_ext(&repo, repodir,
  29.  		    GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)) {
  30. -			e = giterr_last();
  31. -			fprintf(stderr, "%s: %s\n", argv[0], e->message);
  32. +			fprintf(stderr, "%s: cannot open repository\n", argv[0]);
  33.  			ret = 1;
  34.  			continue;
  35.  		}
  36. diff --git a/stagit.c b/stagit.c
  37. index 093cdab..c2b2f2c 100644
  38. --- a/stagit.c
  39. +++ b/stagit.c
  40. @@ -1054,7 +1054,6 @@ main(int argc, char *argv[])
  41.  {
  42.  	git_object *obj = NULL;
  43.  	const git_oid *head = NULL;
  44. -	const git_error *e = NULL;
  45.  	mode_t mask;
  46.  	FILE *fp, *fpread;
  47.  	char path[PATH_MAX], repodirabs[PATH_MAX + 1], *p;
  48. @@ -1101,8 +1100,7 @@ main(int argc, char *argv[])
  49.  
  50.  	if (git_repository_open_ext(&repo, repodir,
  51.  		GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
  52. -		e = giterr_last();
  53. -		fprintf(stderr, "%s: %s\n", argv[0], e->message);
  54. +		fprintf(stderr, "%s: cannot open repository\n", argv[0]);
  55.  		return 1;
  56.  	}
  57.  
  58. -- 
  59. 2.26.2