X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=sha1_name.c;h=41b680915d7348bf622397da8b1465d3769a361a;hb=ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123;hp=b0b2167578a7baebeba676af0b33161fb688bae0;hpb=c7ea453618e41e05a06f05e3ab63d555d0ddd7d9;p=git.git

diff --git a/sha1_name.c b/sha1_name.c
index b0b216757..41b680915 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -273,7 +273,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
 		const char *ref, *it;
 
 		strcpy(path, mkpath(*p, len, str));
-		ref = resolve_ref(path, hash, 0, NULL);
+		ref = resolve_ref(path, hash, 1, NULL);
 		if (!ref)
 			continue;
 		if (!stat(git_path("logs/%s", path), &st) &&
@@ -349,7 +349,10 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 			else
 				nth = -1;
 		}
-		if (0 <= nth)
+		if (100000000 <= nth) {
+			at_time = nth;
+			nth = -1;
+		} else if (0 <= nth)
 			at_time = 0;
 		else {
 			char *tmp = xstrndup(str + at + 2, reflog_len);