Skip to content

Commit bb7fb97

Browse files
committed
Merge pull request #17 from kiprasmel/default-to-nightly-builds
we're dogfooding like crazy so i don't wanna merge lfg!!!
2 parents 12138ea + aeb148b commit bb7fb97

File tree

4 files changed

+43
-0
lines changed

4 files changed

+43
-0
lines changed

README.md

+14
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,27 @@ dependencies:
4141
- git
4242
- something else i probably forgot
4343

44+
<!-- REMOVED because i'm dogfooding like never before. use nightly instead. -->
45+
<!--
4446
```sh
4547
npm i -g git-stacked-rebase
4648
4749
# optional:
4850
git config --global alias.stacked-rebase git-stacked-rebase
4951
git config --global alias.rr git-stacked-rebase
5052
```
53+
-->
54+
55+
```sh
56+
git clone https://github.com/kiprasmel/git-stacked-rebase
57+
# or: git clone [email protected]:kiprasmel/git-stacked-rebase.git
58+
59+
cd git-stacked-rebase
60+
61+
./nightly-setup-and-update
62+
```
63+
64+
[![nightly](https://img.shields.io/github/workflow/status/kiprasmel/git-stacked-rebase/tests/nightly?label=nightly)](https://github.com/kiprasmel/git-stacked-rebase/actions/workflows/test.yml)
5165

5266
## Usage
5367

filenames.ts

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const filenames = {
77
//
88
gitRebaseTodo: "git-rebase-todo",
99
//
10+
postStackedRebaseHook: "post-stacked-rebase",
1011

1112
/**
1213
* TODO extract others into here

git-stacked-rebase.ts

+9
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,15 @@ cat "$REWRITTEN_LIST_FILE_PATH" > "$REWRITTEN_LIST_BACKUP_FILE_PATH"
643643
}
644644
}
645645

646+
/**
647+
* execute the post-stacked-rebase hook if exists.
648+
* will only happen if the rebase went thru, and in our control.
649+
*/
650+
const postStackedRebaseHook: string = path.join(dotGitDirPath, "hooks", filenames.postStackedRebaseHook);
651+
if (fs.existsSync(postStackedRebaseHook)) {
652+
execSyncInRepo(postStackedRebaseHook);
653+
}
654+
646655
return;
647656
} catch (e) {
648657
throw e; // TODO FIXME - no try/catch at all?

nightly-setup-and-update.sh

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
3+
# meant for CONSUMERS,
4+
# NOT UPDATERS!
5+
6+
git checkout nightly
7+
git pull --rebase
8+
9+
yarn
10+
yarn --cwd nvim-git-rebase-todo
11+
yarn --cwd git-reconcile-rewritten-list
12+
13+
yarn build
14+
15+
## https://stackoverflow.com/a/69259147/9285308
16+
#yarn global add link:.
17+
18+
# https://github.com/yarnpkg/yarn/issues/3256#issuecomment-433096967
19+
yarn global add file:$PWD

0 commit comments

Comments
 (0)