From: Thomas Rast <trast@student.ethz.ch>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
"Michael P. Soulier" <msoulier@digitaltorque.ca>,
git@vger.kernel.org
Subject: Re: having to pull twice
Date: Sun, 28 Sep 2008 17:26:20 +0200 [thread overview]
Message-ID: <200809281726.23062.trast@student.ethz.ch> (raw)
In-Reply-To: <20080928151135.GF23137@genesis.frugalware.org>
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Miklos Vajna wrote:
>
> Oh, the racy git problem. ;-)
>
> $ git reset --hard; touch foo; git merge side
IIUC, this is not the same as "racy git". The racy case is if you
manage to get a file changed immediately after its index entry was
updated, so that it will look unchanged. In this case, it's simply
the same file with a new mtime, which means it looks changed
superficially but still has the same contents.
Granted, you could call my test "racy" because it relies on 'make
install' taking at least one second, which by Moore's law should
happen sometime around 2019 ;-)
> Thanks for the reproducer, I'll write a proper testcase for this and try to
> provide a fix for it as well.
Thanks.
- Thomas
--
Thomas Rast
trast@student.ethz.ch
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-09-28 15:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 0:58 having to pull twice Michael P. Soulier
2008-09-25 1:01 ` Shawn O. Pearce
2008-09-25 7:05 ` Thomas Rast
2008-09-25 18:49 ` Alex Riesen
2008-09-25 21:28 ` Michael P. Soulier
2008-09-25 23:25 ` Miklos Vajna
2008-09-27 14:16 ` Thomas Rast
2008-09-28 15:11 ` Miklos Vajna
2008-09-28 15:26 ` Thomas Rast [this message]
2008-09-29 15:00 ` Miklos Vajna
2008-10-03 13:02 ` [PATCH] builtin-merge: refresh the index before calling a strategy Miklos Vajna
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=200809281726.23062.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=msoulier@digitaltorque.ca \
--cc=spearce@spearce.org \
--cc=vmiklos@frugalware.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).