X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=apply.c;h=964df2db10c22d6ed0b89532e0af8cf9a43e607c;hb=d154dcc8b62ff609a0a3b271e1665c53df5c06a5;hp=81607c0fb6f39a0fb177a16b5f8c7353e97936aa;hpb=f69714c38c6f3296a4bfba0d057e0f1605373f49;p=git.git

diff --git a/apply.c b/apply.c
index 81607c0f..964df2db 100644
--- 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;
@@ -1043,8 +1047,12 @@ static int check_patch(struct patch *patch)
 			return error("%s: already exists in working directory", new_name);
 		if (errno != ENOENT)
 			return error("%s: %s", new_name, strerror(errno));
-		if (!patch->new_mode)
-			patch->new_mode = S_IFREG | 0644;
+		if (!patch->new_mode) {
+			if (patch->is_new)
+				patch->new_mode = S_IFREG | 0644;
+			else
+				patch->new_mode = patch->old_mode;
+		}
 	}
 
 	if (new_name && old_name) {
@@ -1373,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)