From: Eric Sunshine <sunshine@sunshineco.com>
To: Heba Waly via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git List <git@vger.kernel.org>, Heba Waly <heba.waly@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] branch: advise the user to checkout a different branch before deleting
Date: Thu, 2 Jan 2020 03:18:29 -0500 [thread overview]
Message-ID: <CAPig+cS39vcy6yT3Dg2HfGVCyg2U+7t7Xj85ayM7LaAk3zTjrg@mail.gmail.com> (raw)
In-Reply-To: <82bf24ce537ca9333d72c2b4698864817801f10f.1577933387.git.gitgitgadget@gmail.com>
On Wed, Jan 1, 2020 at 9:50 PM Heba Waly via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> Display a hint to the user when attempting to delete a checked out
> branch saying "Checkout another branch before deleting this one:
> git checkout <branch_name>".
>
> Currently the user gets an error message saying: "error: Cannot delete
> branch <branch_name> checked out at <path>". The hint will be displayed
> after the error message.
>
> Signed-off-by: Heba Waly <heba.waly@gmail.com>
> ---
> diff --git a/builtin/branch.c b/builtin/branch.c
> @@ -240,6 +240,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
> error(_("Cannot delete branch '%s' "
> "checked out at '%s'"),
> bname.buf, wt->path);
> + advise(_("Checkout another branch before deleting this "
> + "one: git checkout <branch_name>"));
s/another/a different/ would make the meaning clearer.
Let's try to avoid underscores in placeholders. <branch-name> would be
better, however, git-checkout documentation just calls this <branch>,
so that's probably a good choice.
However, these days, I think we're promoting git-switch rather than
git-checkout, so perhaps this advice should follow suit.
Finally, is this advice sufficient for newcomers when the branch the
user is trying to delete is in fact checked out in a worktree other
than the worktree in which the git-branch command is being invoked?
That is:
$ pwd
/home/me/foo
$ git branch -D bip
Cannot delete branch 'bip' checked out at '/home/me/bar'
hint: Checkout another branch before deleting this one:
hint: git checkout <branch>
$ git checkout master # user follows advice
$ git branch -D bip
Cannot delete branch 'bip' checked out at '/home/me/foo'
hint: Checkout another branch before deleting this one:
hint: git checkout <branch>
$
And the user is left scratching his or her head wondering why
git-branch is still showing the error despite following the
instructions in the hint.
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> @@ -808,7 +808,8 @@ test_expect_success 'test deleting branch without config' '
> test_expect_success 'deleting currently checked out branch fails' '
> git worktree add -b my7 my7 &&
> test_must_fail git -C my7 branch -d my7 &&
> - test_must_fail git branch -d my7 &&
> + test_must_fail git branch -d my7 >actual.out 2>actual.err &&
> + test_i18ngrep "hint: Checkout another branch" actual.err &&
Why does this capture standard output into 'actual.out' if that file
is never consulted?
> rm -r my7 &&
> git worktree prune
> '
next prev parent reply other threads:[~2020-01-02 8:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 2:49 [PATCH 0/1] [Outreachy] [RFC] branch: advise the user to checkout a different branch before deleting Heba Waly via GitGitGadget
2020-01-02 2:49 ` [PATCH 1/1] " Heba Waly via GitGitGadget
2020-01-02 8:18 ` Eric Sunshine [this message]
2020-01-06 0:42 ` Heba Waly
2020-01-07 4:10 ` [PATCH v2 0/1] [Outreachy] [RFC] " Heba Waly via GitGitGadget
2020-01-07 4:10 ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
2020-01-07 11:16 ` Eric Sunshine
2020-01-07 16:34 ` Junio C Hamano
2020-01-08 1:44 ` Emily Shaffer
2020-01-08 10:22 ` Eric Sunshine
2020-01-08 1:14 ` Heba Waly
2020-01-08 9:27 ` Eric Sunshine
2020-01-08 18:06 ` Heba Waly
2020-01-08 19:01 ` Johannes Schindelin
2020-01-08 19:15 ` Junio C Hamano
2020-01-10 12:11 ` Heba Waly
2020-01-08 19:05 ` Junio C Hamano
2020-01-10 12:09 ` Heba Waly
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=CAPig+cS39vcy6yT3Dg2HfGVCyg2U+7t7Xj85ayM7LaAk3zTjrg@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=heba.waly@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).