Staging
v0.7.0
v0.7.0
Revision 9386ecbb1cb0576f67da804f57dd96ffd62bb3c6 authored by Gerrit Pape on 07 February 2008, 09:36:10 UTC, committed by Junio C Hamano on 13 February 2008, 22:22:54 UTC
The default value of @mergerx uses \W, which matches a non-word character; this means that commit messages like "Merging FOO" are not matched by default; using \b, which matches a word boundary, instead of \W fixes that. This change was suggested by Frédéric Brière through http://bugs.debian.org/463468 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8466887
builtin-symbolic-ref.c
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "parse-options.h"
static const char * const git_symbolic_ref_usage[] = {
"git-symbolic-ref [options] name [ref]",
NULL
};
static void check_symref(const char *HEAD, int quiet)
{
unsigned char sha1[20];
int flag;
const char *refs_heads_master = resolve_ref(HEAD, sha1, 0, &flag);
if (!refs_heads_master)
die("No such ref: %s", HEAD);
else if (!(flag & REF_ISSYMREF)) {
if (!quiet)
die("ref %s is not a symbolic ref", HEAD);
else
exit(1);
}
puts(refs_heads_master);
}
int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
{
int quiet = 0;
const char *msg = NULL;
struct option options[] = {
OPT__QUIET(&quiet),
OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
OPT_END(),
};
git_config(git_default_config);
argc = parse_options(argc, argv, options, git_symbolic_ref_usage, 0);
if (msg &&!*msg)
die("Refusing to perform update with empty message");
switch (argc) {
case 1:
check_symref(argv[0], quiet);
break;
case 2:
create_symref(argv[0], argv[1], msg);
break;
default:
usage_with_options(git_symbolic_ref_usage, options);
}
return 0;
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...