exec-staged 0.2.2 → 0.2.3

package/dist/lib/stage.js

@@ -70,15 +70,15 @@ export class Stage {
             this.logger.log('⚠️ Unsupported git version!');
             throw new Error('unsupported git version');
         }
-        let gitRootDirectory;
+        let prefix;
         try {
-            gitRootDirectory = this.git(['rev-parse', '--show-toplevel']).trim();
+            prefix = this.git(['rev-parse', '--show-prefix']).trim();
         }
         catch (error) {
             this.logger.log('⚠️ Not a git repository!');
             throw new Error('cwd is not a git repository');
         }
-        if (gitRootDirectory !== this.cwd) {
+        if (prefix !== '') {
             this.logger.log('⚠️ Not in git root directory!');
             throw new Error('cwd is not a git repository root directory');
         }
@@ -237,16 +237,19 @@ export class Stage {
                 '-m',
                 STAGED_CHANGES_COMMIT_MESSAGE,
             ]);
-            // apply patch containing unstaged changes
-            this.git([
-                'apply',
-                '--allow-empty',
-                '--recount',
-                '--unidiff-zero',
-                '--whitespace=nowarn',
-                '--3way',
-                this.patchPath,
-            ]);
+            // apply patch containing unstaged changes.
+            // `--allow-empty` could be used here, but it was not added to `git apply`
+            // until 2.35.0 (January 2022), so we skip the call when the patch is empty.
+            if (fs.statSync(this.patchPath).size > 0) {
+                this.git([
+                    'apply',
+                    '--recount',
+                    '--unidiff-zero',
+                    '--whitespace=nowarn',
+                    '--3way',
+                    this.patchPath,
+                ]);
+            }
             // unstaged deletions are not included in the patch and must be handled
             // separately because the patch cannot be applied if such files are
             // modified by tasks; use force: true to handle cases where the file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exec-staged",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Run commands against the current git index",
   "keywords": [
     "git",

package/src/lib/stage.ts

@@ -90,16 +90,16 @@ export class Stage {
       throw new Error('unsupported git version');
     }
 
-    let gitRootDirectory: string;
+    let prefix: string;
 
     try {
-      gitRootDirectory = this.git(['rev-parse', '--show-toplevel']).trim();
+      prefix = this.git(['rev-parse', '--show-prefix']).trim();
     } catch (error) {
       this.logger.log('⚠️ Not a git repository!');
       throw new Error('cwd is not a git repository');
     }
 
-    if (gitRootDirectory !== this.cwd) {
+    if (prefix !== '') {
       this.logger.log('⚠️ Not in git root directory!');
       throw new Error('cwd is not a git repository root directory');
     }
@@ -311,16 +311,19 @@ export class Stage {
         STAGED_CHANGES_COMMIT_MESSAGE,
       ]);
 
-      // apply patch containing unstaged changes
-      this.git([
-        'apply',
-        '--allow-empty',
-        '--recount',
-        '--unidiff-zero',
-        '--whitespace=nowarn',
-        '--3way',
-        this.patchPath,
-      ]);
+      // apply patch containing unstaged changes.
+      // `--allow-empty` could be used here, but it was not added to `git apply`
+      // until 2.35.0 (January 2022), so we skip the call when the patch is empty.
+      if (fs.statSync(this.patchPath).size > 0) {
+        this.git([
+          'apply',
+          '--recount',
+          '--unidiff-zero',
+          '--whitespace=nowarn',
+          '--3way',
+          this.patchPath,
+        ]);
+      }
 
       // unstaged deletions are not included in the patch and must be handled
       // separately because the patch cannot be applied if such files are