git-diff-apply - npm Package Compare versions

Comparing version 0.22.3 to 0.22.4

package.json

 {
   "name": "git-diff-apply",
-  "version": "0.22.3",
+  "version": "0.22.4",
   "description": "Use an unrelated remote repository to apply a git diff",
@@ -5,0 +5,0 @@ "main": "src",

src/index.js

@@ -28,2 +28,4 @@ 'use strict';
 
+const fallbackTagName = 'tag-not-supplied';
+
 async function ensureDir(dir) {
@@ -60,2 +62,13 @@ debug('ensureDir', dir);
 
+  if (!createCustomDiff && !(startTag && endTag)) {
+    throw 'You must supply a start tag and an end tag';
+  }
+
+  if (createCustomDiff && !startTag && !endTag) {
+    throw 'You must supply a start tag or an end tag';
+  }
+
+  let safeStartTag = startTag || fallbackTagName;
+  let safeEndTag = endTag || fallbackTagName;
+
   async function buildReturnObject() {
@@ -67,3 +80,3 @@ let from;
     } else {
-      await checkOutTag(startTag, { cwd: _tmpDir });
+      await checkOutTag(safeStartTag, { cwd: _tmpDir });
 
@@ -73,3 +86,3 @@ from = convertToObj(_tmpDir, ignoredFiles);
 
-    await checkOutTag(endTag, { cwd: _tmpDir });
+    await checkOutTag(safeEndTag, { cwd: _tmpDir });
 
@@ -102,3 +115,3 @@ let to = convertToObj(_tmpDir, ignoredFiles);
     if (!(reset || init)) {
-      await copyToSubDir(startTag);
+      await copyToSubDir(safeStartTag);
 
@@ -108,3 +121,3 @@ await gitRemoveAll({ cwd: newTmpDir });
 
-    await copyToSubDir(endTag);
+    await copyToSubDir(safeEndTag);
 
@@ -134,3 +147,3 @@ _tmpDir = newTmpDir;
     let patchFile = path.join(await tmpDir(), 'file.patch');
-    await utils.run(`git diff ${startTag} ${endTag} --binary > ${patchFile}`, { cwd: _tmpDir });
+    await utils.run(`git diff ${safeStartTag} ${safeEndTag} --binary > ${patchFile}`, { cwd: _tmpDir });
     if (await fs.readFile(patchFile, 'utf8') !== '') {
@@ -149,3 +162,3 @@ return patchFile;
     if (reset || init) {
-      await checkOutTag(endTag, { cwd: _tmpDir });
+      await checkOutTag(safeEndTag, { cwd: _tmpDir });
 
@@ -167,3 +180,3 @@ isCodeUntracked = true;
 
-    await checkOutTag(startTag, { cwd: _tmpDir });
+    await checkOutTag(safeStartTag, { cwd: _tmpDir });
 
@@ -185,4 +198,6 @@ await utils.run(`git branch ${tempBranchName}`, { cwd: _tmpDir });
     if (wereAnyChanged) {
-      await commit(`${startTag}...${endTag}`, { cwd: _tmpDir });
+      let message = [startTag, endTag].filter(Boolean).join('...');
 
+      await commit(message, { cwd: _tmpDir });
+
       let sha = await utils.run('git rev-parse HEAD', { cwd: _tmpDir });
@@ -224,4 +239,4 @@
         endCommand,
-        startTag,
-        endTag,
+        startTag: safeStartTag,
+        endTag: safeEndTag,
         reset,
@@ -228,0 +243,0 @@ init

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

18916

increased by2.57%

Lines of code

506

increased by2.02%

No dependency changes