summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiltjo Posthuma <hiltjo@codemadness.org>2021-05-05 19:15:58 +0200
committerArmaan Bhojwani <me@armaanb.net>2021-05-05 18:35:26 -0400
commitd915e5e6d4b53355e512d76f5874be58827debc1 (patch)
treeebab28f82f6a39ec2f589c2a4f1095a56dd2c58a
parent287c6e5621b6d8edcf8434cf70c6040941b0cb38 (diff)
downloadstagit-main.tar.gz
do not simplify the history by first-parentHEADmain
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--src/stagit-index.c1
-rw-r--r--src/stagit.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/stagit-index.c b/src/stagit-index.c
index e226b0d..407d7fb 100644
--- 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 c43c717..24075f6 100644
--- 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)))