git: Show patch of the changes in commit message
The changes are only shown in the editor and do not land in the final commit message. For that setting the git-commit-last-msg function and the commit-msg hook had to be updated. The function is now a standalone function instead of anonymous and uses every line until the first comment in COMMIT_EDITMSG discarding the new information too. The hook breaks now when checking line lengths when the changes start since for some weird reason they are passed together with the rest of the message instead of being deleted like the comments.
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
signingkey = 2BA20014C779A9611ED81E2163DF2C14933E928C
|
||||
[commit]
|
||||
gpgsign = true
|
||||
verbose = true
|
||||
[difftool "meld"]
|
||||
path = /usr/bin/meld
|
||||
[color "status"]
|
||||
|
||||
@@ -28,13 +28,6 @@
|
||||
alias gpush='git push'
|
||||
alias gpull='git pull'
|
||||
alias gd='git diff'
|
||||
# Commit, but put the last written commit message into the editor buffer.
|
||||
# Useful for example when the commit-msg hook fails but only slight
|
||||
# modifications are needed.
|
||||
alias git-commit-last-msg='() {
|
||||
local gitdir="$(git rev-parse --git-dir)" || return
|
||||
git commit -eF <(grep -v "^#" "$gitdir/COMMIT_EDITMSG")
|
||||
}'
|
||||
|
||||
# Save keystrokes and my memory
|
||||
alias la='ls -A'
|
||||
|
||||
@@ -323,3 +323,14 @@ cd() {
|
||||
builtin cd "$toplevel"
|
||||
fi
|
||||
}
|
||||
|
||||
# Commit, but put the last written commit message into the editor buffer.
|
||||
# For this it uses .git/COMMIT_EDITMSG but deletes all lines after and including
|
||||
# the first comment of the file.
|
||||
# Useful for example when the commit-msg hook fails but only slight
|
||||
# modifications are needed.
|
||||
git-commit-last-msg() {
|
||||
local gitdir
|
||||
gitdir="$(git rev-parse --git-dir)" || return
|
||||
git commit -eF <(sed -n '/^#/q;p' "$gitdir/COMMIT_EDITMSG")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user