From: K Jayatheerth <jayatheerthkulkarni2005@gmail•com>
To: gitster@pobox•com
Cc: git@vger•kernel.org, sorganov@gmail•com,
K Jayatheerth <jayatheerthkulkarni2005@gmail•com>
Subject: [PATCH] branch: Remove unnecessary verbose flag
Date: Fri, 26 Dec 2025 08:58:04 +0530 [thread overview]
Message-ID: <20251226032804.596058-1-jayatheerthkulkarni2005@gmail.com> (raw)
In-Reply-To: <xmqq1pkim1p6.fsf@gitster.g>
The --show-current option doesn't know how to handle verbose
logic. In such a case, we want the program to die when both flags
are used together.
Signed-off-by: K Jayatheerth <jayatheerthkulkarni2005@gmail•com>
---
builtin/branch.c | 2 ++
t/t3200-branch.sh | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/builtin/branch.c b/builtin/branch.c
index c577b5d20f..433c213dc0 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -860,6 +860,8 @@ int cmd_branch(int argc,
ret = delete_branches(argc, argv, delete > 1, filter.kind, quiet);
goto out;
} else if (show_current) {
+ if (filter.verbose)
+ die(_("options '%s' and '%s' cannot be used together"), "--show-current", "-v");
print_current_branch_name();
ret = 0;
goto out;
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index c58e505c43..5bb49de9c2 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1716,4 +1716,8 @@ test_expect_success 'errors if given a bad branch name' '
test_cmp expect actual
'
+test_expect_success 'git branch --show-current rejects -v' '
+ test_must_fail git branch --show-current -v
+'
+
test_done
--
2.52.0
next prev parent reply other threads:[~2025-12-26 3:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-25 16:08 Why git branch --show-current ignores -v? Sergey Organov
2025-12-26 2:09 ` Junio C Hamano
2025-12-26 2:11 ` Junio C Hamano
2025-12-26 3:28 ` K Jayatheerth [this message]
2025-12-26 4:15 ` [PATCH] branch: Remove unnecessary verbose flag Junio C Hamano
2025-12-26 15:43 ` Why git branch --show-current ignores -v? Sergey Organov
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=20251226032804.596058-1-jayatheerthkulkarni2005@gmail.com \
--to=jayatheerthkulkarni2005@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=sorganov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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