public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Toon Claes <toon@iotcl•com>
To: git@vger•kernel.org
Cc: Patrick Steinhardt <ps@pks•im>,
	 Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail•com>,
	 Toon Claes <toon@iotcl•com>, Gusted <gusted@codeberg•org>
Subject: [PATCH v3 4/4] last-modified: verify revision argument is a commit-ish
Date: Fri, 16 Jan 2026 14:08:40 +0100	[thread overview]
Message-ID: <20260116-toon-last-modified-tree-v3-4-e6ade4dc35ab@iotcl.com> (raw)
In-Reply-To: <20260116-toon-last-modified-tree-v3-0-e6ade4dc35ab@iotcl.com>

Passing a tree OID to git-last-modified(1) would trigger BUG behavior.

    git last-modified HEAD^{tree}
    BUG: builtin/last-modified.c:456: paths remaining beyond boundary in last-modified

Fix this error by verifying the parsed revision is a commit-ish.

Reported-by: Gusted <gusted@codeberg•org>
Signed-off-by: Toon Claes <toon@iotcl•com>
---
 builtin/last-modified.c  |  5 +++++
 t/t8020-last-modified.sh | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/builtin/last-modified.c b/builtin/last-modified.c
index 0df85be318..5366cedd0f 100644
--- a/builtin/last-modified.c
+++ b/builtin/last-modified.c
@@ -150,6 +150,11 @@ static int populate_paths_from_revs(struct last_modified *lm)
 			goto out;
 		}
 
+		if (!repo_peel_to_type(lm->rev.repo, obj->path, 0, obj->item, OBJ_COMMIT)) {
+			ret = error(_("revision argument is not a commit-ish"));
+			goto out;
+		}
+
 		diff_tree_oid(lm->rev.repo->hash_algo->empty_tree,
 			      &obj->item->oid, "", &diffopt);
 		diff_flush(&diffopt);
diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh
index 1183ae667b..22635de447 100755
--- a/t/t8020-last-modified.sh
+++ b/t/t8020-last-modified.sh
@@ -8,6 +8,7 @@ test_expect_success 'setup' '
 	test_commit 1 file &&
 	mkdir a &&
 	test_commit 2 a/file &&
+	git tag -mA t2 2 &&
 	mkdir a/b &&
 	test_commit 3 a/b/file
 '
@@ -55,6 +56,13 @@ test_expect_success 'last-modified recursive' '
 	EOF
 '
 
+test_expect_success 'last-modified on annotated tag' '
+	check_last_modified t2 <<-\EOF
+	2 a
+	1 file
+	EOF
+'
+
 test_expect_success 'last-modified recursive with show-trees' '
 	check_last_modified -r -t <<-\EOF
 	3 a/b
@@ -235,4 +243,9 @@ test_expect_success 'last-modified complains about unknown arguments' '
 	grep "unknown last-modified argument: --foo" err
 '
 
+test_expect_success 'last-modified expects commit-ish' '
+	test_must_fail git last-modified HEAD^{tree} 2>err &&
+	grep "revision argument is not a commit-ish" err
+'
+
 test_done

-- 
2.52.0


  parent reply	other threads:[~2026-01-16 13:09 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-12 16:17 [PATCH] last-modified: verify revision argument is a commit-ish Toon Claes
2026-01-12 20:23 ` Junio C Hamano
2026-01-13  6:54 ` Patrick Steinhardt
2026-01-14 10:24 ` [PATCH v2 0/3] Fix git-last-modified(1) bug triggered when passing a tree-ish Toon Claes
2026-01-14 10:24   ` [PATCH v2 1/3] last-modified: rewrite error message when more than one revision given Toon Claes
2026-01-14 10:56     ` Patrick Steinhardt
2026-01-15 11:33       ` Toon Claes
2026-01-15 11:54         ` Patrick Steinhardt
2026-01-15 14:34           ` Kristoffer Haugsbakk
2026-01-16  7:09             ` Patrick Steinhardt
2026-01-16 12:30               ` Toon Claes
2026-01-16 17:16               ` Junio C Hamano
2026-01-19  6:57                 ` Patrick Steinhardt
2026-01-25 11:26               ` Kristoffer Haugsbakk
2026-01-15 14:34         ` Kristoffer Haugsbakk
2026-01-14 10:24   ` [PATCH v2 2/3] last-modified: remove double error message Toon Claes
2026-01-14 10:56     ` Patrick Steinhardt
2026-01-14 10:24   ` [PATCH v2 3/3] last-modified: verify revision argument is a commit-ish Toon Claes
2026-01-14 10:56     ` Patrick Steinhardt
2026-01-15 16:02     ` Kristoffer Haugsbakk
2026-01-15 16:35       ` Junio C Hamano
2026-01-16 13:11       ` Toon Claes
2026-01-16 13:08   ` [PATCH v3 0/4] Fix git-last-modified(1) bug triggered when passing a tree-ish Toon Claes
2026-01-16 13:08     ` [PATCH v3 1/4] last-modified: rewrite error message when more than one revision given Toon Claes
2026-01-16 17:31       ` Junio C Hamano
2026-01-16 13:08     ` [PATCH v3 2/4] last-modified: fix memory leak when more than one revision is given Toon Claes
2026-01-16 13:08     ` [PATCH v3 3/4] last-modified: remove double error message Toon Claes
2026-01-16 18:22       ` Junio C Hamano
2026-01-16 13:08     ` Toon Claes [this message]
2026-01-16 18:24       ` [PATCH v3 4/4] last-modified: verify revision argument is a commit-ish Junio C Hamano
2026-01-23 14:33     ` [PATCH v4 0/4] Fix git-last-modified(1) bug triggered when passing a tree-ish Toon Claes
2026-01-23 14:33       ` [PATCH v4 1/4] last-modified: rewrite error message when more than one revision given Toon Claes
2026-01-23 17:01         ` Junio C Hamano
2026-01-23 14:33       ` [PATCH v4 2/4] last-modified: fix memory leak when more than one revision is given Toon Claes
2026-01-23 17:04         ` Junio C Hamano
2026-01-23 14:33       ` [PATCH v4 3/4] last-modified: remove double error message Toon Claes
2026-01-23 17:07         ` Junio C Hamano
2026-01-23 14:33       ` [PATCH v4 4/4] last-modified: verify revision argument is a commit-ish Toon Claes
2026-01-23 17:12         ` Junio C Hamano
2026-01-23 17:31         ` Junio C Hamano
2026-01-27 13:26       ` [PATCH v5 0/4] Fix git-last-modified(1) bug triggered when passing a tree-ish Toon Claes
2026-01-27 13:26         ` [PATCH v5 1/4] last-modified: rewrite error message when more than one commit given Toon Claes
2026-01-27 13:26         ` [PATCH v5 2/4] last-modified: fix memory leak when more than one commit is given Toon Claes
2026-01-27 13:26         ` [PATCH v5 3/4] last-modified: remove double error message Toon Claes
2026-01-27 13:26         ` [PATCH v5 4/4] last-modified: verify revision argument is a commit-ish Toon Claes
2026-01-27 22:34         ` [PATCH v5 0/4] Fix git-last-modified(1) bug triggered when passing a tree-ish Junio C Hamano
2026-01-29 14:59           ` Toon Claes
2026-01-30 14:26         ` [PATCH v6 " Toon Claes
2026-01-30 14:26           ` [PATCH v6 1/4] last-modified: rewrite error message when more than one commit given Toon Claes
2026-01-30 14:26           ` [PATCH v6 2/4] last-modified: fix memory leak when more than one commit is given Toon Claes
2026-01-30 14:26           ` [PATCH v6 3/4] last-modified: remove double error message Toon Claes
2026-01-30 14:26           ` [PATCH v6 4/4] last-modified: verify revision argument is a commit-ish Toon Claes
2026-02-06 15:55             ` Patrick Steinhardt
2026-01-30 17:07           ` [PATCH v6 0/4] Fix git-last-modified(1) bug triggered when passing a tree-ish Junio C Hamano
2026-02-06 15:55             ` Patrick Steinhardt

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=20260116-toon-last-modified-tree-v3-4-e6ade4dc35ab@iotcl.com \
    --to=toon@iotcl$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gusted@codeberg$(echo .)org \
    --cc=kristofferhaugsbakk@fastmail$(echo .)com \
    --cc=ps@pks$(echo .)im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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