git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Sep 2020, #01; Tue, 1)
Date: Wed, 02 Sep 2020 09:45:57 -0700	[thread overview]
Message-ID: <xmqq7dtcceka.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAPig+cTUhLoPvs+ygnc0Y4Ez3M3tfGncPzON0ejb=xEOMBixHQ@mail.gmail.com> (Eric Sunshine's message of "Tue, 1 Sep 2020 17:43:54 -0400")

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Tue, Sep 1, 2020 at 5:30 PM Junio C Hamano <gitster@pobox.com> wrote:
>> * jc/run-command-use-embedded-args (2020-08-26) 1 commit
>>  Various callers of run_command API has been modernized.
>
> s/has/have/
>
>> * es/worktree-repair (2020-08-31) 5 commits
>>   (merged to 'next' on 2020-08-31 at 604825c5e4)
>>  + init: make --separate-git-dir work from within linked worktree
>>  + init: teach --separate-git-dir to repair linked worktrees
>>  + worktree: teach "repair" to fix outgoing links to worktrees
>>  + worktree: teach "repair" to fix worktree back-links to main worktree
>>  + worktree: add skeleton "repair" command
>>
>>  "git worktree repair" command to correct on-disk pointers between
>>  the repository and its secondary working trees.
>
> I wonder if this could be reworded so it's clearer that "git worktree
> repair" is a new command, and to mention fixes to "git init
> --separate-git-dir". Perhaps like this?
>
>     "git worktree" gained a "repair" subcommand to help users recover
>     from problems arising from factors outside of Git's control.
>     Also, "git init --separate-git-dir" no longer corrupts
>     administrative data related to linked worktrees.

OK that reads much better.

-from problems arising from factors outside of Git's control.
+after moving the worktrees manually without telling Git.

The latter is slightly shorter; does the "repair" help situations
other than that, or is the above cover all the "factors outside" out
control?

Thanks.

  reply	other threads:[~2020-09-02 16:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-01 21:28 What's cooking in git.git (Sep 2020, #01; Tue, 1) Junio C Hamano
2020-09-01 21:43 ` Eric Sunshine
2020-09-02 16:45   ` Junio C Hamano [this message]
2020-09-02 16:58     ` Eric Sunshine
2020-09-02 18:10       ` Junio C Hamano
2020-09-02 18:17         ` Eric Sunshine
2020-09-02 19:12           ` 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=xmqq7dtcceka.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=sunshine@sunshineco.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).