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>
brian m. carlson committed
Mar 12, 2018 at 02:27 UTC
5ac913c6eb266e836f91c39c3b03bcbdc06475c6
3 files changed
+10
-9
builtin/ls-files.c
+1
-1
@@ -271,7 +271,7 @@ static void show_ru_info(const struct index_state *istate)
271
if (!ui->mode[i])
272
continue;
273
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
274
- find_unique_abbrev(ui->sha1[i], abbrev),
274
+ find_unique_abbrev(ui->oid[i].hash, abbrev),
275
i + 1);
276
write_name(path);
277
}
resolve-undo.c
+8
-7
@@ -24,7 +24,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
24
if (!lost->util)
25
lost->util = xcalloc(1, sizeof(*ui));
26
ui = lost->util;
27
- hashcpy(ui->sha1[stage - 1], ce->oid.hash);
27
+ oidcpy(&ui->oid[stage - 1], &ce->oid);
28
ui->mode[stage - 1] = ce->ce_mode;
29
}
30
@@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
44
for (i = 0; i < 3; i++) {
45
if (!ui->mode[i])
46
continue;
47
- strbuf_add(sb, ui->sha1[i], 20);
47
+ strbuf_add(sb, ui->oid[i].hash, the_hash_algo->rawsz);
48
}
49
}
50
}
@@ -55,6 +55,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
55
size_t len;
56
char *endptr;
57
int i;
58
+ const unsigned rawsz = the_hash_algo->rawsz;
59
60
resolve_undo = xcalloc(1, sizeof(*resolve_undo));
61
resolve_undo->strdup_strings = 1;
@@ -87,11 +88,11 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
88
for (i = 0; i < 3; i++) {
89
if (!ui->mode[i])
90
continue;
90
- if (size < 20)
91
+ if (size < rawsz)
92
goto error;
92
- hashcpy(ui->sha1[i], (const unsigned char *)data);
93
- size -= 20;
94
- data += 20;
93
+ memcpy(ui->oid[i].hash, (const unsigned char *)data, rawsz);
94
+ size -= rawsz;
95
+ data += rawsz;
96
}
97
}
98
return resolve_undo;
@@ -145,7 +146,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
146
struct cache_entry *nce;
147
if (!ru->mode[i])
148
continue;
148
- nce = make_cache_entry(ru->mode[i], ru->sha1[i],
149
+ nce = make_cache_entry(ru->mode[i], ru->oid[i].hash,
150
name, i + 1, 0);
151
if (matched)
152
nce->ce_flags |= CE_MATCHED;
resolve-undo.h
+1
-1
@@ -3,7 +3,7 @@
3
4
struct resolve_undo_info {
5
unsigned int mode[3];
6
- unsigned char sha1[3][20];
6
+ struct object_id oid[3];
7
};
8
9
extern void record_resolve_undo(struct index_state *, struct cache_entry *);