From: Johannes Sixt <j6t@kdbg.org>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org,
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Subject: Re: [PATCH] rebase, cherry-pick, revert: only run from toplevel
Date: Tue, 31 Aug 2021 07:55:50 +0200 [thread overview]
Message-ID: <38fef2e3-a78a-c83b-85f8-dae064931703@kdbg.org> (raw)
In-Reply-To: <pull.1083.git.git.1630379030665.gitgitgadget@gmail.com>
Am 31.08.21 um 05:03 schrieb Elijah Newren via GitGitGadget:
> From: Elijah Newren <newren@gmail.com>
>
> Allowing rebase, cherry-pick and revert to run from subdirectories
> inevitably leads to eventual user confusion. For example, if they
> are within a directory that was created by one of the patches being
> rebased, then the rebase operation could hit a conflict before the
> directory is restored leading the user to be running from a directory
> that no longer exists. Similarly with cherry-pick and revert, those
> operations could result in the directory being removed.
>
> Similar to bisect, simply require that these commands be run from the
> toplevel to avoid such problems.
I am not a friend of this change. I understand the motivation behind it.
But most of the time, rebase and cherry-pick are operated on own code,
where directories do not disappear and appear at random, and this new
enforced condition becomes awkward.
One of my use-cases is that I operate git-rebase from an untracked build
directory inside the repository. Having to pass -C .. all the time
strikes the wrong balance, IMO.
Things are slightly different for git-bisect (at least for me), because
oftentimes it is operated on foreign code, where you may not know which
directories come and go. But even that is a weak argument to force the
command to the top-level of the repository.
Perhaps it is sufficient to force git-pull to the top-level (if it isn't
already).
-- Hannes
next prev parent reply other threads:[~2021-08-31 5:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 3:03 [PATCH] rebase, cherry-pick, revert: only run from toplevel Elijah Newren via GitGitGadget
2021-08-31 3:05 ` Elijah Newren
2021-08-31 5:55 ` Johannes Sixt [this message]
2021-08-31 7:01 ` Jeff King
2021-08-31 20:14 ` Elijah Newren
2021-09-01 2:55 ` Taylor Blau
2021-09-01 4:43 ` Elijah Newren
2021-09-01 4:59 ` Taylor Blau
2021-09-01 6:48 ` Elijah Newren
2021-09-01 5:29 ` Junio C Hamano
2021-09-01 6:08 ` Elijah Newren
2021-09-01 6:30 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2021-11-26 7:31 Leon Dingman
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=38fef2e3-a78a-c83b-85f8-dae064931703@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.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).