From: Junio C Hamano <gitster@pobox.com>
To: Yuri <yuri@rawbw.com>
Cc: Elijah Newren <newren@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Git re-creates newly added directory when it is pushed
Date: Sun, 29 Aug 2021 17:29:34 -0700 [thread overview]
Message-ID: <xmqqk0k37p1t.fsf@gitster.g> (raw)
In-Reply-To: <da2bfcc8-09b2-c909-a316-343ab3108a58@rawbw.com> (yuri@rawbw.com's message of "Sun, 29 Aug 2021 17:14:15 -0700")
Yuri <yuri@rawbw.com> writes:
> On 8/29/21 5:07 PM, Junio C Hamano wrote:
>> This is one of the reasons why "rebase" (especially "rebase -i") may
>> want to insist starting at the top-level of the working tree, like
>> "git bisect" does. Because running the command from a subdirectory
>> works most of the time until it doesn't, people tend to complain why
>> they should go up to the top-level before they can run the command.
>>
>> And this is why---it causes end-user confusion.
>
>
> But there's no confusion here - git doesn't have to delete the
> directory and recreate it, but it does it anyway.
>
> So this is just a bug that git disturbs users more than it should.
No, this is an example that users usually can be unaware of the
reason why it is a bad idea to start from subdirectories.
As Elijah explained, if a multi-step rebase had to stop and ask help
from the user to resolve conflict _before_ the step that creates the
user's current directory, it would leave the user in a confusing
situation where the user thinks is in a directory but that directory
does not yet exist in the filesystem.
next prev parent reply other threads:[~2021-08-30 0:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-28 3:46 Git re-creates newly added directory when it is pushed Yuri
2021-08-28 5:33 ` Elijah Newren
2021-08-28 5:43 ` Yuri
2021-08-30 0:07 ` Junio C Hamano
2021-08-30 0:14 ` Yuri
2021-08-30 0:29 ` Junio C Hamano [this message]
2021-08-30 9:27 ` Philip Oakley
2021-08-31 2:15 ` Elijah Newren
2021-08-31 4:41 ` 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=xmqqk0k37p1t.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=yuri@rawbw.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).