summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-04 08:12:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-04 08:12:19 (GMT)
commitb63bc0bc3152ca42ba1c9fa9bed73da061beeca2 (patch)
tree709ceb2c6c62fa58f4d694599374ef10ac305cfe /builtin-apply.c
parent738a94a9f645a5f63fbccaab76d5e43a97e53d78 (diff)
parentf0817310903312bbc243dd80f066e17a8e0e4b1d (diff)
downloadgit-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.zip
git-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.gz
git-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.bz2
Merge branch 'maint'
* maint: 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 Conflicts: Makefile
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 1e7f917..f312798 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2441,7 +2441,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)