[aur-dev] Git workflow

[Loui Chang]

On Wed 23 Jun 2010 16:19 -0400, Denis Kobozev wrote:
> Is there a suggested workflow for working with AUR git repo? Suppose I
> do the following:
> 
> $ git clone git://projects.archlinux.org/aur.git
> # code/test feature A
> $ git commit -a # commit feature A to my local branch
> $ git format-patch origin # create a patch with feature A
> # send patch with feature A to origin, patch applied to origin with git am
> 
> Now branches look like this:
> 
> ---o---o---A'   origin/master
>         \
>          \---A  local/master
> 
> I do a `git pull` from my local branch and get:
> 
> ---o---o---A'---    origin/master
>         \       \
>          \---A---M  local/master
> 
> I then work on feature B and commit it to my local branch:
> 
> ---o---o---A'---                origin/master
>         \       \
>          \---A---M---o---B      local/master
> 
> Then I do `git format-patch origin` and get two patches, both for A
> and B, even though A is already in origin as A'.
> 
> Is there a better way to do this?

You can rebase, but that is not recommended if you are sharing your
branches with others via http, or other transfer protocol. It's fine if
you're only sending patches via email.