From: Philip Oakley <philipoakley@iee.email>
To: Junio C Hamano <gitster@pobox.com>, 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: Mon, 30 Aug 2021 10:27:51 +0100 [thread overview]
Message-ID: <677bef35-4d27-748a-1508-2e65707317ee@iee.email> (raw)
In-Reply-To: <xmqqk0k37p1t.fsf@gitster.g>
On 30/08/2021 01:29, Junio C Hamano wrote:
> 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.
Does this end up being a documentation issue?
e.g. Users should start at top-level because..
or Note, if the current directory is removed at some step during the
rebase then..
Often folk do read the documentation as a lest resort..
--
Philip
next prev parent reply other threads:[~2021-08-30 9:28 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
2021-08-30 9:27 ` Philip Oakley [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=677bef35-4d27-748a-1508-2e65707317ee@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).