X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fapply.c;h=f38c1f7b88fafa18550762685e3bb5b15bfa701f;hb=4265ee3e6e391709168cc507c1c9bb705392cdfe;hp=12ef9ea8afb0aa1e554e3ce6c6085e97ff7e7466;hpb=7d808125a0197e5660a57f77d14937604b16e39a;p=git.git

diff --git a/builtin/apply.c b/builtin/apply.c
index 12ef9ea8a..f38c1f7b8 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -2979,8 +2979,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
 		else if (get_sha1(patch->old_sha1_prefix, sha1))
 			/* git diff has no index line for mode/type changes */
 			if (!patch->lines_added && !patch->lines_deleted) {
-				if (get_current_sha1(patch->new_name, sha1) ||
-				    get_current_sha1(patch->old_name, sha1))
+				if (get_current_sha1(patch->old_name, sha1))
 					die("mode change for %s, which is not "
 						"in current HEAD", name);
 				sha1_ptr = sha1;