This makes sure that many commands that take refs on the command
line to honor core.warnambiguousrefs configuration. Earlier,
the commands affected by this patch did not read the
configuration file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 files changed:
int found_rename;
const char* prefix = setup_git_directory();
int found_rename;
const char* prefix = setup_git_directory();
+ git_config(git_default_config);
for(i = 1; i < argc; i++) {
if(options) {
for(i = 1; i < argc; i++) {
if(options) {
int opt;
setup_git_directory();
int opt;
setup_git_directory();
+ git_config(git_default_config);
if (argc != 3 || get_sha1(argv[2], sha1))
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
if (argc != 3 || get_sha1(argv[2], sha1))
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
struct tree *tree;
prefix = setup_git_directory();
struct tree *tree;
prefix = setup_git_directory();
+ git_config(git_default_config);
if (prefix && *prefix)
chomp_prefix = strlen(prefix);
while (1 < argc && argv[1][0] == '-') {
if (prefix && *prefix)
chomp_prefix = strlen(prefix);
while (1 < argc && argv[1][0] == '-') {
unsigned char rev1key[20], rev2key[20];
setup_git_directory();
unsigned char rev1key[20], rev2key[20];
setup_git_directory();
+ git_config(git_default_config);
while (1 < argc && argv[1][0] == '-') {
char *arg = argv[1];
while (1 < argc && argv[1][0] == '-') {
char *arg = argv[1];
int as_is = 0, all = 0, transform_stdin = 0;
setup_git_directory();
int as_is = 0, all = 0, transform_stdin = 0;
setup_git_directory();
+ git_config(git_default_config);
if (argc < 2)
usage(name_rev_usage);
if (argc < 2)
usage(name_rev_usage);
merge_fn_t fn = NULL;
setup_git_directory();
merge_fn_t fn = NULL;
setup_git_directory();
+ git_config(git_default_config);
newfd = hold_index_file_for_update(&cache_file, get_index_file());
if (newfd < 0)
newfd = hold_index_file_for_update(&cache_file, get_index_file());
if (newfd < 0)
unsigned char sha1[20];
const char *prefix = setup_git_directory();
unsigned char sha1[20];
const char *prefix = setup_git_directory();
+ git_config(git_default_config);
+
for (i = 1; i < argc; i++) {
struct stat st;
char *arg = argv[i];
for (i = 1; i < argc; i++) {
struct stat st;
char *arg = argv[i];
pid_t pid;
setup_git_directory();
pid_t pid;
setup_git_directory();
+ git_config(git_default_config);
+
argv++;
for (i = 1; i < argc; i++, argv++) {
char *arg = *argv;
argv++;
for (i = 1; i < argc; i++, argv++) {
char *arg = *argv;
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{
static const char *fmt[] = {
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{
static const char *fmt[] = {
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
pathname = git_path(*p, len, str);
if (!read_ref(pathname, this_result)) {
if (warn_ambiguous_refs) {
pathname = git_path(*p, len, str);
if (!read_ref(pathname, this_result)) {
if (warn_ambiguous_refs) {
- if (already_found &&
- !memcmp(sha1, sha1_from_ref, 20))
fprintf(stderr, warning, len, str);
already_found++;
}
fprintf(stderr, warning, len, str);
already_found++;
}
struct tree_desc tree;
setup_git_directory();
struct tree_desc tree;
setup_git_directory();
+ git_config(git_default_config);
usage("git-unpack-file <sha1>");
setup_git_directory();
usage("git-unpack-file <sha1>");
setup_git_directory();
+ git_config(git_default_config);
puts(create_temp_file(sha1));
return 0;
puts(create_temp_file(sha1));
return 0;
int fd, written;
setup_git_directory();
int fd, written;
setup_git_directory();
+ git_config(git_default_config);
if (argc < 3 || argc > 4)
usage(git_update_ref_usage);
if (argc < 3 || argc > 4)
usage(git_update_ref_usage);