diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-02 07:47:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-02 07:47:32 (GMT) |
| commit | f5961572a02ef08324f297fe93b704ff2137e5a6 (patch) | |
| tree | 87819ae5462ebafe6a849cf5ee3751a210d148ff /t | |
| parent | 7c2738cefb07e6549cafa42d1d383a3bb54ed0f3 (diff) | |
| parent | 6fe5b7ff6cafcc94415deba2f3d611770d8e6b1e (diff) | |
| download | git-f5961572a02ef08324f297fe93b704ff2137e5a6.zip git-f5961572a02ef08324f297fe93b704ff2137e5a6.tar.gz git-f5961572a02ef08324f297fe93b704ff2137e5a6.tar.bz2 | |
Merge branch 'maint'
* maint:
git-push: .git/remotes/ file does not require SP after colon
git-mv: invalidate the removed path properly in cache-tree
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index b7fcdb3..23a1eff 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -86,4 +86,23 @@ test_expect_success \ 'move into "."' \ 'git-mv path1/path2/ .' +test_expect_success "Michael Cassar's test case" ' + rm -fr .git papers partA && + git init-db && + mkdir -p papers/unsorted papers/all-papers partA && + echo a > papers/unsorted/Thesis.pdf && + echo b > partA/outline.txt && + echo c > papers/unsorted/_another && + git add papers partA && + T1=`git write-tree` && + + git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf && + + T=`git write-tree` && + git ls-tree -r $T | grep partA/outline.txt || { + git ls-tree -r $T + (exit 1) + } +' + test_done |