ifix submodule lookup in bare repos - stagit-gemini - Stagit for gemini protocol Openbsd Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/stagit-gemini.git URL:git://thinkerwim.org/stagit-gemini.git thinkerwim.org 70 1Log /git/stagit-gemini/log.gph thinkerwim.org 70 1Files /git/stagit-gemini/files.gph thinkerwim.org 70 1Refs /git/stagit-gemini/refs.gph thinkerwim.org 70 1README /git/stagit-gemini/file/README.gph thinkerwim.org 70 1LICENSE /git/stagit-gemini/file/LICENSE.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 40f49c4d17d2cacc62c64e5f96522c3c14c40ab9 /git/stagit-gemini/commit/40f49c4d17d2cacc62c64e5f96522c3c14c40ab9.gph thinkerwim.org 70 1parent f939dd0767be55df7983178f51c85d3e55054056 /git/stagit-gemini/commit/f939dd0767be55df7983178f51c85d3e55054056.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Thu, 6 Aug 2020 18:28:30 +0200 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 ifix submodule lookup in bare repos Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSync fix from stagit. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iPatch by kst , thanks! Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.c | 5 ++--- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i1 file changed, 2 insertions(+), 3 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher.c b/stagit-gopher.c /git/stagit-gemini/file/stagit-gopher.c.gph thinkerwim.org 70 i@@ -1051,7 +1051,6 @@ int Err thinkerwim.openbsd.amsterdam 70 i writefilestree(FILE *fp, git_tree *tree, const char *path) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i const git_tree_entry *entry = NULL; Err thinkerwim.openbsd.amsterdam 70 i- git_submodule *module = NULL; Err thinkerwim.openbsd.amsterdam 70 i git_object *obj = NULL; Err thinkerwim.openbsd.amsterdam 70 i git_off_t filesize; Err thinkerwim.openbsd.amsterdam 70 i const char *entryname; Err thinkerwim.openbsd.amsterdam 70 i@@ -1105,13 +1104,13 @@ writefilestree(FILE *fp, git_tree *tree, const char *path) Err thinkerwim.openbsd.amsterdam 70 i gphlink(fp, filepath, strlen(filepath)); Err thinkerwim.openbsd.amsterdam 70 i fputs("|server|port]\n", fp); Err thinkerwim.openbsd.amsterdam 70 i git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i- } else if (!git_submodule_lookup(&module, repo, entryname)) { Err thinkerwim.openbsd.amsterdam 70 i+ } else if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT) { Err thinkerwim.openbsd.amsterdam 70 i+ /* commit object in tree is a submodule */ Err thinkerwim.openbsd.amsterdam 70 i fputs("[1|m--------- ", fp); Err thinkerwim.openbsd.amsterdam 70 i utf8pad(buf, sizeof(buf), entrypath, 50, ' '); Err thinkerwim.openbsd.amsterdam 70 i gphlink(fp, buf, strlen(buf)); Err thinkerwim.openbsd.amsterdam 70 i fprintf(fp, "|%s/file/.gitmodules.gph|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i /* NOTE: linecount omitted */ Err thinkerwim.openbsd.amsterdam 70 i- git_submodule_free(module); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 .