From: Brian Gernhardt Date: Sat, 03 Feb 2007 18:13:29 GMT Subject: [PATCH] Use "-f" when adding files with odd names in t9200. Message-ID: <20070203181329.GA10192@179.242.249.10.in-addr.arpa> In-Reply-To: <1AAD2384-C52D-4D60-A948-4F14C9515B53@silverinsanity.com> Without -f, the UTF-8 named files are ignored (supposedly via .gitignore) on systems with a different UTF-8 encoding. This patch makes the test pass on OS X on HFS+, in particular. Signed-off-by: Brian Gernhardt --- I still think that the behavior of git-add here is an error. The file is NOT in any ignore file and so should not be marked as such. However, this allows me to finally use "make test && sudo make install". t/t9200-git-cvsexportcommit.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index c443f32..6955cdd 100755 --- a/t/t9200-git-cvsexportcommit.sh +++ b/t/t9200-git-cvsexportcommit.sh @@ -174,9 +174,9 @@ test_expect_success \ 'File with non-ascii file name' \ 'mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö && echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && - git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && + git add -f Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && cp ../test9200a.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && - git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && + git add -f Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && git commit -a -m "Går det så går det" && \ id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && -- 1.5.0.rc3.22.g5057