Merge branch 'jc/name' into next

* jc/name:
  sha1_name: make core.warnambiguousrefs the default.
  sha1_name: warning ambiguous refs.

diff --git a/blame.c b/blame.c
index 7e88833..396defc 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -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) {

diff --git a/cat-file.c b/cat-file.c
index 1a613f3..761111e 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -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>");
 

diff --git a/environment.c b/environment.c
index 5d29b92..6df6478 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -14,7 +14,7 @@ char git_default_name[MAX_GITNAME];
 int trust_executable_bit = 1;
 int assume_unchanged = 0;
 int only_use_symrefs = 0;
-int warn_ambiguous_refs = 0;
+int warn_ambiguous_refs = 1;
 int repository_format_version = 0;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = 0;

diff --git a/ls-tree.c b/ls-tree.c
index 97f09bd..26258c3 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -90,6 +90,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] == '-') {

diff --git a/merge-base.c b/merge-base.c
index e73fca7..07f5ab4 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -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];

diff --git a/name-rev.c b/name-rev.c
index 0c3f547..bad8a53 100644 (file)
--- a/name-rev.c
+++ b/name-rev.c
@@ -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);

diff --git a/read-tree.c b/read-tree.c
index 1c3b09b..eaff444 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -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)

diff --git a/rev-parse.c b/rev-parse.c
index f90e999..19a5ef7 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -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];

diff --git a/send-pack.c b/send-pack.c
index c8ffc8d..409f188 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -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;

diff --git a/sha1_name.c b/sha1_name.c
index 3adaec3..4f92e12 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -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++;
                        }

diff --git a/tar-tree.c b/tar-tree.c
index e478e13..92035f5 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -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:

diff --git a/unpack-file.c b/unpack-file.c
index 07303f8..3accb97 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -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;

diff --git a/update-ref.c b/update-ref.c
index e6fbddb..ba4bf51 100644 (file)
--- a/update-ref.c
+++ b/update-ref.c
@@ -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);