Signed-off-by: Clemens Buchacher <drizzd@xxxxxx> --- On Sun, Jul 31, 2011 at 05:01:22PM -0700, Junio C Hamano wrote: > > Sounds sane; tests? Certainly. I'm not testing partial commit since it uses the same codepath as ls-files --error-unmatch anyways. t/t3005-ls-files-relative.sh | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) create mode 100755 t/t3005-ls-files-relative.sh diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh new file mode 100755 index 0000000..e9a2f75 --- /dev/null +++ b/t/t3005-ls-files-relative.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +test_description='ls-files tests with relative paths + +This test runs git ls-files with various relative path arguments. +' + +. ./test-lib.sh + +new_line=' +' +sq=\' + +test_expect_success 'prepare' ' + : >never-mind-me && + git add never-mind-me && + mkdir top && + ( + cd top && + mkdir sub && + x="x xa xbc xdef xghij xklmno" && + y=$(echo "$x" | tr x y) && + touch $x && + touch $y && + cd sub && + git add ../x* + ) +' + +test_expect_success 'ls-files with mixed levels' ' + ( + cd top/sub && + f=$(cat <<-EOF + ../../never-mind-me + ../x + EOF + ) && + echo "$f" >expect && + git ls-files $f >actual && + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -c' ' + ( + cd top/sub && + for f in ../y* + do + echo "error: pathspec ${sq}${f}${sq} did not match any file(s) known to git." + done >expect && + echo "Did you forget to ${sq}git add${sq}?" >>expect && + set ../x* && + IFS="$new_line" && echo "$*" >>expect && unset IFS && + (git ls-files -c --error-unmatch ../[xy]* || true) >actual 2>&1 && + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o' ' + ( + cd top/sub && + for f in ../x* + do + echo "error: pathspec ${sq}${f}${sq} did not match any file(s) known to git." + done >expect && + echo "Did you forget to ${sq}git add${sq}?" >>expect && + set ../y* && + IFS="$new_line" && echo "$*" >>expect && unset IFS && + (git ls-files -o --error-unmatch ../[xy]* || true) >actual 2>&1 && + test_cmp expect actual + ) +' + +test_done -- 1.7.3.1.105.g84915 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html