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
t7101-reset.sh
#!/bin/sh
#
# Copyright (c) 2006 Shawn Pearce
#
test_description='git-reset should cull empty subdirs'
. ./test-lib.sh
test_expect_success \
'creating initial files' \
'mkdir path0 &&
cp ../../COPYING path0/COPYING &&
git-add path0/COPYING &&
git-commit -m add -a'
test_expect_success \
'creating second files' \
'mkdir path1 &&
mkdir path1/path2 &&
cp ../../COPYING path1/path2/COPYING &&
cp ../../COPYING path1/COPYING &&
cp ../../COPYING COPYING &&
cp ../../COPYING path0/COPYING-TOO &&
git-add path1/path2/COPYING &&
git-add path1/COPYING &&
git-add COPYING &&
git-add path0/COPYING-TOO &&
git-commit -m change -a'
test_expect_success \
'resetting tree HEAD^' \
'git-reset --hard HEAD^'
test_expect_success \
'checking initial files exist after rewind' \
'test -d path0 &&
test -f path0/COPYING'
test_expect_failure \
'checking lack of path1/path2/COPYING' \
'test -f path1/path2/COPYING'
test_expect_failure \
'checking lack of path1/COPYING' \
'test -f path1/COPYING'
test_expect_failure \
'checking lack of COPYING' \
'test -f COPYING'
test_expect_failure \
'checking checking lack of path1/COPYING-TOO' \
'test -f path0/COPYING-TOO'
test_expect_failure \
'checking lack of path1/path2' \
'test -d path1/path2'
test_expect_failure \
'checking lack of path1' \
'test -d path1'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...