diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-10-02 11:49:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-02 11:49:59 -0700 |
| commit | ff989b8d466ee2ec42c69c02e6551add430b8497 (patch) | |
| tree | 50c0ef99605ec0967156a3d2074dd27bdd4655d2 /t | |
| parent | Do not create tag leading directories since git update-ref does it. (diff) | |
| parent | lock_ref_sha1_basic does not remove empty directories on BSD (diff) | |
| download | tgif-ff989b8d466ee2ec42c69c02e6551add430b8497.tar.xz | |
Merge branch 'master' into lj/refs
* master: (99 commits)
lock_ref_sha1_basic does not remove empty directories on BSD
git-push: .git/remotes/ file does not require SP after colon
git-mv: invalidate the removed path properly in cache-tree
Makefile: install and clean merge-recur, still.
GIT 1.4.3-rc1
gitweb: tree view: hash_base and hash are now context sensitive
git-diff -B output fix.
fetch: Reset remote refs list each time fetch_main is called
Remove -fPIC which was only needed for Git.xs
Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
git-diff -B output fix.
Make cvsexportcommit remove files.
diff --stat: ensure at least one '-' for deletions, and one '+' for additions
diff --stat=width[,name-width]: allow custom diffstat output width.
gitweb: History: blob and tree are first, then commitdiff, etc
gitweb: Remove redundant "commit" from history
http/ftp: optionally ask curl to not use EPSV command
gitweb: Don't use quotemeta on internally generated strings
gitweb: Add snapshot to shortlog
gitweb: Factor out gitweb_have_snapshot()
...
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 19 | ||||
| -rwxr-xr-x | t/test-lib.sh | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index b7fcdb390c..23a1eff3bb 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 diff --git a/t/test-lib.sh b/t/test-lib.sh index 0fe2718845..b523fef339 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -218,6 +218,8 @@ PYTHON=`sed -e '1{ PYTHONPATH=$(pwd)/../compat export PYTHONPATH } +GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git +export GITPERLLIB test -d ../templates/blt || { error "You haven't built things yet, have you?" } |