summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-01-21 02:17:19 +0100
committerJunio C Hamano <junkio@cox.net>2007-01-20 19:05:20 -0800
commitcd554bb1733feb98ecee647176d0328cab53c2b7 (patch)
treead409593e9da5581a22e9000bb6d228e726aafd7 /builtin-apply.c
parent16bfefeebcac375ff51652eb8b866b7b65cb4905 (diff)
downloadgit-cd554bb1733feb98ecee647176d0328cab53c2b7.tar.gz
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>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 54fd2cb0c7..3fefdacd94 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;