diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-25 09:08:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 12:02:40 +0100 |
| commit | ee3304b8b089eb816a1c9b1cd2db5544b27e0947 (patch) | |
| tree | 408c5f514b193a05e229c0e75fb068e3217ec665 /scripts/combo-layer | |
| parent | 89b30c36b1db2545b4093c7b809c63b5b1abfc8c (diff) | |
| download | ast2050-yocto-poky-ee3304b8b089eb816a1c9b1cd2db5544b27e0947.zip ast2050-yocto-poky-ee3304b8b089eb816a1c9b1cd2db5544b27e0947.tar.gz | |
scripts/combo-layer: keep carriage returns at the end of lines
Use --keep-cr option to "git am" or otherwise we lose carriage returns
which can be important for patches against files that use CRs.
(From OE-Core rev: bab4952075245563787293428e031fa11d6cb2b4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 84cc48f..d129175 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -254,7 +254,7 @@ def action_apply_patch(conf, args): for line in open(repo['patchlist']): patchfile = line.split()[0] lastrev = line.split()[1] - cmd = "git am -s -p1 %s" % patchfile + cmd = "git am --keep-cr -s -p1 %s" % patchfile logger.info("Apply %s" % patchfile ) try: runcmd(cmd) |
