oppi.li / go-git
fork of go-git with some jj specific features
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #1446 from onee-only/improve-amend-parent

git: worktree_commit, use all parent hashes on amend commit. Fixes #1209

authored by

Paulo Gomes and committed by
GitHub cc0ed3ac a1c91541

+1 -4
+1 -4
worktree_commit.go
··· 53 53 return plumbing.ZeroHash, err 54 54 } 55 55 56 - opts.Parents = nil 57 - if len(headCommit.ParentHashes) != 0 { 58 - opts.Parents = []plumbing.Hash{headCommit.ParentHashes[0]} 59 - } 56 + opts.Parents = headCommit.ParentHashes 60 57 } 61 58 62 59 idx, err := w.r.Storer.Index()