summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2018-05-02 00:25:33 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-02 13:59:49 +0900
commit14c3c80c81418e00ee990a88f526ac851411f422 (patch)
tree31c3912c6769a4666d80e368cb1280ab4426b0fa /diff.c
parentpackfile: remove unused member from struct pack_entry (diff)
downloadtgif-14c3c80c81418e00ee990a88f526ac851411f422.tar.xz
packfile: convert has_sha1_pack to object_id
Convert this function to take a pointer to struct object_id and rename it has_object_pack for consistency with has_object_file. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 1289df4b1f..314c57e3c0 100644
--- a/diff.c
+++ b/diff.c
@@ -3472,7 +3472,7 @@ static int reuse_worktree_file(const char *name, const struct object_id *oid, in
* objects however would tend to be slower as they need
* to be individually opened and inflated.
*/
- if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(oid->hash))
+ if (!FAST_WORKING_DIRECTORY && !want_file && has_object_pack(oid))
return 0;
/*