Merge branch 'ninesunsabiu-master'

domharrington · Jul 16, 2024 · bf6e445 · bf6e445
2 parents ac8f0ef + a33b237
commit bf6e445
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -309,10 +309,8 @@ function createCommandArguments<
 type GitlogError = ExecFileException | null;
 
 type CommitBase<Field extends string> = Record<Field, string>;
-type CommitBaseWithFiles<Field extends string> = Record<
-  Field | "status",
-  string
-> & { files: string[] };
+type CommitBaseWithFiles<Field extends string> = CommitBase<Field> &
+  Record<NotOptField, string[]>;
 
 function gitlog<Field extends CommitField = DefaultField>(
   userOptions: GitlogOptions<Field> & { nameStatus: false },

diff --git a/test/gitlog.test.ts b/test/gitlog.test.ts
@@ -260,7 +260,7 @@ describe("gitlog", () => {
       expect(commits[0].subject).toBeDefined();
       expect(commits[0].authorName).toBeDefined();
       expect(commits[0].hash).toBeDefined();
-      expect(commits[0].status).toBeDefined();
+      expect(commits[0].status).toBeInstanceOf(Array);
       expect(commits[0].files).toBeDefined();
     });