Re: Sending commits to Org

[Philipp Kroos <Philipp.Kroos@t-online.de>]

Hi,

I think you're still on master when you make your changes.
git maintains your *local copy* of master as 'master', whereas the 
original, unchanged upstream branch master is still available as 
'origin/master'. You create a patch against a different branch, and 
since you are on 'master' which differs from 'origin/master', it works 
like you described.
If you first create a branch on your side and switch to it before making 
changes, you can run format-patch against your local copy of master as 
well.
That is,

#+begin_src sh
  git branch local
  git checkout local
  # make your changes
  git commit -m "Your message"
  git format-patch master
#+end_src          ^^^^^^

This is also the procedure described in 
http://orgmode.org/worg/org-contribute.html#sec-4
under *Sending commits, and it should work fine this way.

philipp


On Thu, Sep 20, 2012 at 01:40:55PM +0200, Sebastien Vauban wrote:
> Hello,
> 
> Just a Git question that puzzles me for long about how to send commits per
> email to Org ML?
> 
> In the documentation (http://orgmode.org/worg/org-contribute.html), it's
> written:
> 
> #+begin_src sh
>   git commit -m "Your message"
>   git format-patch master
> #+end_src          ^^^^^^
> 
> When I follow it, there is no 0001-patch.txt file created...
> 
> I must write:
> 
> #+begin_src sh
>   git format-patch origin/master
> #+end_src          ^^^^^^^^^^^^^
> 
> for such patch files to be created. Is it a documentation bug, or some feature
> of my (Git) installation?
> 
> Best regards,
>   Seb
> 
> 
> -- 
> Sebastien Vauban
> 
>