diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-09 05:29:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-09 05:29:56 (GMT) |
| commit | 175f5595511b047a320e5c6163c642ac1fc34681 (patch) | |
| tree | f66169a0750929b474716969b2ba5b7a885a0ebc /t/t3101-ls-tree-dirname.sh | |
| parent | 0ae496ccd85e121c01bddfdfc1a68aced04f79ff (diff) | |
| parent | 5b7570cfb41c34ce585ede3fc1e45fa48febbd8f (diff) | |
| download | git-175f5595511b047a320e5c6163c642ac1fc34681.zip git-175f5595511b047a320e5c6163c642ac1fc34681.tar.gz git-175f5595511b047a320e5c6163c642ac1fc34681.tar.bz2 | |
Merge branch 'dp/clean-fix'
* dp/clean-fix:
git-clean: add tests for relative path
git-clean: correct printing relative path
Make private quote_path() in wt-status.c available as quote_path_relative()
Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
get_pathspec(): die when an out-of-tree path is given
Diffstat (limited to 't/t3101-ls-tree-dirname.sh')
| -rwxr-xr-x | t/t3101-ls-tree-dirname.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh index 39fe267..70f9ce9 100755 --- a/t/t3101-ls-tree-dirname.sh +++ b/t/t3101-ls-tree-dirname.sh @@ -120,7 +120,7 @@ EOF # having 1.txt and path3 test_expect_success \ 'ls-tree filter odd names' \ - 'git ls-tree $tree 1.txt /1.txt //1.txt path3/1.txt /path3/1.txt //path3//1.txt path3 /path3/ path3// >current && + 'git ls-tree $tree 1.txt ./1.txt .//1.txt path3/1.txt path3/./1.txt path3 path3// >current && cat >expected <<\EOF && 100644 blob X 1.txt 100644 blob X path3/1.txt |