diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-05 00:30:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-05 00:30:00 (GMT) |
| commit | ba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch) | |
| tree | cee119a3eccf55b60a44fe29974fb108cd527739 /t/t7001-mv.sh | |
| parent | 4cd75359ad5d4c90ba6ae6d68ffb6d00e5092b8a (diff) | |
| parent | 562cefbdbfaeb92f91c961c67960a93a7772220c (diff) | |
| download | git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.zip git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.gz git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.bz2 | |
Merge branch 'maint'
* maint:
receive-pack: do not insist on fast-forward outside refs/heads/
git-mv: search more precisely for source directory in index
Conflicts:
receive-pack.c
Diffstat (limited to 't/t7001-mv.sh')
| -rwxr-xr-x | t/t7001-mv.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 23a1eff..2f4ff82 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -105,4 +105,17 @@ test_expect_success "Michael Cassar's test case" ' } ' +rm -fr papers partA path? + +test_expect_success "Sergey Vlasov's test case" ' + rm -fr .git && + git init-db && + mkdir ab && + date >ab.c && + date >ab/d && + git add ab.c ab && + git commit -m 'initial' && + git mv ab a +' + test_done |