Merge pull request #981 from steveukx/fix/977

Integration test covering error reported in #977

Author: steveukx

.prettierignore

@@ -1,5 +1,6 @@
 *.md
 .changeset
+.yarn
 dist
 coverage
 node_modules

package.json

@@ -14,6 +14,7 @@
     "build": "lerna run build",
     "clean": "git clean -fxd -e .idea -e node_modules -e .yarn",
     "clean:cache": "git clean -fxd .yarn node_modules packages simple-git",
+    "format": "prettier --write .",
     "test": "lerna run test"
   },
   "dependencies": {

simple-git/test/integration/log-numstat.spec.ts

@@ -0,0 +1,31 @@
+import { promiseError } from '@kwsites/promise-result';
+import { newSimpleGit } from '@simple-git/test-utils';
+
+describe('log-numstat', function () {
+   it('custom format and date range should not fail when also setting numstat', async () => {
+      const ac = new AbortController();
+      const log = newSimpleGit(__dirname, {
+         abort: ac.signal,
+      }).log({
+         'format': {
+            H: '%H',
+            h: '%h',
+            P: '%P',
+            p: '%p',
+            aI: '%aI',
+            s: '%s',
+            D: '%D',
+            b: '%b',
+            an: '%an',
+            ae: '%ae',
+         },
+         '--all': null,
+         '--since': '2024-02-04',
+         '--numstat': null,
+      });
+
+      setTimeout(() => ac.abort(), 500);
+
+      expect(await promiseError(log)).toBeUndefined();
+   });
+});