builtin/branch.c: remove useless branch_get
authorTao Qingyun <taoqy@ls-a.me>
Tue, 16 Oct 2018 14:54:28 +0000 (22:54 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Oct 2018 01:57:31 +0000 (10:57 +0900)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/branch.c
index bbd006aab4b4798b7e86530fe3562c753e879bc1..daf054598ba0b8ba7c515326891a0c47b90a38d5 100644 (file)
@@ -828,11 +828,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"));