diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-12 21:52:19 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-12 21:52:19 -0800 |
commit | 8042ed1cebd37419ff38f540482355c0f1d30936 (patch) | |
tree | 8cc29ba2b6f5eac2d46f5222e8ff1dc1e7f6a7bd /t/t7001-mv.sh | |
parent | e2b7008752d85874919ea718d098fec01b4a9019 (diff) | |
parent | c53d696bcc2894b0df277e617740b15bac794df9 (diff) | |
download | git-8042ed1cebd37419ff38f540482355c0f1d30936.tar.gz |
Merge branch 'master' into js/merge
* master: (42 commits)
git-svn: correctly handle packed-refs in refs/remotes/
add test case for recursive merge
git-svn: correctly display fatal() error messages
git-svn: allow dcommit to take an alternate head
git-svn: enable logging of information not supported by git
Clarify fetch error for missing objects.
Move Fink and Ports check to after config file
shortlog: fix segfault on empty authorname
shortlog: remove "[PATCH]" prefix from shortlog output
Make sure the empty tree exists when needed in merge-recursive.
Don't use memcpy when source and dest. buffers may overlap
no need to install manpages as executable
Documentation: simpler shared repository creation
shortlog: fix segfault on empty authorname
Add branch.*.merge warning and documentation update
Fix perl/ build.
git-svn: use do_switch for --follow-parent if the SVN library supports it
Fix documentation copy&paste typo
git-svn: extra error check to ensure we open a file correctly
Documentation: update git-clone man page with new behavior
...
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 |