[U-Boot] [PATCH] patman: Only apply patches when we know the original HEAD

Simon Glass sjg at chromium.org
Sat Jun 21 18:27:06 CEST 2014


Hi Masahiro,

On 11 June 2014 23:27, Simon Glass <sjg at chromium.org> wrote:
> When patman applies the patches it checks out a new branch, uses 'git am'
> to apply the patches one by one, and then tries to go back to the old
> branch. If you try this when the branch is 'undefined', this doesn't work
> as patman cannot restore the correct branch after applying the patches.
> It seems that 'undefined' is created by git and is persistent after it is
> created, so that you can end up on quite an old branch.
>
> Add a check for the 'undefined' branch to avoid this.
>
> Reported-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
> Signed-off-by: Simon Glass <sjg at chromium.org>

Can you please check if this fixes the problem you reported? If so I
would like to get it into this release.

Regards,
Simon


More information about the U-Boot mailing list