From: Johannes Sixt Date: Wed, 20 Jan 2010 08:17:38 GMT Subject: Re: [RFC/PATCHv8 00/10] git notes Message-ID: <4B56BC22.1040702@viscovery.net> In-Reply-To: <7vska15u92.fsf@alter.siamese.dyndns.org> Junio C Hamano schrieb: > Junio C Hamano writes: > >> Alex Riesen writes: >>> This breaks "checkout to merge base" on Windows and t2012 in particular. > > I think the attached patch would help. If this fix is Ok with Windows > people (J6t CC'ed), I'd like to apply this to 'master' so that we can ship > 1.7.0-rc0 without breakage. > > -- >8 -- > Subject: Fix "checkout A..." synonym for "checkout A...HEAD" on Windows > ... > Work this issue around by first calling check_ref_format(new.path) to see > if the string can possibly be a valid ref under "refs/heads/", before > asking resolve_ref(). Your patch fixes the failure very nicely, thank you very much. BTW, calling 'git pack-refs --all' before 'git checkout master...' helps as well :-P -- Hannes