From: "Heba Waly via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Heba Waly <heba.waly@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Heba Waly <heba.waly@gmail.com>
Subject: [PATCH v2 1/1] branch: advise the user to checkout a different branch before deleting
Date: Tue, 07 Jan 2020 04:10:26 +0000 [thread overview]
Message-ID: <19a7cc1889d6094e4f8a94c19c43ad554662e8d8.1578370226.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.507.v2.git.1578370226.gitgitgadget@gmail.com>
From: Heba Waly <heba.waly@gmail.com>
Display a hint to the user when attempting to delete a checked out
branch.
Currently the user gets an error message saying: "error: Cannot delete
branch <branch> checked out at <path>". The hint will be displayed
after the error message.
Signed-off-by: Heba Waly <heba.waly@gmail.com>
---
advice.c | 4 +++-
advice.h | 1 +
builtin/branch.c | 14 ++++++++++++++
t/t3200-branch.sh | 6 ++++--
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/advice.c b/advice.c
index 249c60dcf3..0a8fd2f68e 100644
--- a/advice.c
+++ b/advice.c
@@ -31,6 +31,7 @@ int advice_graft_file_deprecated = 1;
int advice_checkout_ambiguous_remote_branch_name = 1;
int advice_nested_tag = 1;
int advice_submodule_alternate_error_strategy_die = 1;
+int advice_delete_checkedout_branch = 1;
static int advice_use_color = -1;
static char advice_colors[][COLOR_MAXLEN] = {
@@ -91,7 +92,8 @@ static struct {
{ "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
{ "nestedTag", &advice_nested_tag },
{ "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
-
+ { "deleteCheckedoutBranch", &advice_delete_checkedout_branch },
+
/* make this an alias for backward compatibility */
{ "pushNonFastForward", &advice_push_update_rejected }
};
diff --git a/advice.h b/advice.h
index b706780614..e75c5ee33c 100644
--- a/advice.h
+++ b/advice.h
@@ -31,6 +31,7 @@ extern int advice_graft_file_deprecated;
extern int advice_checkout_ambiguous_remote_branch_name;
extern int advice_nested_tag;
extern int advice_submodule_alternate_error_strategy_die;
+extern int advice_delete_checkedout_branch;
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
diff --git a/builtin/branch.c b/builtin/branch.c
index d8297f80ff..d1a9443e36 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -240,6 +240,20 @@ 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);
+ if (advice_delete_checkedout_branch) {
+ if (wt->is_current) {
+ advise(_("The branch you are trying to delete is already "
+ "checked out, run the following command to "
+ "checkout a different branch then try again:\n"
+ "git switch <branch>"));
+ }
+ else {
+ advise(_("The branch you are trying to delete is checked "
+ "out on another worktree, run the following command "
+ "to checkout a different branch then try again:\n"
+ "git -C %s switch <branch>"), wt->path);
+ }
+ }
ret = 1;
continue;
}
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 411a70b0ce..edb01bee45 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -807,8 +807,10 @@ 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 -C my7 branch -d my7 2>output1.err &&
+ test_must_fail git branch -d my7 2>output2.err &&
+ test_i18ngrep "hint: The branch you are trying to delete is already checked out" output1.err &&
+ test_i18ngrep "hint: The branch you are trying to delete is checked out on another worktree" output2.err &&
rm -r my7 &&
git worktree prune
'
--
gitgitgadget
next prev parent reply other threads:[~2020-01-07 4:10 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
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 ` Heba Waly via GitGitGadget [this message]
2020-01-07 11:16 ` [PATCH v2 1/1] " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19a7cc1889d6094e4f8a94c19c43ad554662e8d8.1578370226.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--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.
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).