development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-30 06:03:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #17954 from desktop/read-tags-with-commas

Browse source 
Comma is a valid character in tags
This commit is contained in:
tidy-dev 2024-01-09 07:20:40 -05:00 committed by GitHub
commit 473d3939b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/lib/git/log.ts
View file

@ -12,7 +12,6 @@ import { Repository } from '../../models/repository'
import { Commit } from '../../models/commit'
import { CommitIdentity } from '../../models/commit-identity'
import { parseRawUnfoldedTrailers } from './interpret-trailers'
import { getCaptures } from '../helpers/regex'
import { createLogParser } from './git-delimiter-parser'
import { revRange } from '.'
import { forceUnwrap } from '../fatal-error'
@ -155,9 +154,12 @@ export async function getCommits(
const parsed = parse(result.stdout)
return parsed.map(commit => {
const tags = getCaptures(commit.refs, /tag: ([^\s,]+)/g)
.filter(i => i[0] !== undefined)
.map(i => i[0])
// Ref is of the format: (HEAD -> master, tag: some-tag-name, tag: some-other-tag,with-a-comma, origin/master, origin/HEAD)
// Refs are comma separated, but some like tags can also contain commas in the name, so we split on the pattern ", " and then
// check each ref for the tag prefix. We used to use the regex /tag: ([^\s,]+)/g)`, but will clip a tag with a comma short.
const tags = commit.refs
.split(', ')
.flatMap(ref => (ref.startsWith('tag: ') ? ref.substring(5) : []))
return new Commit(
commit.sha,

8
app/test/unit/git/tag-test.ts
View file

@ -55,6 +55,14 @@ describe('git/tag', () => {
expect(commit!.tags).toEqual(['my-new-tag'])
})
it('creates a tag with the a comma in it', async () => {
await createTag(repository, 'my-new-tag,has-a-comma', 'HEAD')
const commit = await getCommit(repository, 'HEAD')
expect(commit).not.toBeNull()
expect(commit!.tags).toEqual(['my-new-tag,has-a-comma'])
})
it('creates multiple tags', async () => {
await createTag(repository, 'my-new-tag', 'HEAD')
await createTag(repository, 'another-tag', 'HEAD')