From: Junio C Hamano <gitster@pobox.com>
To: Greg KH <greg@kroah.com>
Cc: git@vger.kernel.org
Subject: Re: renaming a file into a directory causes a pull error on older repos
Date: Tue, 18 Mar 2008 23:31:53 -0700 [thread overview]
Message-ID: <7vlk4f442u.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080319015156.GA8874@kroah.com> (Greg KH's message of "Tue, 18 Mar 2008 18:51:56 -0700")
Greg KH <greg@kroah.com> writes:
> I've tried to create a simple script to duplicate this problem, and I
> really can not do it at all, including trying to modify the file that
> got clobered by the directory name. Odd. I need to look at that repo
> and verify what I did to make sure it wasn't my fault here...
You might have noticed that I've tried it as well.
And it is never your fault. If git prevented you from trashing your local
modifications, that is a good thing that it errored out.
prev parent reply other threads:[~2008-03-19 19:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-16 4:31 renaming a file into a directory causes a pull error on older repos Greg KH
2008-03-18 0:16 ` Junio C Hamano
2008-03-18 0:48 ` [PATCH] git-merge-one-file: fix longstanding stupid thinko Junio C Hamano
2008-03-19 1:51 ` renaming a file into a directory causes a pull error on older repos Greg KH
2008-03-19 6:31 ` Junio C Hamano [this message]
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=7vlk4f442u.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=greg@kroah.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).