Re: [sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Juha Heinanen]

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

Thanks, Juha

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Victor Seva]

2017-10-16 13:30 GMT+02:00 Juha Heinanen :
> 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'?

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

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Juha Heinanen]

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

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Victor Seva]

2017-10-16 13:00 GMT+02:00 Juha Heinanen :
> 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?


See pull.rebase, branch..rebase and branch.autoSetupRebase in
git-config[1] if you want to make git pull always use --rebase instead
of merging.

> 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

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Juha Heinanen]

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

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Victor Seva]

Please Juha,

rebase before pushing

2017-10-16 11:42 GMT+02:00 Juha Heinanen :
> Module: kamailio
> Branch: master
> Commit: 02074c81158b0927778e5f2daaae8da953580f2f
> URL: 
> https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da953580f2f
>
> Author: Juha Heinanen 
> Committer: Juha Heinanen 
> 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/02074c81158b0927778e5f2daaae8da953580f2f.diff
> Patch: 
> https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da953580f2f.patch
>
>
> ___
> Kamailio (SER) - Development Mailing List
> sr-dev@lists.kamailio.org
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Juha Heinanen]

Module: kamailio
Branch: master
Commit: 02074c81158b0927778e5f2daaae8da953580f2f
URL: 
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da953580f2f

Author: Juha Heinanen 
Committer: Juha Heinanen 
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/02074c81158b0927778e5f2daaae8da953580f2f.diff
Patch: 
https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da953580f2f.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev