зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
1b118da8bd
Коммит
1eff26c0e2
|
@ -39,6 +39,7 @@ clear_stash () {
|
|||
create_stash () {
|
||||
stash_msg="$1"
|
||||
|
||||
git update-index -q --refresh
|
||||
if no_changes
|
||||
then
|
||||
exit 0
|
||||
|
@ -101,6 +102,7 @@ save_stash () {
|
|||
|
||||
stash_msg="$*"
|
||||
|
||||
git update-index -q --refresh
|
||||
if no_changes
|
||||
then
|
||||
echo 'No local changes to save'
|
||||
|
@ -150,6 +152,7 @@ show_stash () {
|
|||
}
|
||||
|
||||
apply_stash () {
|
||||
git update-index -q --refresh &&
|
||||
git diff-files --quiet --ignore-submodules ||
|
||||
die 'Cannot restore on top of a dirty state'
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче