Fwiw, look very a sound idea for me. Best 2013/3/30, Junio C Hamano <gitster@xxxxxxxxx>: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> What we may want is another type peeling operator, ^{object}. >> that makes sure it is an object, like this: >> >> rev-parse --verify 572a535454612a046e7dd7404dcca94d6243c788^{object} >> >> It asks "I have this 40-hex; I want an object out of it", just like >> frotz^{tree} is "I have 'frotz'; I want a tree-ish" for any value of >> 'frotz'. >> >> With that, a use case that it wants to see _any_ object can safely >> use 'rev-parse --verify "$userinput^{object}' without an annotated >> tag getting in the way. >> >> How does that sound? > > Perhaps something like this. Note that the last hunk is unrelated > thinko-fix I noticed while browsing the code. > > -- >8 -- > Subject: sha1_name.c: ^{object} peeler > > A string that names an object can be suffixed with ^{type} peeler to > say "I have this object name; peel it until you get this type. If > you cannot do so, it is an error". v1.8.2^{commit} asks for a commit > that is pointed at an annotated tag v1.8.2; v1.8.2^{tree} unwraps it > further to the top-level tree object. A special suffix ^{} (i.e. no > type specified) means "I do not care what it unwraps to; just peel > annotated tag until you get something that is not a tag". > > When you have a random user-supplied string, you can turn it to a > bare 40-hex object name, and cause it to error out if such an object > does not exist, with: > > git rev-parse --verify "$userstring^{}" > > for most objects, but this does not yield the tag object name when > $userstring refers to an annotated tag. > > Introduce a new suffix, ^{object}, that only makes sure the given > name refers to an existing object. Then > > git rev-parse --verify "$userstring^{object}" > > becomes a way to make sure $userstring refers to an existing object. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > sha1_name.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sha1_name.c b/sha1_name.c > index c50630a..85b6e75 100644 > --- a/sha1_name.c > +++ b/sha1_name.c > @@ -594,7 +594,7 @@ struct object *peel_to_type(const char *name, int > namelen, > while (1) { > if (!o || (!o->parsed && !parse_object(o->sha1))) > return NULL; > - if (o->type == expected_type) > + if (expected_type == OBJ_ANY || o->type == expected_type) > return o; > if (o->type == OBJ_TAG) > o = ((struct tag*) o)->tagged; > @@ -645,6 +645,8 @@ static int peel_onion(const char *name, int len, > unsigned char *sha1) > expected_type = OBJ_TREE; > else if (!strncmp(blob_type, sp, 4) && sp[4] == '}') > expected_type = OBJ_BLOB; > + else if (!prefixcmp(sp, "object}")) > + expected_type = OBJ_ANY; > else if (sp[0] == '}') > expected_type = OBJ_NONE; > else if (sp[0] == '/') > @@ -654,6 +656,8 @@ static int peel_onion(const char *name, int len, > unsigned char *sha1) > > if (expected_type == OBJ_COMMIT) > lookup_flags = GET_SHA1_COMMITTISH; > + else if (expected_type == OBJ_TREE) > + lookup_flags = GET_SHA1_TREEISH; > > if (get_sha1_1(name, sp - name - 2, outer, lookup_flags)) > return -1; > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Inviato dal mio dispositivo mobile -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html -transfer-encoding; bh=G7WrGulNpUS/AFR3HRJJp96XxOJBbD0EUG2MmQjv81w=; b=g0WZpz2EAOrUyw7MqyVx+x+Z5ERLwhRPfZVyysSxoARiqGW1nS95uycjvuJDwB9ha4 0p5rcQRP1j7vvkLn1v7EaaabQYJxaG3EsCpvPH9/4Ulya4zhlb6/K1qOD5pSJH9XCtWt ZfFHV6P2GE3A/5FtSsm4tKBDBczvFjrifA+bWaHxAkE53EROJNFI+YZnFbu/5hSeKOyV /3Yq+SIv1VjZAizcfhIpiCB5p89cNLIird776Mfv8+5Gmv1RuZK2FQHTKngrFTSnVhki SdKg9QJjq3aj6ZK7aWlraIU5yzOMwBUGbiutWN4FewpVTCPFcFpPltUmmzDHRPTkxUE9 mPxw== X-Received: by 10.60.8.197 with SMTP id t5mr1922933oea.4.1364635903336; Sat, 30 Mar 2013 02:31:43 -0700 (PDT) MIME-Version: 1.0 Received: by 10.76.27.137 with HTTP; Sat, 30 Mar 2013 02:31:12 -0700 (PDT) In-Reply-To: <CAPig+cSzHuSnT2+e+U+zJtOUtReUo=3JWZDQcCbMKS4ibZtjvA@xxxxxxxxxxxxxx> References: <1363400683-14813-1-git-send-email-pclouds@xxxxxxxxx> <1363400683-14813-13-git-send-email-pclouds@xxxxxxxxx> <CAPig+cSzHuSnT2+e+U+zJtOUtReUo=3JWZDQcCbMKS4ibZtjvA@xxxxxxxxxxxxxx> From: Duy Nguyen <pclouds@xxxxxxxxx> Date: Sat, 30 Mar 2013 16:3r