diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 16:08:23 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 16:08:23 -0700 |
commit | 9b8ae93ad92efef59649a3a7c4bed162d2051059 (patch) | |
tree | 0661cd870dec63e098efef7e1fb7db31505dbbb2 /t/t2101-update-index-reupdate.sh | |
parent | 01914577ed42498d9e268684949d699e0272e964 (diff) | |
parent | de5d560c99c96e2955fb4d1d8a8fa6b469926292 (diff) | |
download | git-9b8ae93ad92efef59649a3a7c4bed162d2051059.tar.gz git-9b8ae93ad92efef59649a3a7c4bed162d2051059.tar.xz |
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/t2101-update-index-reupdate.sh')
-rwxr-xr-x | t/t2101-update-index-reupdate.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh index 59b560bfd..648184fd9 100755 --- a/t/t2101-update-index-reupdate.sh +++ b/t/t2101-update-index-reupdate.sh @@ -40,7 +40,7 @@ test_expect_success 'update-index --remove --again' \ git ls-files -s >current && cmp current expected' -test_expect_success 'first commit' 'git-commit -m initial' +test_expect_success 'first commit' 'git commit -m initial' cat > expected <<\EOF 100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3 |