git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Haller <lists@haller-berlin.de>
To: Chris Torek <chris.torek@gmail.com>
Cc: phillip.wood@dunelm.org.uk, git@vger.kernel.org
Subject: Re: When exactly should REBASE_HEAD exist?
Date: Sat, 4 Mar 2023 09:36:47 +0100	[thread overview]
Message-ID: <347052f1-dd7d-dc72-6171-a858eea94747@haller-berlin.de> (raw)
In-Reply-To: <CAPx1Gvdik+QhTw8U1vd0cW1yZ9GbgDpmW7apxnXdY=E0okLpTQ@mail.gmail.com>

On 03.03.23 22:25, Chris Torek wrote:
> On Fri, Mar 3, 2023 at 3:04 AM Stefan Haller <lists@haller-berlin.de> wrote:
>> It seems that I can get close by checking whether the file
>> .git/rebase-merge/amend exists.
> 
> The location and existence of this file depends on Git version and
> whether you're using added working trees, so that's not generally
> the right directionA to go.

From what I can see, the current behavior of the .git/rebase-merge/amend
file was done in 2.12, that would be more than good enough for me. Did I
miss any changes to the behavior since then?

I'm surprised to hear that worktrees play a role in this. Do you have
more details about this?

> It would be best if `git status`
> reported all of this information directly: perhaps --porcelain=v2
> can be augmented to provide this, or there might even be a
> --porcelain=v3 if necessary.

Yes, that would be nice, but based on what state would it provide this
information? Are you suggesting that some new file should be added to
.git/rebase-merge/ to keep track of it (more reliably than the amend
file does today), or could the information be derived somehow from what
exists already? And if it's the latter, then why shouldn't I be able to
do that myself in the same way for the time being?

-Stefan

  reply	other threads:[~2023-03-04  8:37 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-28 12:55 When exactly should REBASE_HEAD exist? Stefan Haller
2023-03-02 10:19 ` Phillip Wood
2023-03-02 20:27   ` Stefan Haller
2023-03-03 10:57     ` Stefan Haller
2023-03-03 21:25       ` Chris Torek
2023-03-04  8:36         ` Stefan Haller [this message]
2023-03-06  3:31           ` Chris Torek
2023-03-07 13:16             ` Stefan Haller
2023-03-05 14:33       ` Phillip Wood
2023-03-05 16:58         ` Stefan Haller
2023-03-05 14:31     ` Phillip Wood
2023-03-05 16:59       ` Stefan Haller
2023-03-05 19:13         ` Stefan Haller
2023-03-05 20:15           ` Phillip Wood
2023-03-08 19:02             ` Stefan Haller
2023-03-10  9:56               ` Phillip Wood
2023-03-10 17:42                 ` Stefan Haller
2023-03-16 17:46                   ` Phillip Wood
2023-03-19 14:50                     ` Phillip Wood
2023-03-20  7:29                       ` Stefan Haller
2023-03-20  8:42                         ` Stefan Haller
2023-03-07 18:07 ` Junio C Hamano
2023-03-08 19:02   ` Stefan Haller
2023-03-08 19:40     ` Junio C Hamano
2023-03-09 14:45       ` Stefan Haller

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=347052f1-dd7d-dc72-6171-a858eea94747@haller-berlin.de \
    --to=lists@haller-berlin.de \
    --cc=chris.torek@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    /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).