sha1_name: warning ambiguous refs.

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>
This commit is contained in:
Junio C Hamano 2006-03-23 23:41:18 -08:00
parent c51d13692d
commit 84a9b58c42
12 changed files with 15 additions and 3 deletions

View File

@ -752,6 +752,7 @@ int main(int argc, const char **argv)
int found_rename;
const char* prefix = setup_git_directory();
git_config(git_default_config);
for(i = 1; i < argc; i++) {
if(options) {

View File

@ -100,6 +100,7 @@ int main(int argc, char **argv)
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>");

View File

@ -87,6 +87,7 @@ int main(int argc, const char **argv)
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] == '-') {

View File

@ -237,6 +237,7 @@ int main(int argc, char **argv)
unsigned char rev1key[20], rev2key[20];
setup_git_directory();
git_config(git_default_config);
while (1 < argc && argv[1][0] == '-') {
char *arg = argv[1];

View File

@ -127,6 +127,7 @@ int main(int argc, char **argv)
int as_is = 0, all = 0, transform_stdin = 0;
setup_git_directory();
git_config(git_default_config);
if (argc < 2)
usage(name_rev_usage);

View File

@ -717,6 +717,7 @@ int main(int argc, char **argv)
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)

View File

@ -166,6 +166,8 @@ int main(int argc, char **argv)
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];

View File

@ -362,6 +362,8 @@ int main(int argc, char **argv)
pid_t pid;
setup_git_directory();
git_config(git_default_config);
argv++;
for (i = 1; i < argc; i++, argv++) {
char *arg = *argv;

View File

@ -236,7 +236,7 @@ static int ambiguous_path(const char *path, int len)
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{
static const char *fmt[] = {
"/%.*s",
"%.*s",
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
@ -263,8 +263,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
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))
if (already_found)
fprintf(stderr, warning, len, str);
already_found++;
}

View File

@ -380,6 +380,7 @@ int main(int argc, char **argv)
struct tree_desc tree;
setup_git_directory();
git_config(git_default_config);
switch (argc) {
case 3:

View File

@ -30,6 +30,7 @@ int main(int argc, char **argv)
usage("git-unpack-file <sha1>");
setup_git_directory();
git_config(git_default_config);
puts(create_temp_file(sha1));
return 0;

View File

@ -25,6 +25,7 @@ int main(int argc, char **argv)
int fd, written;
setup_git_directory();
git_config(git_default_config);
if (argc < 3 || argc > 4)
usage(git_update_ref_usage);