summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2009-02-04 10:32:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-04 11:07:42 -0800
commit5aed3c6ab834367292bd7a9b0894177a07afd910 (patch)
tree4be58af9c9128aa8f1ff36e07f55857559c1456b /t/t5515-fetch-merge-logic.sh
parentAdd a testcase for "git mv -f" on untracked files. (diff)
downloadtgif-5aed3c6ab834367292bd7a9b0894177a07afd910.tar.xz
builtin-mv.c: check for unversionned files before looking at the destination.
The previous code was failing in the case where one moves an unversionned file to an existing destination, with mv -f: the "existing destination" was checked first, and the error was cancelled by the force flag. We now check the unrecoverable error first, which fixes the bug. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions