diff options
| author | Elijah Newren <newren@gmail.com> | 2022-09-02 03:53:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-02 09:22:25 -0700 |
| commit | 9b08091cb72bdd1d8b37446bcf0a6d73d319bf10 (patch) | |
| tree | 5ecf7dc03d5f3b2c9975c40dc206e3234bc9473f /builtin/commit.c | |
| parent | Sync with Git 2.37.3 (diff) | |
| download | git-9b08091cb72bdd1d8b37446bcf0a6d73d319bf10.tar.gz git-9b08091cb72bdd1d8b37446bcf0a6d73d319bf10.zip | |
diff: have submodule_format logic avoid additional diff headers
Commit 95433eeed9 ("diff: add ability to insert additional headers for
paths", 2022-02-02) introduced the possibility of additional headers,
created in create_filepairs_for_header_only_notifications(). These are
represented by inserting additional pairs in diff_queued_diff which
always have a mode of 0 and a null_oid. When these were added, one
code path was noted to assume that at least one of the diff_filespecs
in the pair were valid, and that codepath was corrected.
The submodule_format handling is another codepath with the same issue;
it would operate on these additional headers and attempt to display them
as submodule changes. Prevent that by explicitly checking for "phoney"
filepairs (i.e. filepairs with both modes being 0).
Reported-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions
