Merge branch 'ef/maint-fast-export' into maint
commit4f26c39806ee69bd68d6ea04b147eb2d877d0172
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Apr 2009 19:40:17 +0000 (19 12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Apr 2009 19:40:17 +0000 (19 12:40 -0700)
tree205996e02a0d60a2670ceba8d0946afbffa0bb15
parentfe4ce3a72140d32d82aec860c8eb319a78205de6
parentaadd44404baab7b1f7234c8815bfd1e6c980cd99
Merge branch 'ef/maint-fast-export' into maint

* ef/maint-fast-export:
  builtin-fast-export.c: handle nested tags
  builtin-fast-export.c: fix crash on tagged trees
  builtin-fast-export.c: turn error into warning
  test-suite: adding a test for fast-export with tag variants