From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Moritz Warning <moritz.warning@uni-bielefeld.de>
Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Remove footer from originators list
Date: Tue, 16 Oct 2012 15:05:50 +0200 [thread overview]
Message-ID: <4628598.0JAcKPgsKO@bentobox> (raw)
In-Reply-To: <14969_1350392034_ZZi171PvmcSCs.00_507D5688.1010203@uni-bielefeld.de>
[-- Attachment #1: Type: text/plain, Size: 2030 bytes --]
On Tuesday 16 October 2012 14:43:52 Moritz Warning wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> This patch would make the output consistent with the "batctl tg" output
> by sending no output if there is no entry to be displayed.
>
> The intention is to make it easier to parse the output using console
> facilities. Of course you could use grep -v "^No" to filter out this line,
> but that would be ugly and somewhat harsh for low performance machines such
> as routers and big tables (I haven't done benchmarks in this regard).
> This also helps the intention of the -H patch
> (https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-October/008143.html
> ).
>
> Relevant ticket: http://www.open-mesh.org/issues/165
>
> Signed-off-by: Moritz Warning <moritzwarning at web.de>
$ git am -3 ~/\[B.A.T.M.A.N.\]\ \[PATCH\]\ batman-adv_Remove\ footer\ from\
originators\ list.mbox
Applying: batman-adv: Remove footer from originators list
fatal: patch fragment without header at line 5: @@ -467,9 +467,6 @@ next:
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 batman-adv: Remove footer from originators list
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
$ patch -p1 -i ~/\[B.A.T.M.A.N.\]\ \[PATCH\]\ batman-adv_Remove\ footer\ from\
originators\ list.mbox
patching file originator.c
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n] y
Hunk #1 FAILED at 467.
1 out of 1 hunk FAILED -- saving rejects to file originator.c.rej
Please read
http://www.open-mesh.org/projects/open-mesh/wiki/Contribute#Submitting-patches
Also make your patch more clean by also removing the batman_count variable...
And don't write things like "This patch would....". Relevant documentation can
also be found in Documentation/SubmittingPatches
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2012-10-16 13:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-16 12:43 [B.A.T.M.A.N.] [PATCH] batman-adv: Remove footer from originators list Moritz Warning
2012-10-16 13:05 ` Sven Eckelmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4628598.0JAcKPgsKO@bentobox \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=moritz.warning@uni-bielefeld.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.