From 8858a63cb33319f3e739edcbfafdae3ec0fefa33 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 25 Oct 2010 11:58:11 +0200 Subject: .gitignore will now ignore netbeans projects Fixed test which used the --force flag on move, but there is only a short version (left) it appears --- .gitignore | 1 + test/git/test_index.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 37c5e30c..eec80860 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /build /dist /doc/_build +nbproject diff --git a/test/git/test_index.py b/test/git/test_index.py index 30f38257..13d2c10d 100644 --- a/test/git/test_index.py +++ b/test/git/test_index.py @@ -546,7 +546,7 @@ class TestIndex(TestBase): self.failUnlessRaises(GitCommandError, index.move, files) # again, with force - assert_mv_rval(index.move(files, force=True)) + assert_mv_rval(index.move(files, f=True)) # files into directory - dry run paths = ['LICENSE', 'VERSION', 'doc'] -- cgit v1.2.3