amend most recent dotfiles commit when unsigned

2 files changed, 13 insertions, 17 deletions

diff --git a/bin/git-dotfiles-dummy-master-commit b/bin/git-dotfiles-dummy-master-commit
deleted file mode 100755
index cde8ef72..00000000
--- a/bin/git-dotfiles-dummy-master-commit
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. $HOME/.shenv
-
-cd $HOME/src/dotfiles
-if ! git is-clean; then
-    echo >&2 "$0: cannot make dummy commit; dotfiles working tree not clean"
-    exit 1
-fi
-branch=$(git rev-parse --abbrev-ref HEAD)
-[ "$branch" = "master" ] || git checkout master
-git commit --allow-empty -S -m"empty PGP-signed commit"
-[ "$branch" = "master" ] || git checkout "$branch"
diff --git a/bin/git-dotfiles-rebase b/bin/git-dotfiles-rebase
index ed2e984e..f1daee3c 100755
--- a/bin/git-dotfiles-rebase
+++ b/bin/git-dotfiles-rebase
@@ -4,18 +4,29 @@
 
 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
+    [ "$branch" = "master" ] || git checkout "$branch"
+}
+
 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
-        git dotfiles-dummy-master-commit
+        sign
         git push origin master +$hostname
     fi
 else
     if ! git push origin master; then
-        git dotfiles-dummy-master-commit
+        sign
         git push origin master
     fi
 fi