mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-04 15:34:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

diff-lib: drop unused index argument from get_stat_data()

Browse Source 
The "struct index_state" parameter passed to get_stat_data() has been
unused since we stopped passing it to check_removed() in 6a044a2048
(diff-lib: fix check_removed when fsmonitor is on, 2023-09-11). We can
just drop it, which in turns lets us simplify our callers a bit.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2024-08-17 03:29:49 -04:00 committed by Junio C Hamano
parent 4d7de2cf6e
commit 72c9793c15
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
diff-lib.c
View File

@ -308,8 +308,7 @@ static void diff_index_show_file(struct rev_info *revs,
oid, oid_valid, ce->name, dirty_submodule); oid, oid_valid, ce->name, dirty_submodule);
} }
static int get_stat_data(const struct index_state *istate, static int get_stat_data(const struct cache_entry *ce,
const struct cache_entry *ce,
const struct object_id **oidp, const struct object_id **oidp,
unsigned int *modep, unsigned int *modep,
int cached, int match_missing, int cached, int match_missing,
@ -352,7 +351,6 @@ static void show_new_file(struct rev_info *revs,
const struct object_id *oid; const struct object_id *oid;
unsigned int mode; unsigned int mode;
unsigned dirty_submodule = 0; unsigned dirty_submodule = 0;
struct index_state *istate = revs->diffopt.repo->index;
if (new_file && S_ISSPARSEDIR(new_file->ce_mode)) { if (new_file && S_ISSPARSEDIR(new_file->ce_mode)) {
diff_tree_oid(NULL, &new_file->oid, new_file->name, &revs->diffopt); diff_tree_oid(NULL, &new_file->oid, new_file->name, &revs->diffopt);
@ -363,7 +361,7 @@ 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(istate, new_file, &oid, &mode, cached, match_missing, if (get_stat_data(new_file, &oid, &mode, cached, match_missing,
&dirty_submodule, &revs->diffopt) < 0) &dirty_submodule, &revs->diffopt) < 0)
return; return;
@ -379,7 +377,6 @@ static int show_modified(struct rev_info *revs,
unsigned int mode, oldmode; unsigned int mode, oldmode;
const struct object_id *oid; const struct object_id *oid;
unsigned dirty_submodule = 0; unsigned dirty_submodule = 0;
struct index_state *istate = revs->diffopt.repo->index;
assert(S_ISSPARSEDIR(old_entry->ce_mode) == assert(S_ISSPARSEDIR(old_entry->ce_mode) ==
S_ISSPARSEDIR(new_entry->ce_mode)); S_ISSPARSEDIR(new_entry->ce_mode));
@ -395,7 +392,7 @@ static int show_modified(struct rev_info *revs,
return 0; return 0;
} }
if (get_stat_data(istate, new_entry, &oid, &mode, cached, match_missing, if (get_stat_data(new_entry, &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_entry, diff_index_show_file(revs, "-", old_entry,