tdo not simplify the history by first-parent - stagit - [fork] customized build of stagit, the static git page generator

git clone git://src.adamsgaard.dk/stagit

Log

Files

Refs

README

LICENSE

---

commit 245a2703031b9c400d39dedbfc03de09bd2b17a5

parent 63e6c2badf4e0c915b75ccbbeee30778f0efac7c

Author: Hiltjo Posthuma 

Date:   Wed,  5 May 2021 19:15:58 +0200

do not simplify the history by first-parent

Reference:
https://libgit2.org/libgit2/#HEAD/group/revwalk/git_revwalk_simplify_first_parent

Noticed on merge commits on:
https://git.simple-cc.org/scc/

Reported by quinq, thanks!

Diffstat:
  M stagit-index.c                      |       1 -
  M stagit.c                            |       2 --

2 files changed, 0 insertions(+), 3 deletions(-)
---

diff --git a/stagit-index.c b/stagit-index.c

t@@ -106,7 +106,6 @@ writelog(FILE *fp)
 
         git_revwalk_new(&w, repo);
         git_revwalk_push_head(w);
-        git_revwalk_simplify_first_parent(w);
 
         if (git_revwalk_next(&id, w) ||
             git_commit_lookup(&commit, repo, &id)) {

diff --git a/stagit.c b/stagit.c

t@@ -756,7 +756,6 @@ writelog(FILE *fp, const git_oid *oid)
 
         git_revwalk_new(&w, repo);
         git_revwalk_push(w, oid);
-        git_revwalk_simplify_first_parent(w);
 
         while (!git_revwalk_next(&id, w)) {
                 relpath = "";
t@@ -894,7 +893,6 @@ writeatom(FILE *fp, int all)
         if (all) {
                 git_revwalk_new(&w, repo);
                 git_revwalk_push_head(w);
-                git_revwalk_simplify_first_parent(w);
                 for (i = 0; i < m && !git_revwalk_next(&id, w); i++) {
                         if (!(ci = commitinfo_getbyoid(&id)))
                                 break;