Searched hist:"4251978 afccb4b58c477c74f2d9888a063e5a995" (Results 1 – 1 of 1) sorted by relevance
| /rk3399_rockchip-uboot/tools/patman/ |
| H A D | gitutil.py | 4251978afccb4b58c477c74f2d9888a063e5a995 Thu Jun 12 05:27:09 UTC 2014 Simon Glass <sjg@chromium.org> patman: Only apply patches when we know the original HEAD
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@jp.panasonic.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
|