|
|
do not simplify the history by first-parent - stagit - static git page generator |
|
|
 |
git clone git://git.codemadness.org/stagit (git://git.codemadness.org) |
|
|
 |
Log |
|
|
|
Files |
|
|
|
Refs |
|
|
|
README |
|
|
|
LICENSE |
|
|
|
--- |
|
|
|
commit c827ab1b1dee13e512f8ae24aa824879d547d0db |
|
|
|
parent 727e02be6c6aaafd929341963465bf6e1ff2947d |
|
|
|
Author: Hiltjo Posthuma <hiltjo@codemadness.org> (mailto://) |
application/vnd.lotus-organizer |
|
|
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 |
|
|
|
@@ -101,7 +101,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 |
|
|
|
@@ -743,7 +743,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 = ""; |
|
|
|
@@ -881,7 +880,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; |
|