Martin von Zweigbergk 4d42604913 git_backend: write trees involved in conflict in git commit header ... We haven't used custom Git commit headers for two main reasons: 1. I don't want commits created by jj to be different from any other commits. I don't want Git projects to get annoyed by such commit and reject them. 2. I've been concerned that tools don't know how to handle such headers, perhaps even resulting in crashes. The first argument doesn't apply to commits with conflicts because such commits would never be accepted by a project whether or not they use custom commit headers. The second argument is less relevant for conflicted commits because most tools will be confused by such commits anyway. Storing conflict information in commit headers means that we can transfer them via the regular Git wire protocol. We already include the tree objects nested inside the root-level tree, so they will also be transferred. So, let's start by writing the information redundantly to the commit header and to the existing storage. That way we can roll it back if we realize there's a problem with using commit headers.		2024-03-10 20:51:05 -07:00
..
benches
gen-protos
proc-macros
src	git_backend: write trees involved in conflict in git commit header	2024-03-10 20:51:05 -07:00
tests	revset: introduce more performant way to check if a commit is in a revset	2024-03-11 08:27:35 +05:00
testutils
Cargo.toml
LICENSE