Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: disambiguate stash reference #906

Merged
merged 6 commits into from Aug 25, 2020
Merged

fix: disambiguate stash reference #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c11d6a
Disambiguate stash reference
philipbjorge Aug 18, 2020
14e2887
Test verifying functionality with branch named stash
Aug 23, 2020
70150d6
Revert fix to see if this is a real failure
Aug 23, 2020
9318343
Disable the test too
Aug 23, 2020
8c52319
Add back tests
Aug 23, 2020
762902f
Merge remote-tracking branch 'upstream/master' into philipbjorge-patch-1
Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/gitWorkflow.js
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ class GitWorkflow {
ctx.errors.add(GetBackupStashError)
throw new Error('lint-staged automatic backup is missing!')
}
return `stash@{${index}}`
return `refs/stash@{${index}}`
}

/**
Expand Down
21 changes: 21 additions & 0 deletions test/integration.test.js
View file
Open in desktop
Expand Up @@ -1032,6 +1032,27 @@ describe('lint-staged', () => {
expect(await execGit(['rev-list', '--count', 'HEAD'])).toEqual('2')
expect(await readFile('--looks-like-flag.js')).toEqual(testJsFilePretty)
})

it('should work when a branch named stash exists', async () => {
// create a new branch called stash
await execGit(['branch', 'stash'])

// Stage multiple ugly files
await appendFile('test.js', testJsFileUgly)
await execGit(['add', 'test.js'])

await appendFile('test2.js', testJsFileUgly)
await execGit(['add', 'test2.js'])

// Run lint-staged with `prettier --write` and commit pretty file
await gitCommit(fixJsConfig)

// Nothing is wrong, so a new commit is created and file is pretty
expect(await execGit(['rev-list', '--count', 'HEAD'])).toEqual('2')
expect(await execGit(['log', '-1', '--pretty=%B'])).toMatch('test')
expect(await readFile('test.js')).toEqual(testJsFilePretty)
expect(await readFile('test2.js')).toEqual(testJsFilePretty)
})
})

describe('lintStaged', () => {
Expand Down