Merge branch 'jk/test-trash' into maint
commitac85caa7e91e3ebcbce740275524fe6c1e789dce
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:58 +0000 (22 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:58 +0000 (22 11:26 -0700)
tree2585ce1814d818185246bd5b339bf6974dfa7700
parent34ab7fc461e592c425488f02b315b515cd485fe5
parent002d4ce8aa40644698721d59691d38f1df702f4b
Merge branch 'jk/test-trash' into maint

* jk/test-trash:
  t/test-lib.sh: drop "$test" variable
  t/test-lib.sh: fix TRASH_DIRECTORY handling