X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=apply.c;h=849a8b4485e65c7eac315daca60b781965a1d22e;hb=ee5c78434a997116e048055e363330d6d346c8f4;hp=9deb206faa5259e4f4f0a458ddc14dd4762da10b;hpb=6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1;p=git.git

diff --git a/apply.c b/apply.c
index 9deb206f..849a8b44 100644
--- a/apply.c
+++ b/apply.c
@@ -32,7 +32,7 @@ static int no_add = 0;
 static int show_index_info = 0;
 static int line_termination = '\n';
 static const char apply_usage[] =
-"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] <patch>...";
+"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
 
 static enum whitespace_eol {
 	nowarn_whitespace,
@@ -1402,7 +1402,8 @@ static int check_patch(struct patch *patch)
 				costate.not_new = 0;
 				costate.refresh_cache = 1;
 				if (checkout_entry(active_cache[pos],
-						   &costate) ||
+						   &costate,
+						   NULL) ||
 				    lstat(old_name, &st))
 					return -1;
 			}