mirror of
https://forgejo.stefka.eu/jiriks74/create-pull-request.git
synced 2025-01-18 16:01:06 +01:00
[CI] test committed
This commit is contained in:
parent
f5ba48ac1e
commit
1cd5c1ad74
2 changed files with 5 additions and 5 deletions
9
dist/index.js
vendored
9
dist/index.js
vendored
|
@ -171,9 +171,7 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
|
||||||
if (branchRemoteName == 'fork') {
|
if (branchRemoteName == 'fork') {
|
||||||
// If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push
|
// If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push
|
||||||
// ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed)
|
// ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed)
|
||||||
yield git.fetch([`${workingBase}:${workingBase}`], baseRemote, [
|
yield git.fetch([`${workingBase}:${workingBase}`], baseRemote, ['--force'], true);
|
||||||
'--force'
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// If the remote is 'origin' we can git reset
|
// If the remote is 'origin' we can git reset
|
||||||
|
@ -793,14 +791,15 @@ class GitCommandManager {
|
||||||
return output.exitCode === 0;
|
return output.exitCode === 0;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
fetch(refSpec, remoteName, options) {
|
fetch(refSpec, remoteName, options, unshallow = false) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const args = ['-c', 'protocol.version=2', 'fetch'];
|
const args = ['-c', 'protocol.version=2', 'fetch'];
|
||||||
if (!refSpec.some(x => x === tagsRefSpec)) {
|
if (!refSpec.some(x => x === tagsRefSpec)) {
|
||||||
args.push('--no-tags');
|
args.push('--no-tags');
|
||||||
}
|
}
|
||||||
args.push('--progress', '--no-recurse-submodules');
|
args.push('--progress', '--no-recurse-submodules');
|
||||||
if (utils.fileExistsSync(path.join(this.workingDirectory, '.git', 'shallow'))) {
|
if (unshallow &&
|
||||||
|
utils.fileExistsSync(path.join(this.workingDirectory, '.git', 'shallow'))) {
|
||||||
args.push('--unshallow');
|
args.push('--unshallow');
|
||||||
}
|
}
|
||||||
if (options) {
|
if (options) {
|
||||||
|
|
1
report.txt
Normal file
1
report.txt
Normal file
|
@ -0,0 +1 @@
|
||||||
|
1701354370
|
Loading…
Add table
Add a link
Reference in a new issue