read-tree: --prefix=<path>/ option.

diff --git a/sha1_name.c b/sha1_name.c
index 3adaec3167d19fd9e3f2c3f6c06530583428c3c6..345935bb2beddac7b86d5b989ea1492f58a777d8 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
+#include "tree-walk.h"
 
 static int find_short_object_filename(int len, const char *name, unsigned char *sha1)
 {
@@ -236,7 +237,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 +264,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++;
                        }
@@ -456,6 +456,19 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
  */
 int get_sha1(const char *name, unsigned char *sha1)
 {
+       int ret;
+       unsigned unused;
+
        prepare_alt_odb();
-       return get_sha1_1(name, strlen(name), sha1);
+       ret = get_sha1_1(name, strlen(name), sha1);
+       if (ret < 0) {
+               const char *cp = strchr(name, ':');
+               if (cp) {
+                       unsigned char tree_sha1[20];
+                       if (!get_sha1_1(name, cp-name, tree_sha1))
+                               return get_tree_entry(tree_sha1, cp+1, sha1,
+                                                     &unused);
+               }
+       }
+       return ret;
 }