You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@stratos.apache.org by Isuru Perera <is...@wso2.com> on 2014/01/19 08:18:14 UTC
Fwd: 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
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: <pr...@apache.org>
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: commits@stratos.incubator.apache.org
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 <pr...@gmail.com>
Authored: Sun Jan 19 11:03:26 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
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
Re: 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
Posted by Isuru Perera <is...@wso2.com>.
That's great!
You are welcome! :)
On Fri, Jan 31, 2014 at 9:27 PM, Pradeep Fernando <pr...@gmail.com>wrote:
> Thanks Isuru,
>
> It worked. :)
>
> --Pradeep
>
>
> On Sun, Jan 19, 2014 at 12:48 PM, Isuru Perera <is...@wso2.com> wrote:
>
>> 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: <pr...@apache.org>
>> 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: commits@stratos.incubator.apache.org
>>
>>
>> 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 <pr...@gmail.com>
>> Authored: Sun Jan 19 11:03:26 2014 +0530
>> Committer: Pradeep Fernando <pr...@gmail.com>
>> 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
>>
>
>
>
> --
> Pradeep Fernando.
> http://pradeepfernando.blogspot.com/
>
--
Isuru Perera
Senior Software Engineer | WSO2, Inc. | http://wso2.com/
Lean . Enterprise . Middleware
about.me/chrishantha
Re: 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
Posted by Pradeep Fernando <pr...@gmail.com>.
Thanks Isuru,
It worked. :)
--Pradeep
On Sun, Jan 19, 2014 at 12:48 PM, Isuru Perera <is...@wso2.com> wrote:
> 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: <pr...@apache.org>
> 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: commits@stratos.incubator.apache.org
>
>
> 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 <pr...@gmail.com>
> Authored: Sun Jan 19 11:03:26 2014 +0530
> Committer: Pradeep Fernando <pr...@gmail.com>
> 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
>
--
Pradeep Fernando.
http://pradeepfernando.blogspot.com/