X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=apply.c;h=f15afa9f6af98ae41af60eb2296ee35d38ccc7fd;hb=31f5256c82a36edea3ea2f91e5171e3472878915;hp=beed3091d2a347116a11cb4b593a70b2c90406f8;hpb=96e6547c2e4c137222c01582b52c0c974a02fd63;p=thirdparty%2Fgit.git

diff --git a/apply.c b/apply.c
index beed3091d2..f15afa9f6a 100644
--- a/apply.c
+++ b/apply.c
@@ -56,6 +56,10 @@ static int parse_whitespace_option(struct apply_state *state, const char *option
 		state->ws_error_action = correct_ws_error;
 		return 0;
 	}
+	/*
+	 * Please update $__git_whitespacelist in git-completion.bash
+	 * when you add new options.
+	 */
 	return error(_("unrecognized whitespace option '%s'"), option);
 }
 
@@ -3182,7 +3186,7 @@ static int apply_binary(struct apply_state *state,
 		return 0; /* deletion patch */
 	}
 
-	if (has_sha1_file(oid.hash)) {
+	if (has_object_file(&oid)) {
 		/* We already have the postimage */
 		enum object_type type;
 		unsigned long size;