From: Nix <nix@esperi.org.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Possibly-spurious 'not uptodate. Cannot merge'
Date: Sun, 14 Dec 2008 23:15:07 +0000 [thread overview]
Message-ID: <87bpve73ic.fsf@hades.wkstn.nix> (raw)
In-Reply-To: <7vwse21rh6.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Sun, 14 Dec 2008 11:33:57 -0800")
On 14 Dec 2008, Junio C. Hamano said:
> Ancient git, whose "git merge" was a scripted command, refreshed the index
> before starting, but it lost that when the command was rewritten in C soon
> after v1.5.6 by 1c7b76b (Build in merge, 2008-07-07), and nobody noticed
> it until 76c3fb1 (Merge branch 'mv/merge-refresh', 2008-10-09). In other
> words, the tip of 'master' (and upcoming 1.6.1) already has the fix.
Excellent! I do love this precognitive bugfixing thing.
(It's not as if the update-index workaround is terribly onerous, but
it's annoying and not something a git newbie might think of.)
next prev parent reply other threads:[~2008-12-14 23:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-14 16:47 Possibly-spurious 'not uptodate. Cannot merge' Nix
2008-12-14 19:33 ` Junio C Hamano
2008-12-14 23:15 ` Nix [this message]
2008-12-15 1:03 ` Sitaram Chamarty
2008-12-15 1:27 ` Junio C Hamano
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=87bpve73ic.fsf@hades.wkstn.nix \
--to=nix@esperi.org.uk \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).