OpenHatch git workflow: Difference between revisions

← Older edit

OpenHatch git workflow (view source)

Revision as of 01:22, 22 October 2012

956 bytes added , 11 years ago

m

→‎Resources

Anonymous user

imported>Jacquiesue

Revision as of 18:08, 14 March 2012 (view source) imported>Jacquiesue No edit summary ← Older edit		Latest revision as of 01:22, 22 October 2012 (view source) imported>Jacquiesue m (→‎Resources)
(6 intermediate revisions by 3 users not shown)
Line 1: Some guidelines on how to use git when working on ~~openhatch~~OpenHatch = Getting a new clone of ~~openhatch~~OpenHatch = Only need to do this once. Or if you want to start form scratch. It is also good (okay) to remove your <code>oh-mainline</code> directory and start over if you aren't sure the state of your ~~openhatch~~OpenHatch repository. #<code>$ git clone git://github.com/openhatch/oh-mainline.git</code> = Committing a patch = #After you have already retreived your respository of code. ~~And you have~~and made some changes, now you need to submit ~~your patch (that will contain~~ your changes) for review to ~~openhatch~~OpenHatch. ##<code>$ git status</code> (make sure the right files are listed here) ##<code>$ git add <file(s)></code> ##<code>$ git commit -m "Short message explaining your fix"</code> ###Note: If you want to submit everything listed in 'Unstaged changes' in <code>git status</code>, you can just do <code>$ git commit -a -m "Short message explaining your fix"</code>, and skip the previous two steps. ##<code>git log -p</code> (opens in less editor)▼ ##<code>$ git ~~format-patch~~log ~~origin/master~~-p</code> (opens in less editor) ###Note: This is just to help you verify that your commit took effect correctly. If it didn't, there were likely errors in one or more of the above steps. #Now git any updates that may have occurred since you last did a <code>git clone</code> or a <code>git fetch</code>▼ ##<code>$ git ~~fetch~~format-patch origin/master</code> ▲#Now ~~git~~fetch any updates that may have occurred since you last did a <code>git clone</code> or a <code>git fetch</code> ~~##<code>gitk</code>~~ ##<code>~~git~~$ ~~rebase~~git ~~origin/master~~fetch</code> ##<code>$ git ~~log~~rebase origin/master</code> ▲##<code>$ git log -p</code> ~~(opens in less editor)~~ ###Note: This is just to help you verify that your commit took effect correctly. If it didn't, there were likely errors in one or more of the above steps. = Submitting a patch = Find your patch file that has been generated from the <code>git format-patch</code> command. In your current directory you can run <code>ls -lrt</code> which will list your files in time-sort order. Listing the newest modified files at the bottom. Look for the file similar to <code>0002-Updated-the-default-case-for-people-search-AllTagsQu.patch</code>. This file or these files will need to be added to the bug tracker... if we are still doing this. The alternative is just using github, which some people are starting to look into. Note: The <code>git log</code> and <code>gitk</code> commands aren't modifying your patch, these commands are run to track your changes, and see what state your patch is in, in comparison to the origin = Other useful commands = Line 29 ⟶ 38: = Resources = * http://~~help~~gitref.~~github.com/git-cheat-sheets~~org/ * http://git-scm.com/documentation = See also = * [[How to generate patches with git format-patch]] * [[How we handle patches]] [[Category:Hacking_OpenHatch]] [[Category:Git_OpenHatch]]