mirror of
https://github.com/jayphelps/git-blame-someone-else.git
synced 2025-04-30 10:36:22 +02:00
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
This commit is contained in:
parent
8d854c2d78
commit
9dd864d56f
1 changed files with 3 additions and 1 deletions
|
@ -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.";
|
||||
|
|
Loading…
Add table
Reference in a new issue