From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Alex Riesen <raa.lkml@gmail.com>, Johannes Sixt <j6t@kdbg.org>,
Nanako Shiraishi <nanako3@lavabit.com>,
Johan Herland <johan@herland.net>,
git@vger.kernel.org, spearce@spearce.org
Subject: Re: [RFC/PATCHv8 00/10] git notes
Date: Wed, 20 Jan 2010 09:17:38 +0100 [thread overview]
Message-ID: <4B56BC22.1040702@viscovery.net> (raw)
In-Reply-To: <7vska15u92.fsf@alter.siamese.dyndns.org>
Junio C Hamano schrieb:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Alex Riesen <raa.lkml@gmail.com> 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
next prev parent reply other threads:[~2010-01-20 8:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-20 1:39 [RFC/PATCHv8 00/10] git notes Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 01/10] Notes API: get_commit_notes() -> format_note() + remove the commit restriction Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 02/10] Notes API: init_notes(): Initialize the notes tree from the given notes ref Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 03/10] Notes API: add_note(): Add note objects to the internal notes tree structure Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 04/10] Notes API: get_note(): Return the note annotating the given object Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 05/10] Notes API: for_each_note(): Traverse the entire notes tree with a callback Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 06/10] Notes API: Allow multiple concurrent notes trees with new struct notes_tree Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 07/10] Refactor notes concatenation into a flexible interface for combining notes Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 08/10] fast-import: Proper notes tree manipulation using the notes API Johan Herland
2009-11-26 2:46 ` Shawn O. Pearce
2009-11-26 11:10 ` Johan Herland
2009-11-26 19:33 ` Shawn O. Pearce
2009-11-20 1:39 ` [RFC/PATCHv8 09/10] Rename t9301 to t9350, to make room for more fast-import tests Johan Herland
2009-11-20 1:39 ` [RFC/PATCHv8 10/10] Add more testcases to test fast-import of notes Johan Herland
2009-11-20 9:44 ` [RFC/PATCHv8 00/10] git notes Junio C Hamano
2009-11-20 10:14 ` Johan Herland
2009-11-20 10:28 ` Nanako Shiraishi
2009-11-20 10:36 ` Johannes Schindelin
2009-11-20 10:46 ` Junio C Hamano
2009-11-20 11:02 ` Junio C Hamano
2010-01-19 15:54 ` Alex Riesen
2010-01-19 18:10 ` Junio C Hamano
2010-01-20 3:29 ` Junio C Hamano
2010-01-20 8:17 ` Johannes Sixt [this message]
2010-01-20 8:34 ` Junio C Hamano
2010-01-20 10:06 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B56BC22.1040702@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johan@herland.net \
--cc=nanako3@lavabit.com \
--cc=raa.lkml@gmail.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.