ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: delete branch from git remote when pushing locally deleted branch

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-08-04 22:05:58 -07:00
parent e57948347e
commit 8b8aff171e
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/git.rs
View file

@ -190,6 +190,17 @@ pub fn push_commit(
result
}
pub fn delete_remote_branch(
git_repo: &git2::Repository,
remote_name: &str,
remote_branch: &str,
) -> Result<(), GitPushError> {
// 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 refspec = format!(":{}", qualified_remote_branch);
push_ref(git_repo, remote_name, &qualified_remote_branch, &refspec)
}
fn push_ref(
git_repo: &git2::Repository,
remote_name: &str,

3
src/commands.rs
View file

@ -2615,7 +2615,8 @@ fn cmd_git_push(
}
}
} else {
// TODO: Delete remote branch if the local branch was deleted
git::delete_remote_branch(&git_repo, remote_name, branch_name)
.map_err(|err| CommandError::UserError(err.to_string()))?;
}
let mut tx = repo_command.start_transaction("import git refs");
git::import_refs(tx.mut_repo(), &git_repo)