proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 06:25:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: restrict branch deletion for worktrees

Browse Source 
Restrict the ability to delete branches that are checked out in
any linked repository.
This commit is contained in:
Patrick Steinhardt 2015-11-06 12:33:59 +01:00
parent e3acd37b70
commit 143e539fd0
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/branch.c
View File

@ -206,6 +206,12 @@ int git_branch_delete(git_reference *branch)
return -1; return -1;
} }
if (git_reference_is_branch(branch) && git_branch_is_checked_out(branch)) {
giterr_set(GITERR_REFERENCE, "Cannot delete branch '%s' as it is "
"the current HEAD of a linked repository.", git_reference_name(branch));
return -1;
}
if (git_buf_join(&config_section, '.', "branch", if (git_buf_join(&config_section, '.', "branch",
git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR)) < 0) git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR)) < 0)
goto on_error; goto on_error;

27
tests/worktree/refs.c
View File

@ -1,4 +1,5 @@
#include "clar_libgit2.h" #include "clar_libgit2.h"
#include "worktree.h"
#include "worktree_helpers.h" #include "worktree_helpers.h"
#define COMMON_REPO "testrepo" #define COMMON_REPO "testrepo"
@ -66,3 +67,29 @@ void test_worktree_refs__read_head(void)
git_reference_free(head); git_reference_free(head);
} }
void test_worktree_refs__delete_fails_for_checked_out_branch(void)
{
git_reference *branch;
cl_git_pass(git_branch_lookup(&branch, fixture.repo,
"testrepo-worktree", GIT_BRANCH_LOCAL));
cl_git_fail(git_branch_delete(branch));
git_reference_free(branch);
}
void test_worktree_refs__delete_succeeds_after_pruning_worktree(void)
{
git_reference *branch;
git_worktree *worktree;
cl_git_pass(git_worktree_lookup(&worktree, fixture.repo, fixture.worktreename));
cl_git_pass(git_worktree_prune(worktree, GIT_WORKTREE_PRUNE_VALID));
git_worktree_free(worktree);
cl_git_pass(git_branch_lookup(&branch, fixture.repo,
"testrepo-worktree", GIT_BRANCH_LOCAL));
cl_git_pass(git_branch_delete(branch));
git_reference_free(branch);
}