[PATCH] qf: Make qf_pull clean

[Lucas De Marchi]

On Wed, Jan 24, 2018 at 03:04:34PM -0800, Rodrigo Vivi wrote:
> qf_checkout implies that you need to have that baseline
> on your local repository, what it is not good for a distributed
> maintenance.
> 
> Let's make qf_pull useful for the case we want to start
> a clean rebase from anywhere.
> 
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Michel Thierry <michel.thierry at intel.com>
> Cc: James Ausmus <james.ausmus at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> 
> tobe squashed to checkout expand name patch
> ---
>  qf | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/qf b/qf
> index 1e8ae75b4f46..2de890c5295e 100755
> --- a/qf
> +++ b/qf
> @@ -415,11 +415,13 @@ function qf_pull
>  {
>  	cd_toplevel
>  
> -	qf fetch
> +	qf_fetch
>  	cd patches
> +	# consider that you have a very clean repo

humn... I have no idea what's this comment. is this a TODO?

>  	git pull --ff-only
> -
> -	qf co
> +	# make sure you start from a very clean local as well
> +	git reset --hard HEAD

this has the disadvantage that you will loose whatever you were
changing instead of just failing to checkout

Lucas De Marchi