Use a separate .git/SCM_BREEZE_COMMIT_MSG file for each repo (#356)

When I'm working on multiple projects, it's annoying when the saved git
commit message is global and not unique to each
repo.`/tmp/.git_commit_message~` was a bad idea!

I also use the `grsl` alias quite a lot (which means "git reset last
commit"). I realized it would be really handy to store that commit
message in `.git/SCM_BREEZE_COMMIT_MSG` as well so that I can reset to
the previous commit, make a change, then hit Ctrl+X+space to commit
again with the same message.

Author: ndbroadbent

lib/git/aliases.sh

@@ -94,6 +94,7 @@ _alias "$exec_scmb_expand_args_alias" 'exec_scmb_expand_args'
 _alias "$git_show_files_alias"        'git_show_affected_files'
 _alias "$git_commit_all_alias"        'git_commit_all'
 _alias "$git_grep_shortcuts_alias"    'git_grep_shortcuts'
+_alias "$git_reset_last_commit"       'git_reset_last_commit'
 
 # Git Index alias
 _alias "$git_index_alias"             'git_index'
@@ -145,7 +146,6 @@ if [ "$GIT_SETUP_ALIASES" = "yes" ]; then
   __git_alias "$git_rebase_interactive_alias"       'git' 'rebase' '-i'
   __git_alias "$git_rebase_alias_continue"          'git' 'rebase' '--continue'
   __git_alias "$git_rebase_alias_abort"             'git' 'rebase' '--abort'
-  __git_alias "$git_reset_last_commit"              'git' 'reset HEAD~'
   __git_alias "$git_top_level_alias"                'git' 'rev-parse' '--show-toplevel'
   __git_alias "$git_merge_alias"                    'git' 'merge'
   __git_alias "$git_merge_no_fast_forward_alias"    'git' 'merge' '--no-ff'

lib/git/status_shortcuts.sh

@@ -217,8 +217,12 @@ theirs(){ _git_resolve_merge_conflict "their" "$@"; }
 git_commit_prompt() (
   local commit_msg
   local saved_commit_msg
-  if [ -f "/tmp/.git_commit_message~" ]; then
-    saved_commit_msg="$(cat /tmp/.git_commit_message~)"
+  # Use repo-specific commit message file in .git/ directory (follows git's naming convention)
+  local git_dir
+  git_dir="$(git rev-parse --git-dir 2>/dev/null)"
+  local commit_msg_file="${git_dir}/SCM_BREEZE_COMMIT_MSG"
+  if [ -f "$commit_msg_file" ]; then
+    saved_commit_msg="$(cat "$commit_msg_file")"
     echo -e "\033[0;36mLeave blank to use saved commit message: \033[0m$saved_commit_msg"
   fi
   if breeze_shell_is "zsh"; then
@@ -257,7 +261,7 @@ git_commit_prompt() (
   fi
 
   # Also save the commit message to a temp file in case git commit fails
-  echo "$commit_msg" >"/tmp/.git_commit_message~"
+  echo "$commit_msg" > "$commit_msg_file"
   eval $@ # run any prequisite commands
 
   echo "$commit_msg" | git commit -F - | tail -n +2
@@ -271,7 +275,7 @@ git_commit_prompt() (
   fi
   if [[ "$git_exit_status" == 0 ]]; then
     # Delete saved commit message if commit was successful
-    rm -f "/tmp/.git_commit_message~"
+    rm -f "$commit_msg_file"
   fi
 )
 
@@ -302,3 +306,15 @@ git_add_and_commit() (
     echo "# No staged changes to commit."
   fi
 )
+
+# Reset last commit and save its message for reuse
+git_reset_last_commit() {
+  fail_if_not_git_repo || return 1
+  local git_dir
+  git_dir="$(git rev-parse --git-dir 2>/dev/null)"
+  if [ -n "$git_dir" ]; then
+    # Save the current commit message before resetting
+    git log -1 --pretty=%B > "$git_dir/SCM_BREEZE_COMMIT_MSG"
+  fi
+  git reset HEAD~ "$@"
+}