Skip to content
Snippets Groups Projects
Commit ac22d12b authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Doc: Improved robustness of extractor change detector.

Use git diff instead of git show.

This means that meerges now will be handled correctly.
parent abc7b852
Branches
Tags
No related merge requests found
...@@ -713,7 +713,10 @@ void export_autodoc_for_ref(string ref) ...@@ -713,7 +713,10 @@ void export_autodoc_for_ref(string ref)
} }
// Not previously converted. // Not previously converted.
if( doc_refs[ref] && !has_doc_commits(git("show",src_rev)) ) mapping(string:array(string)) src_commit = get_commit(work_git, src_rev);
if( doc_refs[ref] && src_commit->parent &&
!has_doc_commits(git("diff", "--pretty=raw",
src_commit->parent[0] + ".." + src_rev)) )
{ {
// Not relevant for autodoc. // Not relevant for autodoc.
src_to_doc[src_rev] = doc_refs[ref]; src_to_doc[src_rev] = doc_refs[ref];
...@@ -729,7 +732,6 @@ void export_autodoc_for_ref(string ref) ...@@ -729,7 +732,6 @@ void export_autodoc_for_ref(string ref)
git("clean", "-f", "-d", "-q", "src", "lib"); git("clean", "-f", "-d", "-q", "src", "lib");
// Create a corresponding commit in the documentation. // Create a corresponding commit in the documentation.
mapping(string:array(string)) src_commit = get_commit(work_git, src_rev);
array(string) doc_parents = ({}); array(string) doc_parents = ({});
string prev_autodoc_sha1; string prev_autodoc_sha1;
string prev_refdoc_sha1 = ""; string prev_refdoc_sha1 = "";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment