Re: [PATCH 0/4] merge-tree: handle missing objects correctly
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Feb 7, 2024, 07:42 UTC
- Message-ID
- <ZcM0dvzqJy_PuEEc@tanuki>
- In-Reply-To
- <pull.1651.git.1707212981.gitgitgadget@gmail.com>
On Tue, Feb 06, 2024 at 09:49:37AM +0000, Johannes Schindelin via GitGitGadget wrote:
Show 12 quoted lines
> I recently looked into issues where git merge-tree calls returned bogus data > (in one instance returning an empty tree for non-empty merge parents). By > the time I had a look at the corresponding repository, the issue was no > longer reproducible, but a closer look at the code combined with some manual > experimenting turned up the fact that missing tree objects aren't handled as > errors by git merge-tree. > > While at it, I added a commit on top that tries to catch all remaining > unchecked parse_tree() calls. > > This patch series is based on js/merge-tree-3-trees because I introduced > three unchecked parse_tree() calls in that topic branch.
These patches all look good to me, thanks! I have two nits for the first patch, but I don't really think that those are worth a reroll.
Patrick