diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-08-21 23:14:14 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-08-22 01:33:23 +0300 |
commit | 976b97e3fd95d5daa38ed453349f5a92157a1db2 (patch) | |
tree | 6788c3b0b91bc68daab8dfcbf7741e6eefbc64e7 /builtin/stash.c | |
parent | 43c8a30d150ecede9709c1f2527c8fba92c65f40 (diff) |
diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
Many callers of run_diff_index() passed literal "1" for the option
flag word, which should better be spelled out as DIFF_INDEX_CACHED
for readablity. Everybody else passes "0" that can stay as-is.
The other bit in the option flag word is DIFF_INDEX_MERGE_BASE, but
curiously there is only one caller that can pass it, which is "git
diff-index --merge-base" itself---no internal callers uses the
feature.
A bit tricky call to the function is in builtin/submodule--helper.c
where the .cached member in a private struct is set/reset as a plain
Boolean flag, which happens to be "1" and happens to match the value
of DIFF_INDEX_CACHED.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/stash.c')
-rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index fe64cde9ce..fe5052f12f 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1111,7 +1111,7 @@ static int check_changes_tracked_files(const struct pathspec *ps) add_head_to_pending(&rev); diff_setup_done(&rev.diffopt); - result = run_diff_index(&rev, 1); + result = run_diff_index(&rev, DIFF_INDEX_CACHED); if (diff_result_code(&rev.diffopt, result)) { ret = 1; goto done; |