Merge pull request #21 from xnivaxhzne/bugfix-gsf

xnivaxhzne · web-flow · commit 37020f560466 · 2024-06-26T19:11:34.000+05:30
Chain the commands of gsf
diff --git a/lib/git_see_feature_files/index.js b/lib/git_see_feature_files/index.js
@@ -22,9 +22,7 @@ const main = async () => {
   }
 
   if (featureBranch) {
-    runCommand("gcm");
-    runCommand("gpm");
-    runCommand(`git merge --no-commit --no-ff origin/${featureBranch}`);
+    runCommand(`gcpm && git merge --no-commit --no-ff origin/${featureBranch}`);
   } else {
     process.exit(0);
   }

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,7 @@ const main = async () => {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`if (featureBranch) {`
`25`		`- runCommand("gcm");`
`26`		`- runCommand("gpm");`
`27`		- runCommand(`git merge --no-commit --no-ff origin/${featureBranch}`);
	`25`	+ runCommand(`gcpm && git merge --no-commit --no-ff origin/${featureBranch}`);
`28`	`26`	`} else {`
`29`	`27`	`process.exit(0);`
`30`	`28`	`}`