Newbie at patches, can someone shed light on my git issue?
I have made some source changes to fix build issues. I spent all day yesterday trying to get git to build a patch. Many web sites have info but no a-z info for someone new to this (the FS wiki and others all assume you know git pretty well). I tried several things such as the sequence below. But all I can ever get is format-patch generating the whole program instead of just the changes. I am thinking it may have to do with what directory I put the patch in. I tried various places with no luck. Do I duplicate the freeswitch dir and compare the two? I tried using linux diff but it does not create what looks like a FS patch. Thanks, Mario G cd freeswitch mkdir afixes git checkout -b afixes put changed pgmname.c in afixes directory git add afixes/pgmname.c git commit -m "Lion spandsp compat" git format-patch master <-results in entire program added
So you clone freeswitch then: git branch my_fix master #clones master into my_fix branch for you to work in git checkout my_fix #switches to the my_fix branch #make changes to the files you change or add #Mark the changes for commit, ie: git add src/switch.c #use git add for modified or new files git commit -m "My Fix" #commits your changes git format-patch -w 1 #makes a patch for the last commit The patch will contain the differences between the original code and your code this is what you would put in a jira. ~mitch On Tue, Oct 30, 2012 at 9:10 AM, Mario G <mario_fs@mgtech.com> wrote:
I have made some source changes to fix build issues. I spent all day yesterday trying to get git to build a patch. Many web sites have info but no a-z info for someone new to this (the FS wiki and others all assume you know git pretty well). I tried several things such as the sequence below. But all I can ever get is format-patch generating the whole program instead of just the changes. I am thinking it may have to do with what directory I put the patch in. I tried various places with no luck. Do I duplicate the freeswitch dir and compare the two? I tried using linux diff but it does not create what looks like a FS patch. Thanks, Mario G
cd freeswitch mkdir afixes git checkout -b afixes put changed pgmname.c in afixes directory git add afixes/pgmname.c git commit -m "Lion spandsp compat" git format-patch master <-results in entire program added
_________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com
FreeSWITCH-powered IP PBX: The CudaTel Communication Server http://www.cudatel.com
Official FreeSWITCH Sites http://www.freeswitch.org http://wiki.freeswitch.org http://www.cluecon.com
FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
Thanks very much, I finally got it to work (after 12 hours), very close to yours: Start with clean freeswitch dir modify source /usr/local/src/freeswitch-head/freeswitch/libs/spandsp/src/gsm0610_rpe.c git branch gsm git add /usr/local/src/freeswitch-head/freeswitch/libs/spandsp/src/gsm0610_rpe.c git commit -m "Lion spandsp compat" git format-patch -1 On Oct 30, 2012, at 1:56 PM, Mitch Capper wrote:
So you clone freeswitch then: git branch my_fix master #clones master into my_fix branch for you to work in git checkout my_fix #switches to the my_fix branch #make changes to the files you change or add #Mark the changes for commit, ie: git add src/switch.c #use git add for modified or new files git commit -m "My Fix" #commits your changes git format-patch -w 1 #makes a patch for the last commit
The patch will contain the differences between the original code and your code this is what you would put in a jira.
~mitch
On Tue, Oct 30, 2012 at 9:10 AM, Mario G <mario_fs@mgtech.com> wrote:
I have made some source changes to fix build issues. I spent all day yesterday trying to get git to build a patch. Many web sites have info but no a-z info for someone new to this (the FS wiki and others all assume you know git pretty well). I tried several things such as the sequence below. But all I can ever get is format-patch generating the whole program instead of just the changes. I am thinking it may have to do with what directory I put the patch in. I tried various places with no luck. Do I duplicate the freeswitch dir and compare the two? I tried using linux diff but it does not create what looks like a FS patch. Thanks, Mario G
cd freeswitch mkdir afixes git checkout -b afixes put changed pgmname.c in afixes directory git add afixes/pgmname.c git commit -m "Lion spandsp compat" git format-patch master <-results in entire program added
_________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com
FreeSWITCH-powered IP PBX: The CudaTel Communication Server http://www.cudatel.com
Official FreeSWITCH Sites http://www.freeswitch.org http://wiki.freeswitch.org http://www.cluecon.com
FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
_________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com
FreeSWITCH-powered IP PBX: The CudaTel Communication Server http://www.cudatel.com
Official FreeSWITCH Sites http://www.freeswitch.org http://wiki.freeswitch.org http://www.cluecon.com
FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
participants (2)
-
Mario G
-
Mitch Capper