aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiltjo Posthuma <[email protected]>2021-05-05 19:15:58 +0200
committerHiltjo Posthuma <[email protected]>2021-05-05 19:15:58 +0200
commitc827ab1b1dee13e512f8ae24aa824879d547d0db (patch)
treefdb73af83f35d379e3d8c8f45e7308c196e928a9
parent727e02be6c6aaafd929341963465bf6e1ff2947d (diff)
downloadstagit-c827ab1b1dee13e512f8ae24aa824879d547d0db.tar.gz
stagit-c827ab1b1dee13e512f8ae24aa824879d547d0db.zip
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!
-rw-r--r--stagit-index.c1
-rw-r--r--stagit.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/stagit-index.c b/stagit-index.c
index 11a6017..84785a9 100644
--- 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
index 488b653..d8fbc64 100644
--- 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;