Fix "fatal: no such section: bak.user"

.github/workflows/release.yml

@@ -10,7 +10,6 @@ jobs:
   release:
     uses: autumn-library/workflows/.github/workflows/release.yml@main
     with:
-      oscript_version: '1.8.3'
       package_mask: "gitrunner-*.ospx"
     secrets:
       PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        oscript_version: ['1.8.3', 'stable']
+        oscript_version: ['default', 'stable']
     uses: autumn-library/workflows/.github/workflows/test.yml@main
     with:
       oscript_version: ${{ matrix.oscript_version }}

.vscode/tasks.json

@@ -1,27 +1,39 @@
 {
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "oscript",
-    "isShellCommand": true,
-    "showOutput": "silent",
+    "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+    },
     "args": [
         "-encoding=utf-8"
     ],
     "tasks": [
         {
-            "taskName": "Exec all features",
+            "type": "shell",
+            "label": "Exec all features",
+            "command":[
+                "1bdd"
+            ],
             "args": [
-                "|",
-                "1bdd",
                 "${workspaceRoot}/features",
                 "-fail-fast",
                 "-out",
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": true,
-            "isTestCommand": false,
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "test",
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -33,19 +45,26 @@
             }
         },
         {
-            "taskName": "Exec feature",
+            "type": "shell",
+            "label": "Exec feature",
+            "command":[
+                "1bdd"
+            ],
             "args": [
-                "|",
-                "1bdd",
                 "${file}",
                 "-fail-fast",
                 "-out",
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isTestCommand": true,
+            "presentation": {
+            "echo": true,
+            "reveal": "always",
+            "focus": false,
+            "panel": "shared",
+            "showReuseMessage": true,
+            "clear": false
+           },
+           "group": "test",
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": [
@@ -59,21 +78,29 @@
             }
         },
         {
-            "taskName": "Exec feature + debug",
+            "type": "shell",
+            "label": "Exec feature + debug",
+            "command":[
+                "1bdd"
+
+            ],
             "args": [
-                "|",
-                "1bdd",
                 "${file}",
                 "-fail-fast",
                 "-verbose",
                 "on",
                 "-out",
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isTestCommand": false,
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "test",
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -85,21 +112,28 @@
             }
         },
         {
-            "taskName": "Generate feature steps",
+            "type": "shell",
+            "label": "Generate feature steps",
+            "command":[
+                "1bdd"
+            ],
             "args": [
-                "|",
-                "1bdd",
                 "gen",
                 "${file}",
                 // "-verbose", 
                 // "on", 
                 "-out",
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isTestCommand": false,
+            "presentation": {
+            "echo": true,
+            "reveal": "always",
+            "focus": false,
+            "panel": "shared",
+            "showReuseMessage": true,
+            "clear": false
+           },
+            "group": "build",
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -111,21 +145,28 @@
             }
         },
         {
-            "taskName": "Generate feature steps + debug",
+            "type": "shell",
+            "label": "Generate feature steps + debug",
+            "command":[
+                "1bdd"
+            ],
             "args": [
-                "|",
-                "1bdd",
                 "gen",
                 "${file}",
                 "-verbose",
                 "on",
                 "-out",
                 "${workspaceRoot}/gen.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isTestCommand": false,
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "build",
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -137,48 +178,84 @@
             }
         },
         {
-            "taskName": "OneScript: compile",
+            "type": "shell",
+            "label": "OneScript: compile",
+            "command":[
+                "oscript"
+            ],
             "args": [
                 "-compile",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "test",
         },
         {
-            "taskName": "OneScript: check",
+            "type": "shell",
+            "label": "OneScript: check",
+            "command":[
+                "oscript"
+            ],
             "args": [
                 "-check",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "test",
         },
         {
-            "taskName": "OneScript: make",
+            "type": "shell",
+            "label": "OneScript: make",
+            "command":[
+                "oscript"
+            ],
             "args": [
                 "-make",
                 "${file}",
                 "${fileBasename}.exe"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "test",
         },
         {
-            "taskName": "OneScript: run",
+            "type": "shell",
+            "label": "OneScript: run",
+            "command":[
+                "oscript"
+            ],
             "args": [
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": true,
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "group": "build",
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {

features/step_definitions/РаботаСВнешнимиРепозиториями.os

@@ -1,4 +1,7 @@
-// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
+// BSLLS:MissingReturnedValueDescription-off
+// BSLLS:MissingParameterDescription-off
+
+// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
 
 #Использовать asserts
 

features/step_definitions/РаботаСПодмодулями.os

@@ -1,4 +1,6 @@
-// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
+// BSLLS:MissingParameterDescription-off
+
+// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
 
 #Использовать asserts
 

features/РаботаСПодмодулями.feature

@@ -12,7 +12,7 @@
     И Я инициализирую репозиторий во временном каталоге
 
 Сценарий: Добавление подмодуля
-    Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop"
+    Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "gitrunner-submodule-test"
     И Я обновляю подмодули
     И Я получаю состояние подмодулей
-    Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "heads/develop"
+    Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "v1.7.0-20-g674ffa7"

packagedef

@@ -1,13 +1,12 @@
 Описание.Имя("gitrunner")
-		.Версия("1.7.1")
-		.ЗависитОт("1bdd")
-		.ВерсияСреды("1.7.0")
-		.ЗависитОт("1commands", "1.3.1")
+		.Версия("1.8.0")
+		.ВерсияСреды("1.9.2")
+		.ЗависитОт("1commands", "1.5.0")
 		.ЗависитОт("asserts", "0.4.0")
 		.ЗависитОт("fs", "0.4.1")
 		.ЗависитОт("json", "1.0.1")
-		.ЗависитОт("logos", "1.0.0")
-		.РазработкаЗависитОт("1bdd", "1.13.0")
+		.ЗависитОт("logos", "1.7.1")
+		.РазработкаЗависитОт("1bdd", "1.15.1")
 		.Задачи("tasks")
 		.ВключитьФайл("src")
 		.ВключитьФайл("features")

src/ГитРепозиторий.os

@@ -158,7 +158,10 @@
 	Если НадоОчиститьУстановленныеПеременные Тогда 
 		ОчиститьУстановленныеПеременныеГит();
 	КонецЕсли;
-	ВосстановитьКоммитера();
+
+    Если Не ПустаяСтрока(Коммитер) Тогда
+	    ВосстановитьКоммитера();
+    КонецЕсли;
 
 	Если НадоУдалитьВременныйФайлКомментария Тогда
 		Попытка