Squelch `removal' message from 'git reset --hard'.

diff --git a/apply.c b/apply.c
index 7c1a8411f21ee42d095e6c5a515987ef2a6f779a..964df2db10c22d6ed0b89532e0af8cf9a43e607c 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -387,7 +387,7 @@ static char *git_header_name(char *line)
                default:
                        continue;
                case '\n':
-                       break;
+                       return NULL;
                case '\t': case ' ':
                        second = name+len;
                        for (;;) {
@@ -672,9 +672,13 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
                        added++;
                        newlines--;
                        break;
-               /* We allow "\ No newline at end of file" */
+
+                /* We allow "\ No newline at end of file". Depending
+                 * on locale settings when the patch was produced we
+                 * don't know what this line looks like. The only
+                 * thing we do know is that it begins with "\ ". */
                case '\\':
-                       if (len < 12 || memcmp(line, "\\ No newline", 12))
+                       if (len < 12 || memcmp(line, "\\ ", 2))
                                return -1;
                        break;
                }
@@ -683,7 +687,7 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
         * it in the above loop because we hit oldlines == newlines == 0
         * before seeing it.
         */
-       if (12 < size && !memcmp(line, "\\ No newline", 12))
+       if (12 < size && !memcmp(line, "\\ ", 2))
                offset += linelen(line, size);
 
        patch->lines_added += added;
@@ -1377,7 +1381,7 @@ static struct excludes {
 
 static int use_patch(struct patch *p)
 {
-       const char *pathname = p->new_name ? : p->old_name;
+       const char *pathname = p->new_name ? p->new_name : p->old_name;
        struct excludes *x = excludes;
        while (x) {
                if (fnmatch(x->path, pathname, 0) == 0)