Merge branch 'nd/maint-refname-in-hierarchy-check'
authorJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:51 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:51 +0000 (13:18 -0800)
* nd/maint-refname-in-hierarchy-check:
  Fix incorrect ref namespace check

1  2 
builtin/fetch.c
builtin/remote.c
log-tree.c

diff --cc builtin/fetch.c
Simple merge
Simple merge
diff --cc log-tree.c
Simple merge