From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH v3 0/9] Extending the shelf-life of "git describe" output
Date: Sat, 23 Jun 2012 17:11:22 -0700 [thread overview]
Message-ID: <1340496691-12258-1-git-send-email-gitster@pobox.com> (raw)
This is take 3. The earlier rounds were $gmane/200165 and 200387.
Only the [9/9] is different. It adds a test that creates a history
with many objects whose names share the same prefix, and tries to
check how the implementation employs various possible
disambiguations, e.g.
(1) "$tagname-$generation-g$shortname" can only name a commit
object, which is the topic of this series;
(2) "$shortname" in "$tagname-$generation-g$shortname" alone may
not be sufficiently unambiguous to name a commit, but there may
be only one such commit if we take $tagname and $generation
into account, which I hinted as a possible enhancement in the
cover letter of the first round of this series;
(3) "$shortname" in "$shortname:$path" can only name a tree-ish,
which Thomas volunteered to build on top of this series;
(4) "$shortname" in "$shortname^0" and "$shortname^{commit}" can
only name a commit-ish, which is a natural extension of (3);
(5) "$shortname" in "$shortname^0" and "$shortname^{commit}" might
name more than one commit-ish, but when they are peeled to
commits, they may name the same one (e.g. one is the commit,
the other is a tag to the commit), which is a natural extension
of (4).
Currently, the code implements only (1) and all other tests are
marked as test_expect_failure.
Junio C Hamano (9):
sha1_name.c: indentation fix
sha1_name.c: clarify what "fake" is for in
find_short_object_filename()
sha1_name.c: rename "now" to "current"
sha1_name.c: refactor find_short_packed_object()
sha1_name.c: correct misnamed "canonical" and "res"
sha1_name.c: restructure disambiguation of short names
sha1_name.c: allow get_short_sha1() to take other flags
sha1_name.c: teach get_short_sha1() a commit-only option
sha1_name.c: get_describe_name() by definition groks only commits
sha1_name.c | 282 +++++++++++++++++++++++-------------
t/t1512-rev-parse-disambiguation.sh | 172 ++++++++++++++++++++++
2 files changed, 354 insertions(+), 100 deletions(-)
create mode 100755 t/t1512-rev-parse-disambiguation.sh
--
1.7.11.1.29.gf71be5c
next reply other threads:[~2012-06-24 0:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-24 0:11 Junio C Hamano [this message]
2012-06-24 0:11 ` [PATCH v3 1/9] sha1_name.c: indentation fix Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 2/9] sha1_name.c: clarify what "fake" is for in find_short_object_filename() Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 3/9] sha1_name.c: rename "now" to "current" Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 4/9] sha1_name.c: refactor find_short_packed_object() Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 5/9] sha1_name.c: correct misnamed "canonical" and "res" Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 6/9] sha1_name.c: restructure disambiguation of short names Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 7/9] sha1_name.c: allow get_short_sha1() to take other flags Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 8/9] sha1_name.c: teach get_short_sha1() a commit-only option Junio C Hamano
2012-06-24 0:11 ` [PATCH v3 9/9] sha1_name.c: get_describe_name() by definition groks only commits Junio C Hamano
2012-06-24 5:30 ` [PATCH v3 0/9] Extending the shelf-life of "git describe" output Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340496691-12258-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).