mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

git: on push, check that remote branch was actually updated

Browse source 
I had missed in `git2-rs`'s documentation that you need to check
in a callback if the remote ref(s) got updated by the push or
not. This adds such a check and a new error variant for rejected
branch updates.
This commit is contained in:
Martin von Zweigbergk 2021-01-02 10:08:23 -08:00
parent 7542c484a8
commit e2d6252766
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.rs
View file

@ -87,6 +87,8 @@ pub enum GitPushError {
NoSuchRemote(String),
#[error("Push is not fast-forwardable'")]
NotFastForward,
#[error("Remote reject the update'")]
RefUpdateRejected,
// TODO: I'm sure there are other errors possible, such as transport-level errors,
// and errors caused by the remote rejecting the push.
#[error("Unexpected git error when pushing: {0}")]
@ -122,9 +124,16 @@ pub fn push_commit(
// Need to add "refs/heads/" prefix due to https://github.com/libgit2/libgit2/issues/1125
let qualified_remote_branch = format!("refs/heads/{}", remote_branch);
let mut callbacks = git2::RemoteCallbacks::new();
let mut updated = false;
callbacks.credentials(|_url, username_from_url, _allowed_types| {
git2::Cred::ssh_key_from_agent(username_from_url.unwrap())
});
callbacks.push_update_reference(|refname, status| {
if refname == &qualified_remote_branch && status.is_none() {
updated = true;
}
Ok(())
});
let refspec = format!("{}:{}", temp_ref_name, qualified_remote_branch);
let mut push_options = git2::PushOptions::new();
push_options.remote_callbacks(callbacks);
@ -136,6 +145,11 @@ pub fn push_commit(
}
_ => GitPushError::InternalGitError(err),
})?;
drop(push_options);
temp_ref.delete()?;
Ok(())
if updated {
Ok(())
} else {
Err(GitPushError::RefUpdateRejected)
}
}