diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-10-15 22:07:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-16 11:05:51 +0900 |
| commit | 1053fe829c037c5a725786bac35d05a113c91f55 (patch) | |
| tree | e8abb9e7099dc3b76c1ea63c5a6c1401338feb78 /diff-lib.c | |
| parent | bcd29864737099ff78de3db8b1d518f2aea51bc9 (diff) | |
| download | git-1053fe829c037c5a725786bac35d05a113c91f55.tar.gz git-1053fe829c037c5a725786bac35d05a113c91f55.tar.xz | |
Convert remaining callers of resolve_gitlink_ref to object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index 4e0980caa..af4f1b786 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -36,7 +36,7 @@ static int check_removed(const struct cache_entry *ce, struct stat *st) if (has_symlink_leading_path(ce->name, ce_namelen(ce))) return 1; if (S_ISDIR(st->st_mode)) { - unsigned char sub[20]; + struct object_id sub; /* * If ce is already a gitlink, we can have a plain @@ -50,7 +50,7 @@ static int check_removed(const struct cache_entry *ce, struct stat *st) * a directory --- the blob was removed! */ if (!S_ISGITLINK(ce->ce_mode) && - resolve_gitlink_ref(ce->name, "HEAD", sub)) + resolve_gitlink_ref(ce->name, "HEAD", sub.hash)) return 1; } return 0; |