undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/symbolic-ref-short'

Browse Source 
* jk/symbolic-ref-short:
  symbolic-ref --short: abbreviate the output unambiguously
This commit is contained in:
Junio C Hamano 2012-03-04 23:35:23 -08:00
commit b8b52907e3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-symbolic-ref.txt
View File

@ -8,7 +8,8 @@ git-symbolic-ref - Read and modify symbolic refs
SYNOPSIS
--------
[verse]
'git symbolic-ref' [-q] [-m <reason>] <name> [<ref>]
'git symbolic-ref' [-m <reason>] <name> <ref>
'git symbolic-ref' [-q] [--short] <name>
DESCRIPTION
-----------
@ -33,6 +34,10 @@ OPTIONS
symbolic ref but a detached HEAD; instead exit with
non-zero status silently.
--short::
When showing the value of <name> as a symbolic ref, try to shorten the
value, e.g. from `refs/heads/master` to `master`.
-m::
Update the reflog for <name> with <reason>. This is valid only
when creating or updating a symbolic ref.

11
builtin/symbolic-ref.c
View File

@ -8,13 +8,15 @@ static const char * const git_symbolic_ref_usage[] = {
NULL
};
static int shorten;
static void check_symref(const char *HEAD, int quiet)
{
unsigned char sha1[20];
int flag;
const char *refs_heads_master = resolve_ref_unsafe(HEAD, sha1, 0, &flag);
const char *refname = resolve_ref_unsafe(HEAD, sha1, 0, &flag);
if (!refs_heads_master)
if (!refname)
die("No such ref: %s", HEAD);
else if (!(flag & REF_ISSYMREF)) {
if (!quiet)
@ -22,7 +24,9 @@ static void check_symref(const char *HEAD, int quiet)
else
exit(1);
}
puts(refs_heads_master);
if (shorten)
refname = shorten_unambiguous_ref(refname, 0);
puts(refname);
}
int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
@ -32,6 +36,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT__QUIET(&quiet,
"suppress error message for non-symbolic (detached) refs"),
OPT_BOOL(0, "short", &shorten, "shorten ref output"),
OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
OPT_END(),
};