kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

stash: refresh the index before deciding if the work tree is dirty 

Unlike the case where the user does have a real change in the work tree,
refusing to work because of unclean stat information is not very helpful.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Nanako Shiraishi <nanako3@lavabit.com>
maint
Junio C Hamano 2008-09-04 02:41:22 -07:00
parent 1b118da8bd
commit 1eff26c0e2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-stash.sh
View File

@ -39,6 +39,7 @@ clear_stash () {
create_stash () { create_stash () {
stash_msg="$1" stash_msg="$1"


git update-index -q --refresh
if no_changes if no_changes
then then
exit 0 exit 0
@ -101,6 +102,7 @@ save_stash () {


stash_msg="$*" stash_msg="$*"


git update-index -q --refresh
if no_changes if no_changes
then then
echo 'No local changes to save' echo 'No local changes to save'
@ -150,6 +152,7 @@ show_stash () {
} }


apply_stash () { apply_stash () {
git update-index -q --refresh &&
git diff-files --quiet --ignore-submodules || git diff-files --quiet --ignore-submodules ||
die 'Cannot restore on top of a dirty state' die 'Cannot restore on top of a dirty state'