exec-staged 0.2.1 → 0.2.3

package/README.md

@@ -24,6 +24,10 @@ Install from npm, using your preferred package manager:
 npm install --save-dev exec-staged
 ```
 
+## Requirements
+
+- Git >= 2.22.0
+
 ## Usage
 
 ### Run from the CLI

package/dist/lib/stage.js

@@ -66,19 +66,19 @@ export class Stage {
             this.logger.log('⚠️ Git installation not found!');
             throw new Error('git installation not found');
         }
-        if (!version || semver.lte(version, '2.13.0')) {
+        if (!version || semver.lt(version, '2.22.0')) {
             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');
         }
@@ -135,7 +135,8 @@ export class Stage {
             this.git([
                 'diff',
                 '--binary',
-                '--default-prefix',
+                '--src-prefix=a/',
+                '--dst-prefix=b/',
                 // skip deleted files because patch doesn't apply if they're modified
                 '--diff-filter=d',
                 '--no-color',
@@ -236,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.1",
+  "version": "0.2.3",
   "description": "Run commands against the current git index",
   "keywords": [
     "git",

package/src/lib/stage.ts

@@ -85,21 +85,21 @@ export class Stage {
       throw new Error('git installation not found');
     }
 
-    if (!version || semver.lte(version, '2.13.0')) {
+    if (!version || semver.lt(version, '2.22.0')) {
       this.logger.log('⚠️ Unsupported git version!');
       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');
     }
@@ -185,7 +185,8 @@ export class Stage {
       this.git([
         'diff',
         '--binary',
-        '--default-prefix',
+        '--src-prefix=a/',
+        '--dst-prefix=b/',
         // skip deleted files because patch doesn't apply if they're modified
         '--diff-filter=d',
         '--no-color',
@@ -310,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