X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=sha1_name.c;h=345935bb2beddac7b86d5b989ea1492f58a777d8;hb=81f3a188a3781fa4a818ed27ee83430682a98ec4;hp=4f92e12a8dfce29b5bb50108468259d9f04653f3;hpb=1a17ee22a2fbd85a893ab36fd53168d03554c2dd;p=git.git

diff --git a/sha1_name.c b/sha1_name.c
index 4f92e12a..345935bb 100644
--- 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)
 {
@@ -455,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;
 }