From 3cf20c4822627d3189d78aa4631555047c985c97 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Wed, 19 Jan 2022 17:41:28 +0530
Subject: [PATCH] nvim: autoload/git: Generate a helpful name to use with stash

---
 nvim/.config/nvim/after/plugin/fugitive.vim | 2 +-
 nvim/.config/nvim/autoload/git.vim          | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim
index d4e809f..9ff42a0 100644
--- a/nvim/.config/nvim/after/plugin/fugitive.vim
+++ b/nvim/.config/nvim/after/plugin/fugitive.vim
@@ -24,7 +24,7 @@ nnoremap <Leader>gn :Git branch -m<SPACE>
 nnoremap <Leader>go :call git#git_log_compare()<CR>
 nnoremap <Leader>gr :call git#git_rebase_origin()<CR>
 nnoremap <Leader>gR :Git rebase --abort<CR>
-nnoremap <Leader>g- :Git stash<CR>:e<CR>
+nnoremap <Leader>g- :call git#git_stash()<CR>:e<CR>
 nnoremap <Leader>g+ :Git stash pop<SPACE>
 nnoremap <Leader>gs :Git stash list<CR>
 nnoremap <Leader>gS :Git stash -- %<CR>
diff --git a/nvim/.config/nvim/autoload/git.vim b/nvim/.config/nvim/autoload/git.vim
index 98a5238..e34fc66 100644
--- a/nvim/.config/nvim/autoload/git.vim
+++ b/nvim/.config/nvim/autoload/git.vim
@@ -241,3 +241,11 @@ function! git#git_rebase_origin() abort
   echom "Rebasing current branch on origin/" . default[3]
   execute "Git rebase origin/" . default[3]
 endfunction
+
+" Generate a helpful name when using Git stash
+function! git#git_stash() abort
+  let current = trim(system("git branch --show-current"))
+  let current_time = strftime("%Y-%b-%d_%H-%M")
+  let stash_name = current . "-" . current_time
+  execute "Git stash push -m " . stash_name
+endfunction