fix: Never delete tags in deleteBranch (#1777)

__tests__/__fixtures__/test-deleteBranch.git/refs/heads/collision

@@ -0,0 +1 @@
+46938a722feab415225be56085fe08f233301211

__tests__/__fixtures__/test-deleteBranch.git/refs/tags/collision

@@ -0,0 +1 @@
+46938a722feab415225be56085fe08f233301211

__tests__/test-deleteBranch.js

@@ -4,6 +4,7 @@ const {
   deleteBranch,
   currentBranch,
   listBranches,
+  listTags,
 } = require('isomorphic-git')
 
 const { makeFixture } = require('./__helpers__/FixtureFS.js')
@@ -18,6 +19,17 @@ describe('deleteBranch', () => {
     expect(branches.includes('test')).toBe(false)
   })
 
+  it('deletes the branch when an identically named tag exists', async () => {
+    // Setup
+    const { fs, gitdir } = await makeFixture('test-deleteBranch')
+    // Test
+    await deleteBranch({ fs, gitdir, ref: 'collision' })
+    const branches = await listBranches({ fs, gitdir })
+    expect(branches.includes('collision')).toBe(false)
+    const tags = await listTags({ fs, gitdir })
+    expect(tags.includes('collision')).toBe(true)
+  })
+
   it('branch not exist', async () => {
     // Setup
     const { fs, gitdir } = await makeFixture('test-deleteBranch')

src/commands/deleteBranch.js

@@ -12,6 +12,7 @@ import { GitRefManager } from '../managers/GitRefManager.js'
  * @returns {Promise<void>}
  */
 export async function _deleteBranch({ fs, gitdir, ref }) {
+  ref = ref.startsWith('refs/heads/') ? ref : `refs/heads/${ref}`
   const exist = await GitRefManager.exists({ fs, gitdir, ref })
   if (!exist) {
     throw new NotFoundError(ref)

website/versioned_docs/version-1.x/listBranches.md

@@ -53,4 +53,4 @@ console.log('done')
     el.href = 'https://github.com/isomorphic-git/isomorphic-git/edit/main/src/api/listBranches.js';
   }
 })();
-</script>
+</script>