Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po
[gitweb.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index beed3091d2a347116a11cb4b593a70b2c90406f8..892ede5a318f751c80fcceab036a8cbaee391774 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-3182,7
+3182,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;