Hi,<br><br>i will write proper commit messages next time.<br>I am new to git, so i guess i have to learn a little bit more about it...<br><br>Carsten<br><br><div class="gmail_quote">2010/1/10 Andrei Pelinescu-Onciul <span dir="ltr"><<a href="mailto:andrei@iptel.org">andrei@iptel.org</a>></span><br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><br>
Please don't use ever again this kind of commit message.<br>
It doesn't specify which module it touches, and it refers to some<br>
ambiguous previous commits (suppose I look at it after 6 month, how<br>
should I know to which commit messages it refers especially since they<br>
are on a different branch).<br>
<br>
The commit message should obey the rules at<br>
<a href="http://sip-router.org/wiki/devel/git-commit-guidelines" target="_blank">http://sip-router.org/wiki/devel/git-commit-guidelines</a><br>
<br>
For example in your case it should have looked something similar to:<br>
<br>
-----------------------------------------------------------------------<br>
dialog(k): parse all headers<br>
<br>
We need to parse all headers here. Otherwise, the Record-Route-Headers<br>
may be incomplete.<br>
-----------------------------------------------------------------------<br>
<br>
When you want to backport a commit use git cherry-pick -x.<br>
For example in your case<br>
git cherry-pick -x 9efc2f5f5195bbb8321e0e1a59d028e3c3358fb2<br>
would have been enough and it would have included all the needed<br>
information.<br>
(9efc2f5f5195bbb8321e0e1a59d028e3c3358fb2 is the id of your original<br>
commit on the master branch).<br>
<font color="#888888"><br>
Andrei<br>
</font><div><div></div><div class="h5"><br>
On Jan 06, 2010 at 16:50, Carsten Bock <<a href="mailto:carsten@bock.info">carsten@bock.info</a>> wrote:<br>
> Module: sip-router<br>
> Branch: kamailio_3.0<br>
> Commit: 99d5e6c0d1fa81acb0f42bae137ec256004aba5f<br>
> URL: <a href="http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99d5e6c0d1fa81acb0f42bae137ec256004aba5f" target="_blank">http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99d5e6c0d1fa81acb0f42bae137ec256004aba5f</a><br>
><br>
> Author: Carsten Bock <<a href="mailto:lists@bock.info">lists@bock.info</a>><br>
> Committer: Carsten Bock <<a href="mailto:lists@bock.info">lists@bock.info</a>><br>
> Date: Wed Jan 6 16:51:59 2010 +0100<br>
><br>
> Backport of the changes (see previous commits).<br>
><br>
> ---<br>
><br>
> modules_k/dialog/dlg_handlers.c | 2 +-<br>
> 1 files changed, 1 insertions(+), 1 deletions(-)<br>
><br>
> diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c<br>
> index 3cf2a3b..450cc12 100644<br>
> --- a/modules_k/dialog/dlg_handlers.c<br>
> +++ b/modules_k/dialog/dlg_handlers.c<br>
> @@ -227,7 +227,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg,<br>
> contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri;<br>
><br>
> /* extract the RR parts */<br>
> - if(!msg->record_route && (parse_headers(msg,HDR_RECORDROUTE_F,0)<0) ){<br>
> + if(!msg->record_route && (parse_headers(msg,HDR_EOH_F,0)<0) ){<br>
> LM_ERR("failed to parse record route header\n");<br>
> goto error0;<br>
> }<br>
><br>
><br>
> _______________________________________________<br>
> sr-dev mailing list<br>
> <a href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br>
> <a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
<br>
_______________________________________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>Carsten Bock<br>Schomburgstr. 80<br>22767 Hamburg<br>Germany<br><br>Mobile +49 179 2021244<br>Home +49 40 34927217<br>Fax +49 40 34927218<br>mailto:<a href="mailto:carsten@bock.info">carsten@bock.info</a><br>
<br><a href="http://www.brainyquote.com/quotes/authors/s/stephen_leacock.html" target="_blank">Stephen Leacock</a> - "I detest life-insurance agents: they always argue that I shall some day die, which is not so."