spelling: uncommitted
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
This commit is contained in:
parent
348abed1de
commit
5f45e30ff9
2 changed files with 3 additions and 3 deletions
|
@ -33,7 +33,7 @@
|
||||||
master.commit("Last commit on base");
|
master.commit("Last commit on base");
|
||||||
const localMaster = gitgraph.branch("<#1> master (local)");
|
const localMaster = gitgraph.branch("<#1> master (local)");
|
||||||
localMaster.commit({
|
localMaster.commit({
|
||||||
subject: "<uncommited changes>",
|
subject: "<uncommitted changes>",
|
||||||
body: "Changes made to the local base during the workflow",
|
body: "Changes made to the local base during the workflow",
|
||||||
})
|
})
|
||||||
const remotePatch = gitgraph.branch("create-pull-request/patch");
|
const remotePatch = gitgraph.branch("create-pull-request/patch");
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
const localMaster2 = gitgraph.branch("<#2> master (local)");
|
const localMaster2 = gitgraph.branch("<#2> master (local)");
|
||||||
localMaster2.commit({
|
localMaster2.commit({
|
||||||
subject: "<uncommited changes>",
|
subject: "<uncommitted changes>",
|
||||||
body: "Changes made to the updated local base during the workflow",
|
body: "Changes made to the updated local base during the workflow",
|
||||||
})
|
})
|
||||||
remotePatch.merge({
|
remotePatch.merge({
|
||||||
|
|
|
@ -96,7 +96,7 @@ export async function createOrUpdateBranch(
|
||||||
// Save the working base changes to a temporary branch
|
// Save the working base changes to a temporary branch
|
||||||
const tempBranch = uuidv4()
|
const tempBranch = uuidv4()
|
||||||
await git.checkout(tempBranch, 'HEAD')
|
await git.checkout(tempBranch, 'HEAD')
|
||||||
// Commit any uncomitted changes
|
// Commit any uncommitted changes
|
||||||
if (await git.isDirty(true)) {
|
if (await git.isDirty(true)) {
|
||||||
core.info('Uncommitted changes found. Adding a commit.')
|
core.info('Uncommitted changes found. Adding a commit.')
|
||||||
await git.exec(['add', '-A'])
|
await git.exec(['add', '-A'])
|
||||||
|
|
Loading…
Reference in a new issue