diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 23:08:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 23:08:23 (GMT) |
| commit | 9b8ae93ad92efef59649a3a7c4bed162d2051059 (patch) | |
| tree | 0661cd870dec63e098efef7e1fb7db31505dbbb2 /t/t7101-reset.sh | |
| parent | 01914577ed42498d9e268684949d699e0272e964 (diff) | |
| parent | de5d560c99c96e2955fb4d1d8a8fa6b469926292 (diff) | |
| download | git-9b8ae93ad92efef59649a3a7c4bed162d2051059.zip git-9b8ae93ad92efef59649a3a7c4bed162d2051059.tar.gz git-9b8ae93ad92efef59649a3a7c4bed162d2051059.tar.bz2 | |
Merge branch 'maint'
* maint:
Start 1.6.0.2 maintenance cycle
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
Fix passwd(5) ref and reflect that commit doens't use commit-tree
improve handling of sideband message display
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
checkout: fix message when leaving detached HEAD
clone: fix creation of explicitly named target directory
'git foo' program identifies itself without dash in die() messages
setup_git_directory(): fix move to worktree toplevel directory
update-index: fix worktree setup
Start conforming code to "git subcmd" style
read-tree: setup worktree if merge is required
grep: fix worktree setup
diff*: fix worktree setup
Conflicts:
RelNotes
t/t3900-i18n-commit.sh
t/t7003-filter-branch.sh
Diffstat (limited to 't/t7101-reset.sh')
| -rwxr-xr-x | t/t7101-reset.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7101-reset.sh b/t/t7101-reset.sh index ffaeb39..96e163f 100755 --- a/t/t7101-reset.sh +++ b/t/t7101-reset.sh @@ -3,7 +3,7 @@ # Copyright (c) 2006 Shawn Pearce # -test_description='git-reset should cull empty subdirs' +test_description='git reset should cull empty subdirs' . ./test-lib.sh test_expect_success \ @@ -11,7 +11,7 @@ test_expect_success \ 'mkdir path0 && cp "$TEST_DIRECTORY"/../COPYING path0/COPYING && git add path0/COPYING && - git-commit -m add -a' + git commit -m add -a' test_expect_success \ 'creating second files' \ @@ -25,11 +25,11 @@ test_expect_success \ git add path1/COPYING && git add COPYING && git add path0/COPYING-TOO && - git-commit -m change -a' + git commit -m change -a' test_expect_success \ 'resetting tree HEAD^' \ - 'git-reset --hard HEAD^' + 'git reset --hard HEAD^' test_expect_success \ 'checking initial files exist after rewind' \ |