diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-04-17 23:10:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 14:23:42 -0700 |
| commit | 7d924c9139e33e7599d7aed0446e634c427a5f15 (patch) | |
| tree | 61d1667fff3d183398d5223d86805ec44264a518 /match-trees.c | |
| parent | 82db3d44e7a9d9219dd8e19607026bae9e435012 (diff) | |
| download | git-7d924c9139e33e7599d7aed0446e634c427a5f15.tar.gz | |
struct name_entry: use struct object_id instead of unsigned char sha1[20]
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'match-trees.c')
| -rw-r--r-- | match-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/match-trees.c b/match-trees.c index 9977752a67..751f8f2011 100644 --- a/match-trees.c +++ b/match-trees.c @@ -104,7 +104,7 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2) else if (cmp > 0) /* path2 does not appear in one */ score += score_missing(e2.mode, e2.path); - else if (hashcmp(e1.sha1, e2.sha1)) + else if (oidcmp(e1.oid, e2.oid)) /* they are different */ score += score_differs(e1.mode, e2.mode, e1.path); else |