Hi Pradeep, Try using --ignore-whitespace when you apply patch using "git am --signoff" [1] next time. I have done this many times without an issue.
[1] https://www.kernel.org/pub/software/scm/git/docs/git-am.html ---------- Forwarded message ---------- From: <[email protected]> Date: Sun, Jan 19, 2014 at 11:03 AM Subject: git commit: applying patch by Chanaka Jayasena, STRATOS-370. git am --signoff didnt work even in a newly checkout source. hence using git apply and specifyingthe contribution in commit msg To: [email protected] Updated Branches: refs/heads/master f0b70784f -> dfe1823e0 applying patch by Chanaka Jayasena, STRATOS-370. git am --signoff didnt work even in a newly checkout source. hence using git apply and specifyingthe contribution in commit msg Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dfe1823e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dfe1823e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dfe1823e Branch: refs/heads/master Commit: dfe1823e0a1e695f3eee5d214c120fa3aa80fe14 Parents: f0b7078 Author: Pradeep Fernando <[email protected]> Authored: Sun Jan 19 11:03:26 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Sun Jan 19 11:03:26 2014 +0530 ---------------------------------------------------------------------- .../console/asset.jag | 5 ++ .../console/config/acl.json | 4 +- .../console/permission-mapping.txt | 19 ++++++ .../console/themes/theme1/pages/plain.hbs | 67 ++++++++++++++++++++ .../console/themes/theme1/partials/404.hbs | 31 +++++++++ .../console/themes/theme1/partials/header.hbs | 7 +- .../theme1/partials/policy_deployments.hbs | 15 ++++- .../console/themes/theme1/renderers/asset.js | 38 +++++++++++ 8 files changed, 177 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- -- Isuru Perera Senior Software Engineer | WSO2, Inc. | http://wso2.com/ Lean . Enterprise . Middleware about.me/chrishantha
