summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2008-03-31 07:14:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-31 08:03:05 (GMT)
commit90356287e65181caeaa821d7476b8865d26bc588 (patch)
tree5e53e6a2bda14c47122aadf75938f901cb631f26 /git-mergetool.sh
parent803d5158123346229d71de53818920efbc88ca0f (diff)
downloadgit-90356287e65181caeaa821d7476b8865d26bc588.zip
git-90356287e65181caeaa821d7476b8865d26bc588.tar.gz
git-90356287e65181caeaa821d7476b8865d26bc588.tar.bz2
filter-branch: Test renaming directories in a tree-filter
This test currently fails. If b is a directory then 'mv a b' is not a plain "rename", but really a "move", so we must also test that the directory does not exist with the old name in the directory with the new name. There's also some cleanup in the corresponding "rename file" test to avoid spurious shell syntax errors and "ambigous ref" error from 'git show' (but these should show up only if the test would fail anyway). Plus we also test for the non-existence of the old file. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions