git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2] builtin/branch.c: remove useless branch_get

From
Tao Qingyun <taoqy@ls-a.me>
Date
Oct 16, 2018, 14:54 UTC
Message-ID
<20181016145428.2901-1-taoqy@ls-a.me>
In-Reply-To
<20181015171707.GB1301@sigill.intra.peff.net>

branch_get sometimes returns current_branch, which can be NULL (e.g., if you're on a detached HEAD). Try:

  $ git branch HEAD
  fatal: no such branch 'HEAD'
  $ git branch ''
  fatal: no such branch ''

However, it seems weird that we'd check those cases here (and provide such lousy messages). And indeed, dropping that and letting us eventually hit create_branch() gives a much better message:

  $ git branch HEAD
  fatal: 'HEAD' is not a valid branch name.
  $ git branch ''
  fatal: '' is not a valid branch name.
Signed-off-by: Tao Qingyun <taoqy@ls-a.me>
---
 builtin/branch.c | 5 -----
 1 file changed, 5 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index c396c41533..2367703034 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -809,11 +809,6 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		git_config_set_multivar(buf.buf, NULL, NULL, 1);
 		strbuf_release(&buf);
 	} else if (argc > 0 && argc <= 2) {
-		struct branch *branch = branch_get(argv[0]);
-
-		if (!branch)
-			die(_("no such branch '%s'"), argv[0]);
-
 		if (filter.kind != FILTER_REFS_BRANCHES)
 			die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
 
-- 
2.19.0
Previous: Jeff KingNext: Jeff King
Message 5 of 8 in “[Question] builtin/branch.c”
  1. Tao QingyunOct 13, 2018
  2. Ævar Arnfjörð BjarmasonOct 14, 2018
  3. builtin/branch.c: remove useless branch_getTao Qingyun, Oct 15, 2018
  4. Jeff KingOct 15, 2018
  5. builtin/branch.c: remove useless branch_getTao Qingyun, Oct 16, 2018
  6. Jeff KingOct 17, 2018
  7. Tao QingyunOct 17, 2018
  8. Jeff KingOct 15, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.