diff options
author | Matheus Tavares <matheus.bernardino@usp.br> | 2021-05-06 16:33:15 -0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 07:48:11 +0900 |
commit | 3a7f0908b6d698ab1287840ea604111c28a67a61 (patch) | |
tree | 163ecada89691962d93c8bd1a30710c2a4055c88 /Documentation/git-mergetool.txt | |
parent | Git 2.27.1 (diff) | |
download | tgif-3a7f0908b6d698ab1287840ea604111c28a67a61.tar.xz |
clean: remove unnecessary variable
The variable `matches` used to hold the return of a `dir_path_match()`
call that was removed in 95c11ecc73 ("Fix error-prone fill_directory()
API; make it only return matches", 2020-04-01). Now `matches` will
always hold 0, which is the value it's initialized with; and the
condition `matches != MATCHED_EXACTLY` will always evaluate to true. So
let's remove this unnecessary variable.
Interestingly, it seems that `matches != MATCHED_EXACTLY` was already
unnecessary before 95c11ecc73. That's because `remove_directories` is
always set to 1 when we have pathspecs; So, in the condition
`!remove_directories && matches != MATCHED_EXACTLY`, we would either:
- have pathspecs (or have been given `-d`) and ignore `matches` because
`remove_directories` is 1; or
- not have pathspecs (nor `-d`) and end up just checking that
`0 != MATCHED_EXACTLY`, as `matches` would never get reassigned
after its zero initialization (because there is no pathspec to match).
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions