Skip to content

dev: BI-0 squash commits task #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 1, 2025
Merged

dev: BI-0 squash commits task #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eff6d11
dev: BI-0 squash commits
catsona Sep 25, 2025
b5cf819
Update taskfile_dev.yml
catsona Sep 26, 2025
95fe9dc
Update taskfile_dev.yml
catsona Sep 26, 2025
7be517a
default for PARENT_BRANCH
catsona Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Taskfile.dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ includes:
{{.ROOT_DIR}}/metapkg
{{.ROOT_DIR}}/terrarium/dl_repmanager/dl_repmanager_tests/testrepo/lib/testing_pkg_boilerplate
{{.ROOT_DIR}}/terrarium/bi_ci/bi_ci_tests/unit/resources
PARENT_BRANCH: '{{.PARENT_BRANCH | default "main"}}'

ops:
taskfile: tools/taskfiles/taskfile_ops.yml
Expand Down
15 changes: 15 additions & 0 deletions tools/taskfiles/taskfile_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,3 +403,18 @@ tasks:
- echo "Next processes will be killed:"
- ps -ef | grep "ssh -f -N -L" | grep --invert-match "grep"
- pkill -f "ssh -f -N -L"

squash:
desc: Squash all commits made on CHILD_BRANCH relative to PARENT_BRANCH into single one (using git reset --soft)
vars:
REMOTE: '{{.REMOTE | default "origin"}}'
requires:
vars:
- PARENT_BRANCH
- CHILD_BRANCH
cmds:
- git fetch {{.REMOTE}} -f {{.PARENT_BRANCH}}:{{.PARENT_BRANCH}}
- git switch {{.CHILD_BRANCH}}
- git fetch {{.REMOTE}} {{.CHILD_BRANCH}}
- git reset --soft $(git merge-base {{.PARENT_BRANCH}} HEAD)
- echo 'Now you can commit merged changes with "git commit -m "commit message"'