From 6099835c1900876c813be6114ff4e81f6d90e8a3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 7 Sep 2011 11:16:03 -0700 Subject: Allow git merge ":/" It probably is not such a good idea to use ":/" to specify which commit to merge, as ":/" can often hit unexpected commits, but somebody tried it and got a nonsense error message: fatal: ':/Foo bar' does not point to a commit So here is a for-the-sake-of-consistency update that is fairly useless that allows users to carefully try not shooting in the foot. Signed-off-by: Junio C Hamano --- sha1_name.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sha1_name.c') diff --git a/sha1_name.c b/sha1_name.c index ff5992acc9..653b0659be 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -501,12 +501,6 @@ struct object *peel_to_type(const char *name, int namelen, { if (name && !namelen) namelen = strlen(name); - if (!o) { - unsigned char sha1[20]; - if (get_sha1_1(name, namelen, sha1)) - return NULL; - o = parse_object(sha1); - } while (1) { if (!o || (!o->parsed && !parse_object(o->sha1))) return NULL; -- cgit v1.3