From: Andreas Schwab <schwab@linux-m68k•org>
To: Junio C Hamano <gitster@pobox•com>
Cc: Michael Schubert <mschub@elegosoft•com>,
Pete Harlan <pgit@pcharlan•com>,
git@vger•kernel.org
Subject: Re: [bug?] checkout -m doesn't work without a base version
Date: Thu, 15 Dec 2011 11:42:10 +0100 [thread overview]
Message-ID: <m2vcpiw1z1.fsf@igel.home> (raw)
In-Reply-To: <7vhb13qbs6.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 14 Dec 2011 09:54:33 -0800")
Junio C Hamano <gitster@pobox•com> writes:
> The variable "mode" is assigned to when we see an stage #2 entry in the
> loop, and we should have updated threeway[1] immediately before doing so.
> If threeway[1] is not updated, we would have already returned before using
> the variable in make_cache_entry().
How can you be sure that ce_stage(ce) ever returns 2?
Andreas.
--
Andreas Schwab, schwab@linux-m68k•org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-12-15 10:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-04 22:31 [bug?] checkout -m doesn't work without a base version Pete Harlan
2011-12-05 18:58 ` Junio C Hamano
2011-12-07 7:30 ` Pete Harlan
2011-12-08 18:27 ` Junio C Hamano
2011-12-12 1:48 ` Pete Harlan
2011-12-12 5:29 ` Junio C Hamano
2011-12-20 20:37 ` [PATCH] t/t2023-checkout-m.sh: fix use of test_must_fail Ævar Arnfjörð Bjarmason
2011-12-20 21:23 ` Junio C Hamano
2011-12-14 10:19 ` [bug?] checkout -m doesn't work without a base version Michael Schubert
2011-12-14 17:54 ` Junio C Hamano
2011-12-15 4:20 ` Miles Bader
2011-12-15 10:11 ` Michael Schubert
2011-12-15 10:42 ` Andreas Schwab [this message]
2011-12-15 17:36 ` Junio C Hamano
2011-12-16 22:38 ` Ramsay Jones
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=m2vcpiw1z1.fsf@igel.home \
--to=schwab@linux-m68k$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=mschub@elegosoft$(echo .)com \
--cc=pgit@pcharlan$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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