git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Pratyush Yadav <me@yadavpratyush.com>
To: <git@vger.kernel.org>
Subject: [PATCH 0/1] worktree: delete branches auto-created by 'worktree add'
Date: Sat, 14 Dec 2019 21:44:37 +0530	[thread overview]
Message-ID: <20191214161438.16157-1-me@yadavpratyush.com> (raw)

Hi,

This fixes a small annoyance I had with git-worktree. Most of the
feature is explained in the patch, so I'm using the cover letter to
leave a couple of notes.

- Since the patch changes current behaviour of git-worktree-remove, it
  might break existing scripts. In that case, we might want to add a
  config variable and command line option to trigger that. But for the
  sake of simplicity, I went with making the behaviour default. I don't
  mind making it optional if people think that would be a better idea.

- To make sure no commits are lost, the branch is not deleted if it has
  moved since its creation. This is a more conservative approach. An
  alternative would be to run 'git branch -d' directly without checking if
  branch has moved. This will mean new commits not in upstream branch are
  still preserved but if the branch is simply moved to another commit it
  will still be deleted.

Pratyush Yadav (1):
  worktree: delete branches auto-created by 'worktree add'

 Documentation/git-worktree.txt |  9 ++++--
 builtin/worktree.c             | 52 ++++++++++++++++++++++++++++++++--
 t/t2403-worktree-move.sh       | 45 +++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 5 deletions(-)

--
2.24.1


             reply	other threads:[~2019-12-14 16:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-14 16:14 Pratyush Yadav [this message]
2019-12-14 16:14 ` [PATCH 1/1] worktree: delete branches auto-created by 'worktree add' Pratyush Yadav
2019-12-18 19:31   ` Pratyush Yadav
2019-12-18 19:34     ` Eric Sunshine
2019-12-27 11:05   ` Eric Sunshine
2020-01-04 21:47     ` Pratyush Yadav
2020-01-05  5:32     ` Eric Sunshine
2020-01-06  4:20     ` Eric Sunshine
2020-01-06 18:01       ` Pratyush Yadav
2020-01-09  9:46         ` Eric Sunshine

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=20191214161438.16157-1-me@yadavpratyush.com \
    --to=me@yadavpratyush.com \
    --cc=git@vger.kernel.org \
    /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).