Skip to content

Commit

Permalink
check-ref-format --branch: give Porcelain a way to grok branch shorthand
Browse files Browse the repository at this point in the history
The command may not be the best place to add this new feature, but

    $ git check-ref-format --branch "@{-1}"

allows Porcelains to figure out what branch you were on before the last
branch switching.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Mar 23, 2009
1 parent a552de7 commit a31dca0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Documentation/git-check-ref-format.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ git-check-ref-format - Make sure ref name is well formed

SYNOPSIS
--------
[verse]
'git check-ref-format' <refname>
'git check-ref-format' [--branch] <branchname-shorthand>

DESCRIPTION
-----------
Expand Down Expand Up @@ -49,6 +51,16 @@ refname expressions (see linkgit:git-rev-parse[1]). Namely:
It may also be used to select a specific object such as with
'git-cat-file': "git cat-file blob v1.3.3:refs.c".

With the `--branch` option, it expands a branch name shorthand and
prints the name of the branch the shorthand refers to.

EXAMPLE
-------

git check-ref-format --branch @{-1}::

Print the name of the previous branch.


GIT
---
Expand Down
10 changes: 10 additions & 0 deletions builtin-check-ref-format.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,19 @@
#include "cache.h"
#include "refs.h"
#include "builtin.h"
#include "strbuf.h"

int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
{
if (argc == 3 && !strcmp(argv[1], "--branch")) {
struct strbuf sb = STRBUF_INIT;
strbuf_branchname(&sb, argv[2]);
strbuf_splice(&sb, 0, 0, "refs/heads/", 11);
if (check_ref_format(sb.buf))
die("'%s' is not a valid branch name", argv[2]);
printf("%s\n", sb.buf + 11);
exit(0);
}
if (argc != 2)
usage("git check-ref-format refname");
return !!check_ref_format(argv[1]);
Expand Down

0 comments on commit a31dca0

Please sign in to comment.