From: Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil>
Date: Mon, 25 Jul 2011 17:55:52 GMT
Subject: Re: Surprise at git stash pop
Message-ID: <5fuhYLPOf07EnF5c5gyqAvbP3UZl6m72FicTS5tZnr3K8vTH5UoLkA@cipher.nrlssc.navy.mil>
In-Reply-To: <CAG3eYYRdvi-JdPfZmH_1EhEpjdweZFc6NS54btEz0nWy=O3+vA@mail.gmail.com>

On 07/25/2011 10:45 AM, Péter András Felvégi wrote:
> Hello,
> 
> 'git stash pop' erased my local modifications, but not all of them.

Hi,

I cannot reproduce this.  What version of git are you using?

Can you produce a test case?  This could be a test repo that
you can share or a sequence of commands to produce such a
repo like:

   git init &&
   echo 'Some content' >build-configs.def &&
   mkdir -p 'server/plugins-src/ads' &&
   echo 'Some other content' >server/plugins-src/ads/AdsPlugin.hpp &&
   ...
   git add . &&
   git commit -m 'initial commit' &&
   echo 'Some new content for build-configs' >>build-configs.def &&
   ...
   git stash pop
   # Error situation

Thanks,
-Brandon