diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-29 10:19:34 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-30 14:20:59 -0700 |
| commit | a991c88e7ae39d7c94c8733e4bc0d36099b0a626 (patch) | |
| tree | 0cc1346c6a09a00caed9ef372a3ca30ef7ff6158 /bin/git-dotfiles-rebase | |
| parent | af8a88b946689ffa9e330a06e222e73fdb27e888 (diff) | |
| download | dotfiles-a991c88e7ae39d7c94c8733e4bc0d36099b0a626.tar.gz | |
replace git-dotfiles-rebase with 'mr pull' and 'mr push' actions
Diffstat (limited to 'bin/git-dotfiles-rebase')
| -rwxr-xr-x | bin/git-dotfiles-rebase | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/bin/git-dotfiles-rebase b/bin/git-dotfiles-rebase deleted file mode 100755 index 5f96244a..00000000 --- a/bin/git-dotfiles-rebase +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -sign () { - if ! git is-clean; then - echo >&2 "$0: cannot -S --amend commit: dotfiles working tree not clean" - exit 1 - fi - branch=$(git rev-parse --abbrev-ref HEAD) - [ "$branch" = "master" ] || git checkout master - git commit -S --amend --no-edit - if [ "$branch" != "master" ]; then - git checkout "$branch" - git rebase master - fi -} - -cd $HOME/src/dotfiles -hostname="$(hostname)" # use '-s' ? -if git rev-parse refs/heads/$hostname >/dev/null 2>&1; then - git checkout $hostname - git rebase master - if ! git push origin master +$hostname; then - sign - git push origin master +$hostname - fi -else - if ! git push origin master; then - sign - git push origin master - fi -fi |