summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-03 23:50:09 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-03 23:50:09 -0800
commitf0817310903312bbc243dd80f066e17a8e0e4b1d (patch)
treefd619c9bf1e11ee6ea1ad5d6a000f96146f916b6 /builtin-apply.c
parent281907574ca420cc9a800190509adbf89bf9a2d1 (diff)
parent7a85f6ae88be5937c32a7b61601a40a02c03fb3f (diff)
downloadgit-f0817310903312bbc243dd80f066e17a8e0e4b1d.tar.gz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind
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 a8f75ed3ed..3b6cd6dfae 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2435,7 +2435,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
return error("%s: %s", old_name, strerror(errno));
}
- if (!cached)
+ if (!cached && !tpatch)
st_mode = ce_mode_from_stat(*ce, st->st_mode);
if (patch->is_new < 0)