From patchwork Fri Oct 8 19:34:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12546241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C8DEC433FE for ; Fri, 8 Oct 2021 19:34:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4770B60FF2 for ; Fri, 8 Oct 2021 19:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231639AbhJHTgx (ORCPT ); Fri, 8 Oct 2021 15:36:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbhJHTgw (ORCPT ); Fri, 8 Oct 2021 15:36:52 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44609C061570 for ; Fri, 8 Oct 2021 12:34:56 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id t2so32806873wrb.8 for ; Fri, 08 Oct 2021 12:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U4kfnP3HLRYUszCGARU85I9x8qo+W0Iu7RgnbGfql/g=; b=Xxfl3TrxA0ywA9jaF15ad7qF6NeXHyN7Fh5cpLx4sDZSE9Q8lb0Aiu9xrpPqFWn2vO bZgp8z7+nTzU/IGzX00+aWbYY0cvePJK2PP24W88SpvnPsd8dlUHlKUwqFkqq4a9swAK CuLf8MGwd3WslM4RD3lK/sFb3oOU9sHINw4W/RSWm5j/vipAaf7eZfXYG1CNaw45w8zm /Dn5pAdu2PLEuzz0zCSCBrs+lxGCQgL0iASzmTLmD/Ke4NF7FBrIJnIhwbQmHlnWpw2G cnczrTNXRm1ILtUVcKAlWDec3/KjZgQjvILF4B2tTHTUXxs73cEOQWxZzttqUEKi30K5 sHbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U4kfnP3HLRYUszCGARU85I9x8qo+W0Iu7RgnbGfql/g=; b=GosNuHTK69LRL99/B9p+djQRHpAbU5szjXIzij+BYw/2dlHPxjWmtkPlkzW8tcSm3A q6EzgPvmcbuLDIUPg+wt622Z0Pj14JluvxoD1jLD9OyS1AoPPkfdPnsXXaPIgCCTedkL qu0PHiBjH3P1BVYcNblxj/dEcfX/qoFQS4bWzNtEHyHElqSJaum8b+P4rP8sdHr/jgGO TYJFBbwBTduDOWDUocNs7Wbdsh/Hdhj201DuAJZNXdLlYyUigaH+wxiZ0HE+SYHlV0rw 7Wt9Re1PN3oDNDcr7W0XhpjWFHPK6lGNOmBiDidL2233RQ2L1OVDkVDR1kCKAVa59fen Q9ag== X-Gm-Message-State: AOAM530LjniD3qVIOksq4Jqf9CJcJtlqxOfGhc/17IoYlVvvJ8L+SGQg d/EsQLefv0WTaP96DisXoYh7EffcJh3O2A== X-Google-Smtp-Source: ABdhPJx4RYurhfb3ibWITE8gEYGckiC47oe6F1bLb0eigI0wQGHP2P5J3PNCtfXKrPc3hiy6tGQQtw== X-Received: by 2002:a1c:c908:: with SMTP id f8mr5516208wmb.142.1633721694530; Fri, 08 Oct 2021 12:34:54 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c204sm13056157wme.11.2021.10.08.12.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 12:34:53 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Bagas Sanjaya , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 1/3] object-name: remove unreachable "unknown type" handling Date: Fri, 8 Oct 2021 21:34:46 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.1492.g76eb1af92bc In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove the "unknown type" handling when displaying the ambiguous object list. See [1] for the current output, and [1] for the commit that added the "unknown type" handling. The reason this code wasn't reachable is because we're not passing in OBJECT_INFO_ALLOW_UNKNOWN_TYPE, so we'll just die in sort_ambiguous() before we get to show_ambiguous_object(): $ git rev-parse 8315 error: short object ID 8315 is ambiguous hint: The candidates are: fatal: invalid object type We should do better here, but let's leave that for some future improvement. In a subsequent commit I'll improve the output we do show, and not having to handle the "unknown type" case simplifies that change. Even though we know that this isn't reachable let's back that up with an assert() both for self-documentation and sanity checking. 1. 5cc044e0257 (get_short_oid: sort ambiguous objects by type, then SHA-1, 2018-05-10) 2. 1ffa26c461 (get_short_sha1: list ambiguous objects on error, 2016-09-26) Signed-off-by: Ævar Arnfjörð Bjarmason --- object-name.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/object-name.c b/object-name.c index fdff4601b2c..59e934262e7 100644 --- a/object-name.c +++ b/object-name.c @@ -361,6 +361,8 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) return 0; type = oid_object_info(ds->repo, oid, NULL); + assert(type == OBJ_TREE || type == OBJ_COMMIT || + type == OBJ_BLOB || type == OBJ_TAG); if (type == OBJ_COMMIT) { struct commit *commit = lookup_commit(ds->repo, oid); if (commit) { @@ -376,8 +378,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) advise(" %s %s%s", repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV), - type_name(type) ? type_name(type) : "unknown type", - desc.buf); + type_name(type), desc.buf); strbuf_release(&desc); return 0; From patchwork Fri Oct 8 19:34:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12546243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2071BC433F5 for ; Fri, 8 Oct 2021 19:35:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF53460F90 for ; Fri, 8 Oct 2021 19:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231657AbhJHTgx (ORCPT ); Fri, 8 Oct 2021 15:36:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231548AbhJHTgw (ORCPT ); Fri, 8 Oct 2021 15:36:52 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FC1AC061570 for ; Fri, 8 Oct 2021 12:34:57 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id t2so32806930wrb.8 for ; Fri, 08 Oct 2021 12:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HyWnXGE/7iFf5sBlOviRTZsS7GMcFLQnOaJwELfdCXQ=; b=nGfZ0uWAuVPLAa/7mus5n8m/ov9X2essHTyTnJNDrpGqksVdHmX6zxZ+kfRPzmlWmm Cpk0pc79lPiq38cVyLD8aKxRVmfkon5jTU0C3pNcsMGFZcqm32naEbm/hEZX5LVIDBia mEPi+1FqbewJ1OxNeFSxN0PgZstbII9V7I+PfdGRjzgl+zGnuUdJarl0XV9WhJEPc9QK 4EV/467/zVPMQQIUGRPPwOrl2cjGQ9sa8Ct5rIdiJ0u/bPEfnxztPE1EdzVGrRHPE825 ZglcuhGw6LYNYE8Gk/NJZnhlLErTsAOjLk9YLk0jX7rqTkfPqwi+ou53J6rKAvBuNVHT 5blg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HyWnXGE/7iFf5sBlOviRTZsS7GMcFLQnOaJwELfdCXQ=; b=bPye2pEBTkxI8DtiX+r/T9U6VX0f8uFKR5ZqzRplI8JOWogAlGVvRLA2v284UF1Osm m6JDwQGW1Uclcj91ibKU+TCfE93J1tFUwo3YiOPknAthyoJfyANqMuhAsgyVr7DcGHPO Bb0WL6c3zZTq8fX1DQN+in7ztThjhxqChLICOoQC0VZ0jf92R0a8qMNS8aCdCGjgmTSi VZyIOKXGsk/glfgPspzf92ajW9NDhfF5D7FW7GrRNrWxuymzCgvtuOtM9bGc+G3iN25+ nh4NZyURrZi+oFMk58ke4Evp1q8V9x5rhNBLI6r5LTPQY5QT15Lpb7V/5BOqBecCZtoU lwPA== X-Gm-Message-State: AOAM533/5XkYbkYDW8gprE/PBXt1GvD6Q8aTHMrYW6whDo/si1O6RwC1 XcZYRbX3UtauC5fmFltJo6LV+6L54y2hLA== X-Google-Smtp-Source: ABdhPJyKtp+dPprbWISJIz3eNbej+fySpJ68fqHWioGKi72MxW3pJdSXDc/hWezPGvfjO7G3fCxgQQ== X-Received: by 2002:a5d:6ad2:: with SMTP id u18mr6553986wrw.47.1633721695404; Fri, 08 Oct 2021 12:34:55 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c204sm13056157wme.11.2021.10.08.12.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 12:34:54 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Bagas Sanjaya , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 2/3] object-name: make ambiguous object output translatable Date: Fri, 8 Oct 2021 21:34:47 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.1492.g76eb1af92bc In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the output of show_ambiguous_object() added in [1] and last tweaked in [2] and the preceding commit to be more friendly to translators. By being able to customize the "%s\n" format we're even ready for RTL languages, who'd presumably like to change that to "%s\n". 1. 1ffa26c461 (get_short_sha1: list ambiguous objects on error, 2016-09-26) 2. 5cc044e0257 (get_short_oid: sort ambiguous objects by type, then SHA-1, 2018-05-10) Signed-off-by: Ævar Arnfjörð Bjarmason --- object-name.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/object-name.c b/object-name.c index 59e934262e7..7a5355b4cf7 100644 --- a/object-name.c +++ b/object-name.c @@ -356,6 +356,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) const struct disambiguate_state *ds = data; struct strbuf desc = STRBUF_INIT; int type; + const char *hash; if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data)) return 0; @@ -363,22 +364,69 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) type = oid_object_info(ds->repo, oid, NULL); assert(type == OBJ_TREE || type == OBJ_COMMIT || type == OBJ_BLOB || type == OBJ_TAG); + hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV); + if (type == OBJ_COMMIT) { + struct strbuf ad = STRBUF_INIT; + struct strbuf s = STRBUF_INIT; struct commit *commit = lookup_commit(ds->repo, oid); + if (commit) { struct pretty_print_context pp = {0}; pp.date_mode.type = DATE_SHORT; - format_commit_message(commit, " %ad - %s", &desc, &pp); + format_commit_message(commit, "%ad", &ad, &pp); + format_commit_message(commit, "%s", &s, &pp); } + + /* + * TRANSLATORS: This is a line of ambiguous commit + * object output. E.g.: + * + * "deadbeef commit 2021-01-01 - Some Commit Message" + */ + strbuf_addf(&desc, _("%s commit %s - %s"), hash, ad.buf, s.buf); + + strbuf_release(&ad); + strbuf_release(&s); } else if (type == OBJ_TAG) { struct tag *tag = lookup_tag(ds->repo, oid); + const char *tag_tag = ""; + if (!parse_tag(tag) && tag->tag) - strbuf_addf(&desc, " %s", tag->tag); + tag_tag = tag->tag; + + /* + * TRANSLATORS: This is a line of + * ambiguous tag object output. E.g.: + * + * "deadbeef tag Some Tag Message" + * + * The second argument is the "tag" string from + * object.c, it should (hopefully) already be + * translated. + */ + strbuf_addf(&desc, _("%s tag %s"), hash, tag_tag); + } else if (type == OBJ_TREE) { + /* + * TRANSLATORS: This is a line of ambiguous + * object output. E.g. "deadbeef tree". + */ + strbuf_addf(&desc, _("%s tree"), hash); + } else if (type == OBJ_BLOB) { + /* + * TRANSLATORS: This is a line of ambiguous + * object output. E.g. "deadbeef blob". + */ + strbuf_addf(&desc, _("%s blob"), hash); + } else { + BUG("unreachable"); } - advise(" %s %s%s", - repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV), - type_name(type), desc.buf); + /* + * TRANSLATORS: This is line item of ambiguous object output, + * translated above. + */ + advise(_(" %s"), desc.buf); strbuf_release(&desc); return 0; From patchwork Fri Oct 8 19:34:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12546245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B03AC433EF for ; Fri, 8 Oct 2021 19:35:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 473AD60FF2 for ; Fri, 8 Oct 2021 19:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231695AbhJHTg4 (ORCPT ); Fri, 8 Oct 2021 15:36:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231681AbhJHTgx (ORCPT ); Fri, 8 Oct 2021 15:36:53 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA378C061570 for ; Fri, 8 Oct 2021 12:34:57 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id s15so32909406wrv.11 for ; Fri, 08 Oct 2021 12:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4QXNP84vGh7XaZsgJkrsq1mob3oSVYRUlAmTgOEM9/c=; b=DZnxu1JbfDHEwpcjQteup49rj4lB4mIkZROHRUwutKy+CwrEPvvrEHfZMrCiomPtSk 8dwOF6S+ia9gLFcFGRswAvW1ew+3NpGIsxgwjRsFoXPAR/Ma+Pr3sT8QP+4xEwgqngWU wVmL1e9ynKEV7Nx3JJxQ0Bv1htoYC5o6Y4CUXWo/KisBxzBOc53Gz6iglcCwM5rWp52H VyWxMRzpI0zbdojK4yeqjyjzpp/ptPbOII4u4FtLl3fIHWSBZA1v7bqi5uKtTEbSixjN zlNsoMqvP7XbQRhEa333RLNqXKt1meaqjPPbgApv2g7Ci0lj/0hczw7TjSv4Brkc9Ij/ Bijw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4QXNP84vGh7XaZsgJkrsq1mob3oSVYRUlAmTgOEM9/c=; b=LNvTEv8CoiGMbAUQin2LUIvl3XbL+6T33BnG1StVXPkd+KdZnmPJIhe0HuMklIrqE5 Is2RGcPPgLB+GXTgieAIj80bdcpp1CW0h+3j2gG4TXrlIsnnvTw1IHPLg5th6zIcgr17 oHezTMhlFieaDgZ4aMsN++JYboRENUmuPEmpQOl09QIfb4pufuMCOvt4dB3SYOYk1Ok/ ezB9eZxTA9cBR4YvVDVHsrzz3sDv/LeXsPOa4WI3KSSYQTcAXvLm/lsP4APfwYyWaYcX T7snh8s+enxO3jp/YKINWsqv3eqETMZD5EwZuWkHmHmGPMuHI6yQykiUItTdeC0wH5rr vNxA== X-Gm-Message-State: AOAM533CRXMmCb8+b4sX72RxpG0pyhxvucICLzgTxhuj+Q01NevUoFKO vw2Kec8NHjMPtB03nC94c2W9scfhm6kZuA== X-Google-Smtp-Source: ABdhPJzwwtQuksP5ugMOJFRWOuTmJH0yQsim5QuR4f7V7KYjOfi1hy+OvSbsqXdOGqmmMoNlCTTygA== X-Received: by 2002:adf:a209:: with SMTP id p9mr6413730wra.70.1633721696319; Fri, 08 Oct 2021 12:34:56 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c204sm13056157wme.11.2021.10.08.12.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 12:34:55 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Bagas Sanjaya , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 3/3] object-name: show date for ambiguous tag objects Date: Fri, 8 Oct 2021 21:34:48 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.1492.g76eb1af92bc In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Make the ambiguous tag object output nicer in the case of tag objects such as ebf3c04b262 (Git 2.32, 2021-06-06) by including the date in the "tagger" header. I.e.: $ git rev-parse b7e68 error: short object ID b7e68 is ambiguous hint: The candidates are: hint: b7e68c41d92 tag 2021-06-06 - v2.32.0 hint: b7e68ae18e0 commit 2019-12-23 - bisect: use the standard 'if (!var)' way to check for 0 hint: b7e68f6b413 tree hint: b7e68490b97 blob b7e68 [...] Before this we'd emit a "tag" line of: hint: b7e68c41d92 tag v2.32.0 Signed-off-by: Ævar Arnfjörð Bjarmason --- object-name.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/object-name.c b/object-name.c index 7a5355b4cf7..29859d3eebe 100644 --- a/object-name.c +++ b/object-name.c @@ -391,9 +391,12 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) } else if (type == OBJ_TAG) { struct tag *tag = lookup_tag(ds->repo, oid); const char *tag_tag = ""; + timestamp_t tag_date = 0; - if (!parse_tag(tag) && tag->tag) + if (!parse_tag(tag) && tag->tag) { tag_tag = tag->tag; + tag_date = tag->date; + } /* * TRANSLATORS: This is a line of @@ -405,7 +408,9 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) * object.c, it should (hopefully) already be * translated. */ - strbuf_addf(&desc, _("%s tag %s"), hash, tag_tag); + strbuf_addf(&desc, _("%s tag %s - %s"), hash, + show_date(tag_date, 0, DATE_MODE(SHORT)), + tag_tag); } else if (type == OBJ_TREE) { /* * TRANSLATORS: This is a line of ambiguous