diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-04 16:30:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-04 16:30:00 -0800 |
| commit | ba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch) | |
| tree | cee119a3eccf55b60a44fe29974fb108cd527739 /t/t7001-mv.sh | |
| parent | git-fetch: ignore dereferenced tags in expand_refs_wildcard (diff) | |
| parent | receive-pack: do not insist on fast-forward outside refs/heads/ (diff) | |
| download | tgif-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.xz | |
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 23a1eff3bb..2f4ff82e14 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 |