Merge branch 'tr/maint-apply-non-git-patch-parsefix'

gitster · gitster · commit ad76feb55eb7 · 2013-06-26T15:08:09.000-07:00
Fix for the codepath to parse patches that add new files, generated
by programs other than Git.  THis is an old breakage in v1.7.11 and
will need to be merged down to the maintanance tracks.

* tr/maint-apply-non-git-patch-parsefix:
  apply: carefully strdup a possibly-NULL name
diff --git a/builtin/apply.c b/builtin/apply.c
@@ -906,7 +906,7 @@ static void parse_traditional_patch(const char *first, const char *second, struc
 			patch->old_name = name;
 		} else {
 			patch->old_name = name;
-			patch->new_name = xstrdup(name);
+			patch->new_name = null_strdup(name);
 		}
 	}
 	if (!name)
diff --git a/t/t4111-apply-subdir.sh b/t/t4111-apply-subdir.sh
@@ -86,6 +86,20 @@ test_expect_success 'apply --index from subdir of toplevel' '
 	test_cmp expected sub/dir/file
 '
 
+test_expect_success 'apply half-broken patch from subdir of toplevel' '
+	(
+		cd sub/dir &&
+		test_must_fail git apply <<-EOF
+		--- sub/dir/file
+		+++ sub/dir/file
+		@@ -1,0 +1,0 @@
+		--- file_in_root
+		+++ file_in_root
+		@@ -1,0 +1,0 @@
+		EOF
+	)
+'
+
 test_expect_success 'apply from .git dir' '
 	cp postimage expected &&
 	cp preimage .git/file &&

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ static void parse_traditional_patch(const char first, const char second, struc`
`906`	`906`	`patch->old_name = name;`
`907`	`907`	`} else {`
`908`	`908`	`patch->old_name = name;`
`909`		`- patch->new_name = xstrdup(name);`
	`909`	`+ patch->new_name = null_strdup(name);`
`910`	`910`	`}`
`911`	`911`	`}`
`912`	`912`	`if (!name)`