-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Hi,
Something is still wrong with the submission:
$ git am ~/Desktop/[PATCH\ 1_2]\ reg:\ simplify\ root\ key\ search\ -\ Michel\ Zou\ <xantares09@hotmail.com>\ -\ 2015-08-25\ 2150.eml Applying: reg: simplify root key search /home/stefan/src/wine/.git/rebase-apply/patch:33: trailing whitespace. static const WCHAR short_hklm[] = {'H','K','L','M',0}; /home/stefan/src/wine/.git/rebase-apply/patch:34: trailing whitespace. static const WCHAR short_hkcu[] = {'H','K','C','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:35: trailing whitespace. static const WCHAR short_hkcr[] = {'H','K','C','R',0}; /home/stefan/src/wine/.git/rebase-apply/patch:36: trailing whitespace. static const WCHAR short_hku[] = {'H','K','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:37: trailing whitespace. static const WCHAR short_hkcc[] = {'H','K','C','C',0}; error: patch failed: programs/reg/reg.c:22 error: programs/reg/reg.c: patch does not apply Patch failed at 0001 reg: simplify root key search
It looks like the patch has Windows line endings, but AFAIK that shouldn't break git am.
I strongly recommend to use git send-email to make git send the patches directly to the SMTP server instead of going through text files and MUAs. That avoids issues like that pretty reliably.
Hi, I used git send imap to send it to my drafts folder, but it looks like the rich text edit formatting was enabled. I'll try to enable plain text edit or use send-email, thanks.
----------------------------------------
Subject: Re: [PATCH 1/2] reg: simplify root key search To: wine-devel@winehq.org; xantares09@hotmail.com From: stefandoesinger@gmail.com Date: Wed, 26 Aug 2015 14:04:10 +0200
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Hi,
Something is still wrong with the submission:
$ git am ~/Desktop/[PATCH\ 1_2]\ reg:\ simplify\ root\ key\ search\ -\ Michel\ Zou\ <xantares09@hotmail.com>\ -\ 2015-08-25\ 2150.eml Applying: reg: simplify root key search /home/stefan/src/wine/.git/rebase-apply/patch:33: trailing whitespace. static const WCHAR short_hklm[] = {'H','K','L','M',0}; /home/stefan/src/wine/.git/rebase-apply/patch:34: trailing whitespace. static const WCHAR short_hkcu[] = {'H','K','C','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:35: trailing whitespace. static const WCHAR short_hkcr[] = {'H','K','C','R',0}; /home/stefan/src/wine/.git/rebase-apply/patch:36: trailing whitespace. static const WCHAR short_hku[] = {'H','K','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:37: trailing whitespace. static const WCHAR short_hkcc[] = {'H','K','C','C',0}; error: patch failed: programs/reg/reg.c:22 error: programs/reg/reg.c: patch does not apply Patch failed at 0001 reg: simplify root key search
It looks like the patch has Windows line endings, but AFAIK that shouldn't break git am.
I strongly recommend to use git send-email to make git send the patches directly to the SMTP server instead of going through text files and MUAs. That avoids issues like that pretty reliably.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2
iQIcBAEBAgAGBQJV3as6AAoJEN0/YqbEcdMwEfYP/1ibDcxPQ9VF6tKyfQKVeuVW cC1rFbAbbXdWPxALIiJa/qEz/3DKV4j1tIvU68GA6SE5gh4XLsVfH1Li66PX3KQy 6ytqG263r677dDxjTPIJHOTsl4ncFvCVHkVz3cn9zBLM3G6V8BLeL4rCVFq1Wso0 pNS5abhVQNzDTY+gLG2oh9XqtLuI2oAmF6YO/VklVKF8pVwN50RX7FXJuGwlhScn +6GvzOLrkirbTL1jKW+v+4BZ22CjzGRZPVMGPlmgGIdyexVjoG8nAlfvLoH6+Qds 6WQatGcHFNnJjE275Snl9EjnspfedMLcYWspbbC7IsWDvdMrt8LawUGDOyZsqxzC yUYnMHNaotC7K0FpqHG+OKTRgrJy8dX10xSkTAhj6FtLj49BFhNb7hWsqc3T//g6 GlcmCYxWXNmseOt5t5E/v4eb9XowBab9Mv4zNU8sFZWlfUvbv3vMnhfzjslZnHNY h+yBR9OQZiKInPsHxW3wsuIIt0xBjPE1RHUac9vfPc031PvjqYulQ2PfQkUyljo2 vHwqCU6i9S8Y2INd7PwOggoHqE9SKMFvaRg9Tf5vOiG9YQHtaTWHj+xgQsb5DRxd QWV+uK0gZW2UX0ozxzrCK2Kd5mEhTRd/dVZK75/ALoprf2r7aqU7gS+4aQYActlL LIk5K82tvISRR7QdN0KN =cTjQ -----END PGP SIGNATURE-----
-
Michel Zou -
Stefan Dösinger