From 85329e31dd4c864a5a200d0a0ded886599adc2c5 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Fri, 30 Jan 2026 15:26:35 +0100 Subject: last-modified: rewrite error message when more than one commit given When more than one commit is passed to the git-last-modified(1) command, this error message was printed: error: last-modified can only operate on one tree at a time Calling these a "tree" is technically not correct. git-last-modified(1) expects revisions that peel to a commit. Rephrase the error message to: error: last-modified can only operate on one commit at a time While at it, modify the test to ensure the correct error message is printed. Signed-off-by: Toon Claes Signed-off-by: Junio C Hamano --- t/t8020-last-modified.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 't') diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh index 50f4312f71..d1aad12319 100755 --- a/t/t8020-last-modified.sh +++ b/t/t8020-last-modified.sh @@ -12,10 +12,6 @@ test_expect_success 'setup' ' test_commit 3 a/b/file ' -test_expect_success 'cannot run last-modified on two trees' ' - test_must_fail git last-modified HEAD HEAD~1 -' - check_last_modified() { local indir= && while test $# != 0 @@ -230,9 +226,14 @@ test_expect_success 'last-modified merge undoes changes' ' EOF ' +test_expect_success 'cannot run last-modified on two commits' ' + test_must_fail git last-modified HEAD HEAD~1 2>err && + test_grep "last-modified can only operate on one commit at a time" err +' + test_expect_success 'last-modified complains about unknown arguments' ' test_must_fail git last-modified --foo 2>err && - grep "unknown last-modified argument: --foo" err + test_grep "unknown last-modified argument: --foo" err ' test_done -- cgit v1.3-5-g9baa From 525ef52301be231c73393da5af4a4071f060eb20 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Fri, 30 Jan 2026 15:26:38 +0100 Subject: last-modified: verify revision argument is a commit-ish Passing a non-committish revision to git-last-modified(1) triggers the following BUG: git last-modified HEAD^{tree} BUG: builtin/last-modified.c:456: paths remaining beyond boundary in last-modified Fix this error by ensuring that the given revision peels to a commit. This change also adds a test to verify git-last-modified(1) can operate on an annotated tag. For this an annotated tag is added that points to the second commit. But this causes ambiguous results when calling git-name-rev(1) with `--tags`, because now two tags point to the same commit. To remove this ambiguity, pass `--exclude=` to git-name-rev(1) to exclude the new annotated tag. Reported-by: Gusted Signed-off-by: Toon Claes Signed-off-by: Junio C Hamano --- builtin/last-modified.c | 5 +++++ t/t8020-last-modified.sh | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 't') diff --git a/builtin/last-modified.c b/builtin/last-modified.c index e02ec8428b..d0944673f0 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 '%s' is a %s, not a commit-ish"), obj->name, type_name(obj->item->type)); + 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 d1aad12319..ec5bdc6aa0 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 ' @@ -30,7 +31,7 @@ check_last_modified() { cat >expect && git ${indir:+-C "$indir"} last-modified "$@" >tmp.1 && - git name-rev --annotate-stdin --name-only --tags \ + git name-rev --annotate-stdin --name-only --tags --exclude=t2 \ tmp.2 && tr '\t' ' ' actual && test_cmp expect actual @@ -51,6 +52,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 @@ -236,4 +244,9 @@ test_expect_success 'last-modified complains about unknown arguments' ' test_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 && + test_grep "revision argument ${SQ}HEAD^{tree}${SQ} is a tree, not a commit-ish" err +' + test_done -- cgit v1.3-5-g9baa