[Libreoffice] git apply vs git am (was: Re: [PATCH] fix Kabyle_Algeria [kab_DZ] absent currency symbol)
kyoshida at novell.com
Mon Aug 1 08:23:36 PDT 2011
On Sat, 2011-07-30 at 14:58 -0400, Kohei Yoshida wrote:
> On Sat, 2011-07-30 at 17:43 +0200, Eike Rathke wrote:
> > Hi Kohei,
> > On Saturday, 2011-07-30 11:10:22 -0400, Kohei Yoshida wrote:
> > > Just committed your patch to master.
> > >
> > > http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=2315d239302e4b2aa65971bcaf5909654973ab5e
> > Thanks, but somehow svtools/source/misc/langtab.src is missing, only
> > the changes in i18npool were committed.
> Ah, sorry. The curse of split repositories. Fixed it just now.
So, I just noticed that, when applying patches via git apply, it does
not apply hunks that are outside the current directory. E.g. when
applying Eike's patch from inside i18npool, it did not apply the hunk
for svtools because it was outside that directory. Also, there was no
warnings of any sort.
git am, OTOH, applies all hunks regardless of where the current
directory is, provided that all hunks are in the same repository, or
else it will quit with a very loud error message.
I just wanted to mention this in case of similar problems in the future.
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida at novell.com>
More information about the LibreOffice