| commit | 5acffd34738f9718caf2a5811bddbf2f40e968a0 | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Wed, 1 Sep 2021 16:52:20 +0000 (1 19:52 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 Sep 2021 18:11:35 +0000 (7 11:11 -0700) | ||
| tree | b72a0462a5eff6c3157ea99c7b2a3cf07ec7c3b7 | treesnapshot (tar.gz zip) |
| parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf | commitdiff |
diff-index: restore -c/--cc options handling
This fixes 19b2517f (diff-merges: move specific diff-index "-m"
handling to diff-index, 2021-05-21).
That commit disabled handling of all diff for merges options in
diff-index on an assumption that they are unused. However, it later
appeared that -c and --cc, even though undocumented and not being
covered by tests, happen to have had particular effect on diff-index
output.
Restore original -c/--cc options handling by diff-index.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This fixes 19b2517f (diff-merges: move specific diff-index "-m"
handling to diff-index, 2021-05-21).
That commit disabled handling of all diff for merges options in
diff-index on an assumption that they are unused. However, it later
appeared that -c and --cc, even though undocumented and not being
covered by tests, happen to have had particular effect on diff-index
output.
Restore original -c/--cc options handling by diff-index.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/diff-index.c | diffblobblamehistory | |
| diff-merges.c | diffblobblamehistory | |
| diff-merges.h | diffblobblamehistory |