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(git): force add onboarding config #12103

Merged
merged 2 commits into from Oct 10, 2021
Merged

fix(git): force add onboarding config #12103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
629c60a
fix(git): force add onboarding config
rarkins Oct 10, 2021
3156a10
Merge branch 'main' into fix/git-ignore-onboarding
rarkins Oct 10, 2021
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
6 changes: 5 additions & 1 deletion lib/util/git/index.ts
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import Git, {
TaskOptions,
} from 'simple-git';
import { join } from 'upath';
import { configFileNames } from '../../config/app-strings';
import { getGlobalConfig } from '../../config/global';
import type { RenovateConfig } from '../../config/types';
import {
Expand Down Expand Up @@ -721,7 +722,10 @@ export async function commitFiles({
});
}
try {
await git.add(fileName);
// istanbul ignore next
const addParams =
fileName === configFileNames[0] ? ['-f', fileName] : fileName;
await git.add(addParams);
if (file.executable) {
await git.raw(['update-index', '--chmod=+x', fileName]);
}
Expand Down