[haiku-development] Re: GIT help

  • From: Simon Taylor <simontaylor1@xxxxxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Wed, 03 Apr 2013 09:46:48 +0100

On 03/04/2013 01:48, Pete Goodeve wrote:
Here's what I've been doing (or trying to do):

On Ingo's suggestion I moved the patchbay directory myself from
  .../src/tests/kits/midi to .../src/apps, modified all the relevant jamfiles,
and checked that it compiled.

Ingo did say to do it in a separate commit. One of the things with git is that you should not be at all afraid of doing commits - they're only local to your copy of the repository and you can always rearrange them later before you submit a patch.

It worries me a bit that some files are "renamed" and others are "deleted/new 
as they have essentially all been modified, and moved as a group, but never 

If you had committed just the modifications first (git commit -m "Update PatchBay coding standards, use Haiku Tooltips") and followed that by moving the files then git would have found it easier to track them all as renames.

It looks like you're trying to use the SVN workflow (prepare all modifications as changes in your working copy, and submit a general diff). In git as you have a local copy of the repository the best workflow is slightly different - you actually want to commit (perhaps multiple times) as you're working. The commits will only affect your local copy so don't panic about committing! Once you have your local repository in good shape (with all the changes you want in nicely described commits) then git format-patch will package your changes up in a way that can then easily be applied to the main Haiku repository (including all the meta-data for the commits - author name, date, and commit message).


Other related posts: