From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sun, 21 Jan 2007 01:17:19 +0000 (+0100)
Subject: apply --cached: fix crash in subdirectory
X-Git-Tag: v1.5.0-rc2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd554bb1733feb98ecee647176d0328cab53c2b7;p=git.git

apply --cached: fix crash in subdirectory

The static variable "prefix" was shadowed by an unused parameter
of the same name. In case of execution in a subdirectory, the
static variable was accessed, leading to a crash.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---

diff --git a/builtin-apply.c b/builtin-apply.c
index 54fd2cb0c..3fefdacd9 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2589,7 +2589,7 @@ static int git_apply_config(const char *var, const char *value)
 }
 
 
-int cmd_apply(int argc, const char **argv, const char *prefix)
+int cmd_apply(int argc, const char **argv, const char *unused_prefix)
 {
 	int i;
 	int read_stdin = 1;