]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'jc/test-lazy-prereq' (early part)
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:21:26 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:21:26 +0000 (13:21 -0700)
* 'jc/test-lazy-prereq' (early part):
  t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
  t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
  t3302: do not chdir around in the primary test process
  t3302: coding style updates
  test: turn USR_BIN_TIME into a lazy prerequisite
  test: turn EXPENSIVE into a lazy prerequisite

1  2 
t/t5551-http-fetch-smart.sh
t/test-lib.sh

Simple merge
diff --cc t/test-lib.sh
Simple merge