Module: sip-router Branch: rbetancor/drouting DELETED Commit: 1c5d19277a14e71167c81665d6de8173e61a2ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c5d1927...
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Fri Jun 19 16:40:24 2009 +0300
* core
* Added fixup_igp_pvar and fixup_free_igp_pvar fixup functions.
---
mod_fix.c | 1 + mod_fix.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/mod_fix.c b/mod_fix.c index a228e16..90a4a4d 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -176,6 +176,7 @@ FIXUP_F2T(pvar_str_str, 1, 3, 1, FPARAM_PVS, FPARAM_STR)
FIXUP_F2FP(igp_null, 1, 1, 1, FPARAM_INT|FPARAM_PVS, 0) FIXUP_F2FP(igp_igp, 1, 2, 2, FPARAM_INT|FPARAM_PVS, 0) +FIXUP_F2FP(igp_pvar, 1, 2, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS)
FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS)
diff --git a/mod_fix.h b/mod_fix.h index 257d78c..37bccb6 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -109,6 +109,9 @@ int fixup_igp_igp(void** param, int param_no); int fixup_igp_null(void** param, int param_no); int fixup_get_ivalue(struct sip_msg* msg, gparam_p gp, int *val);
+int fixup_igp_pvar(void** param, int param_no); +int fixup_free_igp_pvar(void** param, int param_no); + int fixup_igp_pvar_pvar(void** param, int param_no); int fixup_free_igp_pvar_pvar(void** param, int param_no);
On Thursday 02 July 2009 18:40:30 Raul Alexis Betancor Santana wrote:
Module: sip-router Branch: rbetancor/drouting DELETED Commit: 1c5d19277a14e71167c81665d6de8173e61a2ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c5d192 77a14e71167c81665d6de8173e61a2ccb
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Fri Jun 19 16:40:24 2009 +0300
- core
ARGHHH!!!!!!!!!! ... All I want was to push my local changes to the remote rbetancor/drouting branch ...
I did:
git push origin :rbetancor/drouting and get this ...
Are my chagelogs lost ?
I could see with a git branch that on my local side all is ok ... how could I fix this issue ?
Sorry for the inconveniences, I'm new to git, I have worked with cvs and svn .. but not with distributed code management systems like git ... :-(
On Jul 02, 2009 at 18:45, Ra?l Alexis Betancor Santana rabs@dimension-virtual.com wrote:
On Thursday 02 July 2009 18:40:30 Raul Alexis Betancor Santana wrote:
Module: sip-router Branch: rbetancor/drouting DELETED Commit: 1c5d19277a14e71167c81665d6de8173e61a2ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c5d192 77a14e71167c81665d6de8173e61a2ccb
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Fri Jun 19 16:40:24 2009 +0300
- core
ARGHHH!!!!!!!!!! ... All I want was to push my local changes to the remote rbetancor/drouting branch ...
I did:
git push origin :rbetancor/drouting and get this ...
^^^^^^^^^^^^^^^^^^ This is the command for deleting the remote betancor/drouting branch :-) If you don't specify a local branch ( :something instead of local_branch:something) the action is to delete it.
Are my chagelogs lost ?
No. They are present on your local repo and they can be recovered also at the remote repo as long as you remember the top commit hash ( unless somebody runs garbage collection several times on the repo). In your case recovery is very easy since I assume you still have your local branch (you only need to push again but this time don' forget to add your local branch in front of ':'). Otherwise (no local branch or at another machine): git push 1c5d19277a14e71167c81665d6de8173e61a2ccb:betancor/drouting should work too.
I could see with a git branch that on my local side all is ok ... how could I fix this issue ?
Sorry for the inconveniences, I'm new to git, I have worked with cvs and svn .. but not with distributed code management systems like git ... :-(
No problem, everyone of us has made at least one mistake.
Andrei
-
Andrei Pelinescu-Onciul -
Raul Alexis Betancor Santana