diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-04 00:12:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-04 00:12:19 -0800 |
| commit | b63bc0bc3152ca42ba1c9fa9bed73da061beeca2 (patch) | |
| tree | 709ceb2c6c62fa58f4d694599374ef10ac305cfe /builtin-apply.c | |
| parent | 738a94a9f645a5f63fbccaab76d5e43a97e53d78 (diff) | |
| parent | f0817310903312bbc243dd80f066e17a8e0e4b1d (diff) | |
| download | git-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.gz git-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.xz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 1e7f917d3..f312798af 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) |