diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-03-27 00:48:45 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-03-27 11:33:29 -0700 |
| commit | d7dc1e1668fcbd5af019d0bc059b8dcb35743c86 (patch) | |
| tree | ee9ae1d516a85ee6c7dc11fe939a61772cb6e6f1 /Documentation/git-diff-index.txt | |
| parent | unpack-trees: fix minor typo in comment (diff) | |
| download | tgif-d7dc1e1668fcbd5af019d0bc059b8dcb35743c86.tar.xz | |
unpack-trees: remove unused error type
commit 08402b0409 ("merge-recursive: distinguish "removed" and
"overwritten" messages", 2010-08-11) split
ERROR_WOULD_LOSE_UNTRACKED
into both
ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
ERROR_WOULD_LOSE_UNTRACKED_REMOVED
and also split
ERROR_WOULD_LOSE_ORPHANED
into both
ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
ERROR_WOULD_LOSE_ORPHANED_REMOVED
However, despite the split only three of these four types were used.
ERROR_WOULD_LOSE_ORPHANED_REMOVED was not put into use when it was
introduced and nothing else has used it in the intervening decade
either. Remove it.
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-index.txt')
0 files changed, 0 insertions, 0 deletions