diff options
| author |  Chris Torek <chris.torek@gmail.com> | 2020-07-20 06:17:52 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-07-20 14:35:43 -0700 |
| commit | 9b906af657d4ec0bc8fc01c5cbbbddb582a8cac6 (patch) | |
| tree | 7fed6466b79861f967bf3460a4070314012a294b /string-list.h | |
| parent | Git 2.26.2 (diff) | |
| download | tgif-9b906af657d4ec0bc8fc01c5cbbbddb582a8cac6.tar.xz | |
git-mv: improve error message for conflicted file
'git mv' has always complained about renaming a conflicted
file, as it cannot handle multiple index entries for one file.
However, the error message it uses has been the same as the
one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and
add a test to make sure we produce the correct message.
Signed-off-by: Chris Torek <chris.torek@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'string-list.h')
0 files changed, 0 insertions, 0 deletions