From 9dd864d56f1936fe2498b9fd653ba68f09af725a Mon Sep 17 00:00:00 2001 From: Starwort Date: Mon, 4 Dec 2023 14:40:51 +0000 Subject: [PATCH] Support auto-stashing and empty commits Surround the command with `git stash push` and `git stash pop` in order to ensure that the commands succeed - uncommitted files otherwise cause an error Append `--allow-empty` to the history rewriting command in order to prevent failure to re-author an empty commit --- git-blame-someone-else | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-blame-someone-else b/git-blame-someone-else index e34d7d0..e6a770b 100644 --- a/git-blame-someone-else +++ b/git-blame-someone-else @@ -11,9 +11,11 @@ AUTHOR_EMAIL=$(echo $AUTHOR | perl -wlne '/^.*\s*<(.*)>$/ and print $1') COMMIT=$(git rev-parse --short $2) { + git stash push -a -m "__git-blame-someone-else" GIT_SEQUENCE_EDITOR="sed -i -e 's/^pick $COMMIT/edit $COMMIT/'" git rebase -i $COMMIT~1^^ - GIT_COMMITTER_NAME="$AUTHOR_NAME" GIT_COMMITTER_EMAIL="$AUTHOR_EMAIL" git commit --amend --no-edit --author="$AUTHOR" + GIT_COMMITTER_NAME="$AUTHOR_NAME" GIT_COMMITTER_EMAIL="$AUTHOR_EMAIL" git commit --amend --no-edit --author="$AUTHOR" --allow-empty git rebase --continue + git stash list | grep "__git-blame-someone-else" && git stash pop } &> /dev/null echo "$AUTHOR_NAME is now the author of $COMMIT. You're officially an asshole.";