[sr-dev] git:kamailio_3.0: Backport of the changes (see previous commits).

[Carsten Bock]

Hi,

i will write proper commit messages next time.
I am new to git, so i guess i have to learn a little bit more about it...

Carsten

2010/1/10 Andrei Pelinescu-Onciul <andrei at iptel.org>

>
> Please don't use ever again this kind of commit message.
> It doesn't specify which module it touches, and it refers to some
> ambiguous previous commits (suppose I look at it after 6 month, how
> should I know to which commit messages it refers especially since they
> are on a different branch).
>
> The commit message should obey the rules at
> http://sip-router.org/wiki/devel/git-commit-guidelines
>
> For example in your case it should have looked something similar to:
>
> -----------------------------------------------------------------------
> dialog(k): parse all headers
>
> We need to parse all headers here. Otherwise, the Record-Route-Headers
> may be incomplete.
> -----------------------------------------------------------------------
>
> When you want to backport a commit use git cherry-pick -x.
> For example in your case
> git cherry-pick -x 9efc2f5f5195bbb8321e0e1a59d028e3c3358fb2
> would have been enough and it would have included all the needed
> information.
> (9efc2f5f5195bbb8321e0e1a59d028e3c3358fb2 is the id of your original
> commit on the master branch).
>
> Andrei
>
> On Jan 06, 2010 at 16:50, Carsten Bock <carsten at bock.info> wrote:
> > Module: sip-router
> > Branch: kamailio_3.0
> > Commit: 99d5e6c0d1fa81acb0f42bae137ec256004aba5f
> > URL:
> http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99d5e6c0d1fa81acb0f42bae137ec256004aba5f
> >
> > Author: Carsten Bock <lists at bock.info>
> > Committer: Carsten Bock <lists at bock.info>
> > Date:   Wed Jan  6 16:51:59 2010 +0100
> >
> > Backport of the changes (see previous commits).
> >
> > ---
> >
> >  modules_k/dialog/dlg_handlers.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/modules_k/dialog/dlg_handlers.c
> b/modules_k/dialog/dlg_handlers.c
> > index 3cf2a3b..450cc12 100644
> > --- a/modules_k/dialog/dlg_handlers.c
> > +++ b/modules_k/dialog/dlg_handlers.c
> > @@ -227,7 +227,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct
> sip_msg *msg,
> >       contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri;
> >
> >       /* extract the RR parts */
> > -     if(!msg->record_route && (parse_headers(msg,HDR_RECORDROUTE_F,0)<0)
>  ){
> > +     if(!msg->record_route && (parse_headers(msg,HDR_EOH_F,0)<0)  ){
> >               LM_ERR("failed to parse record route header\n");
> >               goto error0;
> >       }
> >
> >
> > _______________________________________________
> > sr-dev mailing list
> > sr-dev at lists.sip-router.org
> > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>



-- 
Carsten Bock
Schomburgstr. 80
22767 Hamburg
Germany

Mobile +49 179 2021244
Home +49 40 34927217
Fax +49 40 34927218
mailto:carsten at bock.info

Stephen Leacock<http://www.brainyquote.com/quotes/authors/s/stephen_leacock.html>
- "I detest life-insurance agents: they always argue that I shall some
day
die, which is not so."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sip-router.org/pipermail/sr-dev/attachments/20100111/ca692d19/attachment.htm>