Skip to content

Commit def3259

Browse files
committed
Revert "fix: move gitRebaseTodo into .applied when applied"
This reverts commit 75fc9e5.
1 parent a6bc936 commit def3259

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

apply.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,10 @@ export const unmarkThatNeedsToApply = (
114114
pathToStackedRebaseDirInsideDotGit: string,
115115
mark = getPathOfFilenameOfNeedsToApply(pathToStackedRebaseDirInsideDotGit),
116116
rewrittenListFile: string = path.join(pathToStackedRebaseDirInsideDotGit, filenames.rewrittenList),
117-
rewrittenListAppliedFile: string = path.join(pathToStackedRebaseDirInsideDotGit, filenames.rewrittenListApplied),
118-
gitRebaseTodoFile: string = path.join(pathToStackedRebaseDirInsideDotGit, filenames.gitRebaseTodo),
119-
gitRebaseTodoAppliedFile: string = path.join(pathToStackedRebaseDirInsideDotGit, filenames.gitRebaseTodoApplied)
117+
rewrittenListAppliedFile: string = path.join(pathToStackedRebaseDirInsideDotGit, filenames.rewrittenListApplied)
120118
): void => (
121119
fs.existsSync(mark) && fs.unlinkSync(mark),
122120
fs.existsSync(rewrittenListFile) && fs.renameSync(rewrittenListFile, rewrittenListAppliedFile),
123-
fs.existsSync(gitRebaseTodoFile) && fs.renameSync(gitRebaseTodoFile, gitRebaseTodoAppliedFile),
124121
void 0
125122
);
126123

@@ -153,15 +150,9 @@ export async function applyIfNeedsToApply({
153150
filenames.rewrittenListApplied
154151
);
155152

156-
const pathToAppliedGitRebaseTodoFile = path.join(
157-
pathToStackedRebaseDirInsideDotGit,
158-
filenames.gitRebaseTodoApplied
159-
);
160-
161153
const markThatNeedsToApply = (): void => (
162154
fs.writeFileSync(pathToFileIndicatingThatNeedsToApply, ""),
163155
fs.existsSync(pathToAppliedRewrittenListFile) && fs.unlinkSync(pathToAppliedRewrittenListFile),
164-
fs.existsSync(pathToAppliedGitRebaseTodoFile) && fs.unlinkSync(pathToAppliedGitRebaseTodoFile),
165156
void 0
166157
);
167158

filenames.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export const filenames = {
66
rewrittenListApplied: "rewritten-list.applied",
77
//
88
gitRebaseTodo: "git-rebase-todo",
9-
gitRebaseTodoApplied: "git-rebase-todo.applied",
109
//
1110

1211
/**

0 commit comments

Comments
 (0)