Merge branch 'jh/maint-do-not-track-non-branches' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:45 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:45 +0000 (16:20 -0700)
commitac53196d9a1f63785de199dee4b851378510f729
treea14bd5b92d400f27ce75e8a660372e5e3bc4f202
parentf35bb7c38d546a9e8360cde53c03b0b881ab4475
parent21b5b1e8dc9bed2b518defe29d69ebc27da4b68f
Merge branch 'jh/maint-do-not-track-non-branches' into maint

* jh/maint-do-not-track-non-branches:
  branch/checkout --track: Ensure that upstream branch is indeed a branch
t/t3200-branch.sh
t/t6040-tracking-info.sh