Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Make the 'lock file' exists error more informative
[gitweb.git]
/
builtin-apply.c
diff --git
a/builtin-apply.c
b/builtin-apply.c
index 1e7f917d3908c0c2f70c7208cb8b0839782849e4..f312798af38553e0badeda9732736a62460eae05 100644
(file)
--- 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)