kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
brian m. carlson 2018-03-12 02:27:25 +00:00 committed by Junio C Hamano
parent 6dcb462530
commit 5ac913c6eb
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/ls-files.c
View File

@ -271,7 +271,7 @@ static void show_ru_info(const struct index_state *istate)
if (!ui->mode[i]) if (!ui->mode[i])
continue; continue;
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i], 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); i + 1);
write_name(path); write_name(path);
} }

15
resolve-undo.c
View File

@ -24,7 +24,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
if (!lost->util) if (!lost->util)
lost->util = xcalloc(1, sizeof(*ui)); lost->util = xcalloc(1, sizeof(*ui));
ui = lost->util; ui = lost->util;
hashcpy(ui->sha1[stage - 1], ce->oid.hash); oidcpy(&ui->oid[stage - 1], &ce->oid);
ui->mode[stage - 1] = ce->ce_mode; ui->mode[stage - 1] = ce->ce_mode;
} }


@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (!ui->mode[i]) if (!ui->mode[i])
continue; continue;
strbuf_add(sb, ui->sha1[i], 20); strbuf_add(sb, ui->oid[i].hash, the_hash_algo->rawsz);
} }
} }
} }
@ -55,6 +55,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
size_t len; size_t len;
char *endptr; char *endptr;
int i; int i;
const unsigned rawsz = the_hash_algo->rawsz;


resolve_undo = xcalloc(1, sizeof(*resolve_undo)); resolve_undo = xcalloc(1, sizeof(*resolve_undo));
resolve_undo->strdup_strings = 1; resolve_undo->strdup_strings = 1;
@ -87,11 +88,11 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (!ui->mode[i]) if (!ui->mode[i])
continue; continue;
if (size < 20) if (size < rawsz)
goto error; goto error;
hashcpy(ui->sha1[i], (const unsigned char *)data); memcpy(ui->oid[i].hash, (const unsigned char *)data, rawsz);
size -= 20; size -= rawsz;
data += 20; data += rawsz;
} }
} }
return resolve_undo; return resolve_undo;
@ -145,7 +146,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
struct cache_entry *nce; struct cache_entry *nce;
if (!ru->mode[i]) if (!ru->mode[i])
continue; continue;
nce = make_cache_entry(ru->mode[i], ru->sha1[i], nce = make_cache_entry(ru->mode[i], ru->oid[i].hash,
name, i + 1, 0); name, i + 1, 0);
if (matched) if (matched)
nce->ce_flags |= CE_MATCHED; nce->ce_flags |= CE_MATCHED;

2
resolve-undo.h
View File

@ -3,7 +3,7 @@


struct resolve_undo_info { struct resolve_undo_info {
unsigned int mode[3]; unsigned int mode[3];
unsigned char sha1[3][20]; struct object_id oid[3];
}; };


extern void record_resolve_undo(struct index_state *, struct cache_entry *); extern void record_resolve_undo(struct index_state *, struct cache_entry *);