[PATCH 1/2] reg: simplify root key search

Wed Aug 26 07:04:10 CDT 2015

-----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.