[RFC PATCH v3 0/5] add JSON output to net ads
slow at samba.org
Thu Jul 12 12:32:47 UTC 2018
On Thu, Jul 12, 2018 at 11:55:38AM +0200, Philipp Gesang wrote:
>-<| Quoting Ralph Böhme via samba-technical <slow at samba.org>, on Thursday, 2018-07-12 11:21:20 AM |>-
>> On Thu, Jul 12, 2018 at 10:46:05AM +0200, Philipp Gesang wrote:
>> > -<| Quoting Ralph Böhme <slow at samba.org>, on Thursday, 2018-07-12 09:43:54 AM |>-
>> > > can you please send your patch as
>> > >
>> > > $ git format-patch --stdout > patch.patch
>> > noted for the next submission.
>> > However, that creates an mbox.
>> Where? On my box
>> $ git format-patch COMMIT_RANGE --stdout > patch.patch
>> creates just a file, eg
> Print all commits to the standard output in **mbox**
> format, instead of creating a file for each one.
Yeah, sure, it's an mbox formally, but as far as my git workflow is concerned,
it's just a patchset in a neat file. :)))
>> $ git format-patch -2 origin/master --stdout > patch.patch
>> example attached.
>Yup, that’s an mbox. It has the customary "From …" lines for each
>> Once you get to know it, you will never look back. :)
>Honestly, I’m on the fence: I can’t seem to get the output
>applied with git-am.
Which patchset? The one I had sent? That was created from upstream master, so
you may already have the patches in your local branch. Or they don't apply for
whatever reason, not different at all from applying individual patches.
Ralph Boehme, Samba Team https://samba.org/
Samba Developer, SerNet GmbH https://sernet.de/en/samba/
GPG Key Fingerprint: FAE2 C608 8A24 2520 51C5
59E4 AA1E 9B71 2639 9E46
More information about the samba-technical