Revision f9308a182e220c97cdbf90ee8de2ce21980cb7e9 authored by Jakub Narebski on 23 March 2007, 20:04:31 UTC, committed by Junio C Hamano on 23 March 2007, 21:54:52 UTC
Fix copy'n'paste error in commit c9d193df which caused that "next"
link for merge commits in "commit" view
  (merge: _commit_ _commit_ ...)
was to "commitdiff" view instead of being to "commit" view.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 979ea58
Raw File
t3000-ls-files-others.sh
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='git-ls-files test (--others should pick up symlinks).

This test runs git-ls-files --others with the following on the
filesystem.

    path0       - a file
    path1	- a symlink
    path2/file2 - a file in a directory
    path3-junk  - a file to confuse things
    path3/file3 - a file in a directory
'
. ./test-lib.sh

date >path0
ln -s xyzzy path1
mkdir path2 path3
date >path2/file2
date >path2-junk
date >path3/file3
date >path3-junk
git-update-index --add path3-junk path3/file3

cat >expected1 <<EOF
expected1
expected2
output
path0
path1
path2-junk
path2/file2
EOF
sed -e 's|path2/file2|path2/|' <expected1 >expected2

test_expect_success \
    'git-ls-files --others to show output.' \
    'git-ls-files --others >output'

test_expect_success \
    'git-ls-files --others should pick up symlinks.' \
    'diff output expected1'

test_expect_success \
    'git-ls-files --others --directory to show output.' \
    'git-ls-files --others --directory >output'


test_expect_success \
    'git-ls-files --others --directory should not get confused.' \
    'diff output expected2'

test_done
back to top