sticky-note-cli 2.7.1 → 2.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/cli.js +3 -3
- package/package.json +1 -1
package/bin/cli.js
CHANGED
|
@@ -689,14 +689,14 @@ async function cmdInit() {
|
|
|
689
689
|
|
|
690
690
|
// Install merge driver script and git config
|
|
691
691
|
const mergeDriverSrc = path.join(TEMPLATES_DIR, "merge-driver.js");
|
|
692
|
-
const mergeDriverDest = path.join(
|
|
692
|
+
const mergeDriverDest = path.join(stickyNoteDir, "merge-driver.js");
|
|
693
693
|
copyFile(mergeDriverSrc, mergeDriverDest);
|
|
694
694
|
print(" [OK] .sticky-note/merge-driver.js installed");
|
|
695
695
|
try {
|
|
696
696
|
execFileSync("git", ["config", "merge.sticky-note.name", "Sticky Note thread merge"], {
|
|
697
697
|
cwd: process.cwd(), stdio: ["pipe", "pipe", "pipe"],
|
|
698
698
|
});
|
|
699
|
-
execFileSync("git", ["config", "merge.sticky-note.driver", "node
|
|
699
|
+
execFileSync("git", ["config", "merge.sticky-note.driver", "node \"$(git rev-parse --show-toplevel)/.sticky-note/merge-driver.js\" %O %A %B"], {
|
|
700
700
|
cwd: process.cwd(), stdio: ["pipe", "pipe", "pipe"],
|
|
701
701
|
});
|
|
702
702
|
print(" [OK] git merge driver configured (merge.sticky-note)");
|
|
@@ -955,7 +955,7 @@ function cmdUpdate() {
|
|
|
955
955
|
execFileSync("git", ["config", "merge.sticky-note.name", "Sticky Note thread merge"], {
|
|
956
956
|
cwd: process.cwd(), stdio: ["pipe", "pipe", "pipe"],
|
|
957
957
|
});
|
|
958
|
-
execFileSync("git", ["config", "merge.sticky-note.driver", "node
|
|
958
|
+
execFileSync("git", ["config", "merge.sticky-note.driver", "node \"$(git rev-parse --show-toplevel)/.sticky-note/merge-driver.js\" %O %A %B"], {
|
|
959
959
|
cwd: process.cwd(), stdio: ["pipe", "pipe", "pipe"],
|
|
960
960
|
});
|
|
961
961
|
print(" [OK] git merge driver configured (merge.sticky-note)");
|