Re: Re*: Peculiar behavior of git 1.5.6
Quoting Junio C Hamano <gitster@pobox.com>:
Show 9 quoted lines
> In any case, I think this should fix the unrelated issue.
>
> -- >8 --
> 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>
Show 32 quoted lines
> ---
> git-stash.sh | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git c/git-stash.sh w/git-stash.sh
> index e15c12a..d799c76 100755
> --- c/git-stash.sh
> +++ w/git-stash.sh
> @@ -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'
> --
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
Nanako Shiraishi <nanako3@lavabit.com>