mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: convert get_stat_data to struct object_id

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-05-30 10:30:45 -07:00
committed by Junio C Hamano
parent 1c41c82bc4
commit 362d765915
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
diff-lib.c
View File

@ -264,12 +264,12 @@ static void diff_index_show_file(struct rev_info *revs,
} }
static int get_stat_data(const struct cache_entry *ce, static int get_stat_data(const struct cache_entry *ce,
const unsigned char **sha1p, const struct object_id **oidp,
unsigned int *modep, unsigned int *modep,
int cached, int match_missing, int cached, int match_missing,
unsigned *dirty_submodule, struct diff_options *diffopt) unsigned *dirty_submodule, struct diff_options *diffopt)
{ {
const unsigned char *sha1 = ce->oid.hash; const struct object_id *oid = &ce->oid;
unsigned int mode = ce->ce_mode; unsigned int mode = ce->ce_mode;
if (!cached && !ce_uptodate(ce)) { if (!cached && !ce_uptodate(ce)) {
@ -280,7 +280,7 @@ static int get_stat_data(const struct cache_entry *ce,
return -1; return -1;
else if (changed) { else if (changed) {
if (match_missing) { if (match_missing) {
*sha1p = sha1; *oidp = oid;
*modep = mode; *modep = mode;
return 0; return 0;
} }
@ -290,11 +290,11 @@ static int get_stat_data(const struct cache_entry *ce,
0, dirty_submodule); 0, dirty_submodule);
if (changed) { if (changed) {
mode = ce_mode_from_stat(ce, st.st_mode); mode = ce_mode_from_stat(ce, st.st_mode);
sha1 = null_sha1; oid = &null_oid;
} }
} }
*sha1p = sha1; *oidp = oid;
*modep = mode; *modep = mode;
return 0; return 0;
} }
@ -303,7 +303,7 @@ static void show_new_file(struct rev_info *revs,
const struct cache_entry *new, const struct cache_entry *new,
int cached, int match_missing) int cached, int match_missing)
{ {
const unsigned char *sha1; const struct object_id *oid;
unsigned int mode; unsigned int mode;
unsigned dirty_submodule = 0; unsigned dirty_submodule = 0;
@ -311,11 +311,11 @@ static void show_new_file(struct rev_info *revs,
* New file in the index: it might actually be different in * New file in the index: it might actually be different in
* the working tree. * the working tree.
*/ */
if (get_stat_data(new, &sha1, &mode, cached, match_missing, if (get_stat_data(new, &oid, &mode, cached, match_missing,
&dirty_submodule, &revs->diffopt) < 0) &dirty_submodule, &revs->diffopt) < 0)
return; return;
diff_index_show_file(revs, "+", new, sha1, !is_null_sha1(sha1), mode, dirty_submodule); diff_index_show_file(revs, "+", new, oid->hash, !is_null_oid(oid), mode, dirty_submodule);
} }
static int show_modified(struct rev_info *revs, static int show_modified(struct rev_info *revs,
@ -325,10 +325,10 @@ static int show_modified(struct rev_info *revs,
int cached, int match_missing) int cached, int match_missing)
{ {
unsigned int mode, oldmode; unsigned int mode, oldmode;
const unsigned char *sha1; const struct object_id *oid;
unsigned dirty_submodule = 0; unsigned dirty_submodule = 0;
if (get_stat_data(new, &sha1, &mode, cached, match_missing, if (get_stat_data(new, &oid, &mode, cached, match_missing,
&dirty_submodule, &revs->diffopt) < 0) { &dirty_submodule, &revs->diffopt) < 0) {
if (report_missing) if (report_missing)
diff_index_show_file(revs, "-", old, diff_index_show_file(revs, "-", old,
@ -338,7 +338,7 @@ static int show_modified(struct rev_info *revs,
} }
if (revs->combine_merges && !cached && if (revs->combine_merges && !cached &&
(hashcmp(sha1, old->oid.hash) || oidcmp(&old->oid, &new->oid))) { (oidcmp(oid, &old->oid) || oidcmp(&old->oid, &new->oid))) {
struct combine_diff_path *p; struct combine_diff_path *p;
int pathlen = ce_namelen(new); int pathlen = ce_namelen(new);
@ -362,12 +362,12 @@ static int show_modified(struct rev_info *revs,
} }
oldmode = old->ce_mode; oldmode = old->ce_mode;
if (mode == oldmode && !hashcmp(sha1, old->oid.hash) && !dirty_submodule && if (mode == oldmode && !oidcmp(oid, &old->oid) && !dirty_submodule &&
!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
return 0; return 0;
diff_change(&revs->diffopt, oldmode, mode, diff_change(&revs->diffopt, oldmode, mode,
old->oid.hash, sha1, 1, !is_null_sha1(sha1), old->oid.hash, oid->hash, 1, !is_null_oid(oid),
old->name, 0, dirty_submodule); old->name, 0, dirty_submodule);
return 0; return 0;
} }