Re: [PATCH 1/2] tests: add very long mount line to libmount mtab

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



 Hi Kees,

On Wed, Aug 26, 2015 at 03:01:41PM -0700, Kees Cook wrote:
>  tests/expected/libmount/tabfiles-parse-mtab    | 7 +++++++
>  tests/expected/libmount/tabfiles-py-parse-mtab | 7 +++++++
>  tests/ts/libmount/files/mtab                   | 1 +
>  3 files changed, 15 insertions(+)

I have problem to apply the patch

$ git am -i ...

Applying: tests: add very long mount line to libmount mtab
fatal: corrupt patch at line 28
Patch failed at 0001 tests: add very long mount line to libmount mtab
The copy of the patch that failed is found in:
   /home/projects/util-linux/util-linux/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

...

# patch -p1 < /home/projects/util-linux/util-linux/.git/rebase-apply/patch
patching file tests/expected/libmount/tabfiles-parse-mtab
patch: **** malformed patch at line 18


... etc.

It would be probably better to publish the patch on github or send it
as gzip.

    Karel

-- 
 Karel Zak  <kzak@xxxxxxxxxx>
 http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux