From: Geert Bosch <bosch@adacore.com>
Date: Wed, 21 May 2008 15:11:20 GMT
Subject: Re: [PATCH] pull --rebase: exit early when the working directory is dirty
Message-ID: <626F2244-15CE-481C-A8F5-D6744F06D46F@adacore.com>
In-Reply-To: <alpine.DEB.1.00.0805211230290.30431@racer>


On May 21, 2008, at 07:32, Johannes Schindelin wrote:
> When rebasing fails during "pull --rebase", you cannot just clean up  
> the
> working directory and call "pull --rebase" again, since the remote  
> branch
> was already fetched.
>
> Therefore, die early when the working directory is dirty.
Much nicer indeed to die early on errors, as we also can
generally give better error messages.
> +	die "refusing to pull with rebase: your working tree is not up-to- 
> date"

I thought we'd prefer saying:
               "refusing to pull with rebase: your working tree has  
local changes"

   -Geert