diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:47 -0700 |
| commit | 5ac913c6eb266e836f91c39c3b03bcbdc06475c6 (patch) | |
| tree | 46b906fb7cce225a5801b11228bb7182255dc653 /builtin | |
| parent | 6dcb462530b1142a0fc1ad326dfd68ce1cde7387 (diff) | |
| download | git-5ac913c6eb266e836f91c39c3b03bcbdc06475c6.tar.gz | |
resolve-undo: convert struct resolve_undo_info to object_id
Convert the sha1 member of this struct to be an array of struct
object_id instead. This change is needed to convert find_unique_abbrev.
Convert some instances of hard-coded constants to use the_hash_algo as
well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 2fc836e330..9df66ba307 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -271,7 +271,7 @@ static void show_ru_info(const struct index_state *istate) if (!ui->mode[i]) continue; printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i], - find_unique_abbrev(ui->sha1[i], abbrev), + find_unique_abbrev(ui->oid[i].hash, abbrev), i + 1); write_name(path); } |