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
t2000-checkout-cache-clash.sh
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
test_description='git-checkout-index test.
This test registers the following filesystem structure in the
cache:
path0 - a file
path1/file1 - a file in a directory
And then tries to checkout in a work tree that has the following:
path0/file0 - a file in a directory
path1 - a file
The git-checkout-index command should fail when attempting to checkout
path0, finding it is occupied by a directory, and path1/file1, finding
path1 is occupied by a non-directory. With "-f" flag, it should remove
the conflicting paths and succeed.
'
. ./test-lib.sh
date >path0
mkdir path1
date >path1/file1
test_expect_success \
'git-update-index --add various paths.' \
'git-update-index --add path0 path1/file1'
rm -fr path0 path1
mkdir path0
date >path0/file0
date >path1
test_expect_failure \
'git-checkout-index without -f should fail on conflicting work tree.' \
'git-checkout-index -a'
test_expect_success \
'git-checkout-index with -f should succeed.' \
'git-checkout-index -f -a'
test_expect_success \
'git-checkout-index conflicting paths.' \
'test -f path0 && test -d path1 && test -f path1/file1'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...