TEMP

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>

Author: kiprasmel

git-stacked-rebase.ts

@@ -493,7 +493,7 @@ REWRITTEN_LIST_BACKUP_FILE_PATH="$STACKED_REBASE_DIR/${filenames.rewrittenList}"
 
 #echo "REBASE_MERGE_DIR $REBASE_MERGE_DIR; STACKED_REBASE_DIR $STACKED_REBASE_DIR;"
 
-cat "$REWRITTEN_LIST_FILE_PATH" > "$REWRITTEN_LIST_BACKUP_FILE_PATH"
+cp "$REWRITTEN_LIST_FILE_PATH" "$REWRITTEN_LIST_BACKUP_FILE_PATH"
 
 		`;
 
@@ -1393,7 +1393,9 @@ if (!module.parent) {
 				process.stderr.write(e.message);
 				process.exit(1);
 			} else {
-				throw e;
+				console.error(e);
+				process.exit(1);
+				// throw e;
 			}
 		});
 }

parse-todo-of-stacked-rebase/parseNewGoodCommands.ts

@@ -20,7 +20,7 @@ export function parseNewGoodCommands(
 
 	logGoodCmds(goodCommands);
 
-	const pathOfRewrittenList: string = path.join(repo.workdir(), ".git", "stacked-rebase", filenames.rewrittenList);
+	const pathOfRewrittenList: string = path.join(repo.path(), "stacked-rebase", filenames.rewrittenList);
 	const rewrittenList: string = fs.readFileSync(pathOfRewrittenList, { encoding: "utf-8" });
 	const rewrittenListLines: string[] = rewrittenList.split("\n").filter((line) => !!line);
 

test/experiment.spec.ts

@@ -119,6 +119,9 @@ export async function testCase() {
 
 	execSyncInRepo(`${defaultGitCmd} rebase --continue`);
 
+	execSyncInRepo(`${defaultGitCmd} status`);
+	execSyncInRepo("read");
+
 	/**
 	 * now some partial branches will be "gone" from the POV of the latestBranch<->initialBranch.
 	 *