Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sha1-file: avoid "sha1 file" for generic use in messages
[gitweb.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index 01793d612620246b14fa57f6ce3ed6c33df65d0f..b8e257ead24a3fe19b0dc9585f471a70b570730f 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-3183,7
+3183,7
@@
static int apply_binary(struct apply_state *state,
return 0; /* deletion patch */
}
- if (has_
sha1_file(oid.hash
)) {
+ if (has_
object_file(&oid
)) {
/* We already have the postimage */
enum object_type type;
unsigned long size;