xfnw/stagit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix submodule lookup in bare repos

Browse source 
git_submodule_lookup does not work without a working tree [1], so the
current approach fails to recognize any submodules in bare repos.

Instead, notice that

	$ git ls-tree HEAD

lists any submodules as commit objects regardless of a working tree.
This is the only instance commit object is used in a tree, so we will
use this to check for submodules.

[1]: https://github.com/libgit2/libgit2/pull/4305/files
This commit is contained in:
kst 2020-08-05 22:11:18 +00:00 committed by Hiltjo Posthuma
parent f05e6b0fcb
commit 174a763058
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
stagit.c
View file

@ -976,7 +976,6 @@ int
writefilestree(FILE *fp, git_tree *tree, const char *path)
{
const git_tree_entry *entry = NULL;
git_submodule *module = NULL;
git_object *obj = NULL;
git_off_t filesize;
const char *entryname;
@ -1029,11 +1028,11 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
fprintf(fp, "%juB", (uintmax_t)filesize);
fputs("</td></tr>\n", fp);
git_object_free(obj);
} else if (!git_submodule_lookup(&module, repo, entryname)) {
} else if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT) {
/* commit object in tree is a submodule */
fprintf(fp, "<tr><td>m---------</td><td><a href=\"%sfile/.gitmodules.html\">",
relpath);
xmlencode(fp, entrypath, strlen(entrypath));
git_submodule_free(module);
fputs("</a></td><td class=\"num\" align=\"right\"></td></tr>\n", fp);
}
}