16 Oct
2017
16 Oct
'17
12:42 p.m.
Module: kamailio
Branch: master
Commit: 02074c81158b0927778e5f2daaae8da953580f2f
URL: https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…
Author: Juha Heinanen <jh(a)tutpro.com>
Committer: Juha Heinanen <jh(a)tutpro.com>
Date: 2017-10-16T12:41:48+03:00
Merge branch 'master' of github.com:kamailio/kamailio
---
Added: src/modules/phonenum/Makefile
Added: src/modules/phonenum/README
Added: src/modules/phonenum/cphonenumber.cpp
Added: src/modules/phonenum/cphonenumber.h
Added: src/modules/phonenum/doc/Makefile
Added: src/modules/phonenum/doc/phonenum.xml
Added: src/modules/phonenum/doc/phonenum_admin.xml
Added: src/modules/phonenum/phonenum_mod.c
Added: src/modules/phonenum/phonenum_pv.c
Added: src/modules/phonenum/phonenum_pv.h
Modified: src/Makefile.defs
Modified: src/Makefile.groups
Modified: src/modules/sipdump/sipdump_mod.c
Modified: src/modules/sipdump/sipdump_write.c
---
Diff:
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…
Patch:
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…
16 Oct
16 Oct
1:14 p.m.
Please Juha,
rebase before pushing
2017-10-16 11:42 GMT+02:00 Juha Heinanen <jh(a)tutpro.com>om>:
Module: kamailio
Branch: master
Commit: 02074c81158b0927778e5f2daaae8da953580f2f
URL:
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…
Author: Juha Heinanen <jh(a)tutpro.com>
Committer: Juha Heinanen <jh(a)tutpro.com>
Date: 2017-10-16T12:41:48+03:00
Merge branch 'master' of github.com:kamailio/kamailio
---
Added: src/modules/phonenum/Makefile
Added: src/modules/phonenum/README
Added: src/modules/phonenum/cphonenumber.cpp
Added: src/modules/phonenum/cphonenumber.h
Added: src/modules/phonenum/doc/Makefile
Added: src/modules/phonenum/doc/phonenum.xml
Added: src/modules/phonenum/doc/phonenum_admin.xml
Added: src/modules/phonenum/phonenum_mod.c
Added: src/modules/phonenum/phonenum_pv.c
Added: src/modules/phonenum/phonenum_pv.h
Modified: src/Makefile.defs
Modified: src/Makefile.groups
Modified: src/modules/sipdump/sipdump_mod.c
Modified: src/modules/sipdump/sipdump_write.c
---
Diff:
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…
Patch:
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…
_______________________________________________
Kamailio (SER) - Development Mailing List
sr-dev(a)lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
2 p.m.
Victor Seva writes:
rebase before pushing
Hard to remember. Is it possible to configure git so that it cancels
push if local repo is not up to date?
And even if had remembered to rebase, there would still be a cap between
push during which a new commit could have occurred. Sound broken system
to me.
-- Juha
2:06 p.m.
2017-10-16 13:00 GMT+02:00 Juha Heinanen <jh(a)tutpro.com>om>:
Victor Seva writes:
See pull.rebase, branch.<name>.rebase and branch.autoSetupRebase in
git-config[1] if you want to make git pull always use --rebase instead
of merging.
rebase before pushing
Hard to remember. Is it possible to configure git so that it cancels
push if local repo is not up to date? And even if had remembered to rebase, there would
still be a cap between
push during which a new commit could have occurred. Sound broken system
to me.
You can't push in that case. I would say git is not broken
2:30 p.m.
Victor Seva writes:
rebase before pushing
This is what I did (taken from shell history):
2060 emacs sipdump_mod.c
2061 git diff
2062 git commit -a
2063 git push
2064 git pull
2065 git push
If I remember correctly, first git push failed with message asking to do
pull first, which I did and then pushed again.
What would have been the correct command sequence provided that I didn't
remember to do 'git rebase'?
-- Juha
3:17 p.m.
New subject: git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio
Although I still lack a lot of git knowledge and not sure I do stuff in
the best way, but just in case is useful for anyone, before git push, I do:
git pull --stat --ff --rebase origin
I actually added an alias inside ~/.gitconfig to make it shorter and
easy to remember:
[alias]
pullx = pull --stat --ff --rebase
and now I just do:
git pullx origin
Some other aliases I have:
[alias]
ci = commit
co = checkout
pullx = pull --stat --ff --rebase
pickx = cherry-pick -x
logp = log -p
logf = log --follow
logfp = log -p --follow
logpf = log -p --follow
Cheers,
Daniel
On 16.10.17 13:30, Juha Heinanen wrote:
Victor Seva writes:
--
Daniel-Constantin Mierla
www.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio Advanced Training - www.asipto.com
Kamailio World Conference - www.kamailioworld.com
rebase before pushing
This is what I did
(taken from shell history):
2060 emacs sipdump_mod.c
2061 git diff
2062 git commit -a
2063 git push
2064 git pull
2065 git push
If I remember correctly, first git push failed with message asking to do
pull first, which I did and then pushed again.
What would have been the correct command sequence provided that I didn't
remember to do 'git rebase'?
-- Juha
_______________________________________________
Kamailio (SER) - Development Mailing List
sr-dev(a)lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
4:45 p.m.
2017-10-16 13:30 GMT+02:00 Juha Heinanen <jh(a)tutpro.com>om>:
Victor Seva writes:
git pull --rebase is the missing step there. I have set pull rebase in
~/.gitconfig [0]
[pull]
rebase = true
so git pull --rebase is automatic for me
[0] https://coderwall.com/p/tnoiug/rebase-by-default-when-doing-git-pull
rebase before pushing
This is what I did (taken from shell history):
2060 emacs sipdump_mod.c
2061 git diff
2062 git commit -a
2063 git push
2064 git pull
2065 git push
If I remember correctly, first git push failed with message asking to do
pull first, which I did and then pushed again.
What would have been the correct command sequence provided that I didn't
remember to do 'git rebase'? 
27 Oct
27 Oct
11:06 a.m.
New subject: Avoiding merge commits (git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio)
Hi, little bit late to the party...
Option ff-only works for me perfectly as it does not make
anything (possibly wrong) automagically.
Then I always have to manually check whether possible rebase
operation would be sensible.
.git/config:
---
[pull]
ff = only
[merge]
ff = only
---
---
$ git commit -m 'local commit before merging latest remote HEAD'
$ git pull
From github.com:kamailio/kamailio
* branch
master -> FETCH_HEAD
fatal: Not possible to fast-forward, aborting.
$ git merge origin/master
fatal: Not possible to fast-forward, aborting.
$ git log --graph --all --decorate #observe changes
$ git rebase origin/master #decided to rebase from remote master
First, rewinding head to replay your work on top of it...
Applying: local commit before merging latest remote HEAD
$ git push
---
--
Mikko
2587
days inactive
2598
days old
8 comments
4 participants
participants (4)
-
Daniel-Constantin Mierla -
Juha Heinanen -
Mikko Lehto -
Victor Seva