On Tue, May 13, 2014 at 10:30:42PM +0200, Per Cederqvist wrote:
> A patch file consists of:
> 
> (1) the description
> (2) optional diffstat
> (3) the patches
> 
> When extracting the patch, we only want part 3.  The do_get_patch used
> to give us part 2 and part 3.  That made for instance this series of
> operations fail if guilt.diffstat is true:
> 
>     guilt push empty-1
>     guilt push empty-2
>     guilt pop
>     guilt fold empty-2
>     guilt pop
>     guilt push

I would probably include the actual error here.  I got the following (using
patch names a & b):

$ guilt pop
Now at a.
$ guilt fold b
error: No changes
$ guilt pop
All patches popped.
$ guilt pu
Applying patch..a
error: No changes
To force apply this patch, use 'guilt push -f'


The diff itself is good.

Signed-off-by: Josef 'Jeff' Sipek <jef...@josefsipek.net>

> 
> Signed-off-by: Per Cederqvist <ced...@opera.com>
> ---
>  guilt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/guilt b/guilt
> index 8701481..3fc524e 100755
> --- a/guilt
> +++ b/guilt
> @@ -334,7 +334,7 @@ do_get_patch()
>  {
>       awk '
>  BEGIN{}
> -/^(diff |---$|--- )/ {patch = 1}
> +/^(diff |--- )/ {patch = 1}
>  patch == 1 {print $0}
>  END{}
>  ' < "$1"
> -- 
> 1.8.3.1
> 

-- 
I already backed up the [server] once, I can do it again.
                - a sysadmin threatening to do more frequent backups
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to