Skip to content

Commit

Permalink
Merge pull request #17 from kiprasmel/default-to-nightly-builds
Browse files Browse the repository at this point in the history
we're dogfooding like crazy so i don't wanna merge lfg!!!
  • Loading branch information
kiprasmel committed May 8, 2022
2 parents 12138ea + b542ea6 commit b920303
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 0 deletions.
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,25 @@ dependencies:
- git
- something else i probably forgot

<!-- REMOVED because i'm dogfooding like never before. use nightly instead. -->
<!--
```sh
npm i -g git-stacked-rebase
# optional:
git config --global alias.stacked-rebase git-stacked-rebase
git config --global alias.rr git-stacked-rebase
```
-->

```sh
git clone https://github.com/kiprasmel/git-stacked-rebase
# or: git clone [email protected]:kiprasmel/git-stacked-rebase.git

cd git-stacked-rebase

./nightly-setup-and-update
```

## Usage

Expand Down
1 change: 1 addition & 0 deletions filenames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const filenames = {
//
gitRebaseTodo: "git-rebase-todo",
//
postStackedRebaseHook: "post-stacked-rebase",

/**
* TODO extract others into here
Expand Down
9 changes: 9 additions & 0 deletions git-stacked-rebase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,15 @@ cat "$REWRITTEN_LIST_FILE_PATH" > "$REWRITTEN_LIST_BACKUP_FILE_PATH"
}
}

/**
* execute the post-stacked-rebase hook if exists.
* will only happen if the rebase went thru, and in our control.
*/
const postStackedRebaseHook: string = path.join(dotGitDirPath, "hooks", filenames.postStackedRebaseHook);
if (fs.existsSync(postStackedRebaseHook)) {
execSyncInRepo(postStackedRebaseHook);
}

return;
} catch (e) {
throw e; // TODO FIXME - no try/catch at all?
Expand Down
19 changes: 19 additions & 0 deletions nightly-setup-and-update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh

# meant for CONSUMERS,
# NOT UPDATERS!

git checkout nightly
git pull --rebase

yarn
yarn --cwd nvim-git-rebase-todo
yarn --cwd git-reconcile-rewritten-list

yarn build

## https://stackoverflow.com/a/69259147/9285308
#yarn global add link:.

# https://github.com/yarnpkg/yarn/issues/3256#issuecomment-433096967
yarn global add file:$PWD

0 comments on commit b920303

Please sign in to comment.