From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: 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: Tue, 19 Jan 2010 16:54:26 +0100 [thread overview]
Message-ID: <81b0412b1001190754m37ed01b0nd93b318d77d88a75@mail.gmail.com> (raw)
In-Reply-To: <7vk4xl1nkl.fsf@alter.siamese.dyndns.org>
On Fri, Nov 20, 2009 at 11:46, Junio C Hamano <gitster@pobox.com> wrote:
> @@ -716,7 +719,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
> if (!strcmp(arg, "-"))
> arg = "@{-1}";
>
> - if (get_sha1(arg, rev)) {
> + if (get_sha1_mb(arg, rev)) {
> if (has_dash_dash) /* case (1) */
> die("invalid reference: %s", arg);
> if (!patch_mode &&
This is a bit of a problem on Windows, as the arg (eventually containing
something like "master..."), will be passed to resolve_ref below. Now, Windows,
being the piece of shit it is, will lie and tell that a file
"refs/heads/master..."
exists and be same as "refs/heads/master". This breaks "checkout to merge
base" on Windows and t2012 in particular.
BTW, why should the arg be run through resolve_ref at all if
get_sha1(_mb) has succeeded?
Isn't the commit already resolved by lookup_commit_reference_gently?
next prev parent reply other threads:[~2010-01-19 15:54 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 [this message]
2010-01-19 18:10 ` Junio C Hamano
2010-01-20 3:29 ` Junio C Hamano
2010-01-20 8:17 ` Johannes Sixt
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=81b0412b1001190754m37ed01b0nd93b318d77d88a75@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=nanako3@lavabit.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).