git-diff-apply - npm Package Compare versions

Comparing version 0.20.3 to 0.20.4

package.json

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

src/commit.js

 'use strict';
 
 const run = require('./run');
+const utils = require('./utils');
 
@@ -11,3 +12,3 @@ module.exports = async function commit(options) {
   // or the second commit has no changes
-  await run('git commit --allow-empty -m "message" --no-verify', options);
+  await utils.run('git commit --allow-empty -m "message" --no-verify', options);
 };

src/index.js

@@ -23,2 +23,3 @@ 'use strict';
 const mergeDir = require('./merge-dir');
+const doesBranchExist = require('./does-branch-exist');
 
@@ -179,5 +180,5 @@ const { isGitClean } = gitStatus;
 
+    isTempBranchCommitted = true;
     await commit();
     isCodeUntracked = false;
-    isTempBranchCommitted = true;
 
@@ -289,3 +290,3 @@ isCodeUntracked = true;
   try {
-    if (isTempBranchCommitted) {
+    if (isTempBranchCommitted && await doesBranchExist(tempBranchName)) {
       await utils.run(`git branch -D ${tempBranchName}`);
@@ -292,0 +293,0 @@ }

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

21140

increased by2.28%

Number of package files

23

increased by4.55%

Lines of code

597

increased by2.4%

No dependency changes