mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-08 21:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

git_backend: don't panic if told to write merge with root commit

Browse source 
I think the CLI currently checks that the backend is not told to write
a merge commit with the root as one parent, but we should not panic if
those checks fail.
This commit is contained in:
Martin von Zweigbergk 2023-02-05 21:14:01 -08:00 committed by Martin von Zweigbergk
parent 2b2a9a36d7
commit 8c63fbc4ed
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/src/git_backend.rs
View file

@ -460,7 +460,13 @@ impl Backend for GitBackend {
// add it to the list of parents to write in the Git commit. We also check that
// there are no other parents since Git cannot represent a merge between a root
// commit and another commit.
assert_eq!(contents.parents.len(), 1);
if contents.parents.len() > 1 {
return Err(BackendError::Other(
"The Git backend does not support creating merge commits with the root \
commit as one of the parents."
.to_string(),
));
}
} else {
let git_commit_id = validate_git_object_id(parent_id)?;
let parent_git_commit = locked_repo
@ -595,6 +601,7 @@ fn bytes_vec_from_json(value: &serde_json::Value) -> Vec<u8> {
#[cfg(test)]
mod tests {
use assert_matches::assert_matches;
use super::*;
use crate::backend::{FileId, MillisSinceEpoch};
@ -757,6 +764,13 @@ mod tests {
merge_git_commit.parent_ids().collect_vec(),
vec![git_id(&first_id), git_id(&second_id)]
);
// Merge commit with root as one parent
commit.parents = vec![first_id, backend.root_commit_id().clone()];
assert_matches!(
backend.write_commit(&commit),
Err(BackendError::Other(message)) if message.contains("root commit")
);
}
#[test]