diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:41 -0700 |
| commit | 474e4f9b5567e02e9c6947e36ed84f882868d77e (patch) | |
| tree | f3f1b5b35a54047bfd6d543351b0b7216e8df990 /t | |
| parent | cd9a57f6a040116f866ada47317c91262688a0ed (diff) | |
| parent | 597a97748924e8ce0b829f668acc8f7a6849b05f (diff) | |
| download | git-474e4f9b5567e02e9c6947e36ed84f882868d77e.tar.gz | |
Merge branch 'rs/branch-allow-deleting-dangling' into maint
"git branch -D <branch>" used to refuse to remove a broken branch
ref that points at a missing commit, which has been corrected.
* rs/branch-allow-deleting-dangling:
branch: allow deleting dangling branches with --force
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index cc4b10236e..e575ffb4ff 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1272,6 +1272,19 @@ test_expect_success 'attempt to delete a branch merged to its base' ' test_must_fail git branch -d my10 ' +test_expect_success 'branch --delete --force removes dangling branch' ' + git checkout main && + test_commit unstable && + hash=$(git rev-parse HEAD) && + objpath=$(echo $hash | sed -e "s|^..|.git/objects/&/|") && + git branch --no-track dangling && + mv $objpath $objpath.x && + test_when_finished "mv $objpath.x $objpath" && + git branch --delete --force dangling && + git for-each-ref refs/heads/dangling >actual && + test_must_be_empty actual +' + test_expect_success 'use --edit-description' ' write_script editor <<-\EOF && echo "New contents" >"$1" |