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!

diff --git a/src/stagit-index.c b/src/stagit-index.c
index e226b0d1e1a122f30b599b844c810cfca24fe926..407d7fb7252b76f83d03a615f5007c006d8362a0 100644 (file)
--- a/src/stagit-index.c
+++ b/src/stagit-index.c
@@ -136,7 +136,6 @@ writelog(char *path)
 
        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/src/stagit.c b/src/stagit.c
index c43c7179467b3adda95b449468d66e5e1b9b2693..24075f6081e2f54024c1babd5ab3e0fa4458d8ad 100644 (file)
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -683,7 +683,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 = "";
@@ -812,7 +811,6 @@ writeatom(FILE *fp)
 
        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)))