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>
Subject: [PATCH v4 1/4] last-modified: rewrite error message when more than one revision given
Date: Fri, 23 Jan 2026 15:33:01 +0100 [thread overview]
Message-ID: <20260123-toon-last-modified-tree-v4-1-86bf97bad4e2@iotcl.com> (raw)
In-Reply-To: <20260123-toon-last-modified-tree-v4-0-86bf97bad4e2@iotcl.com>
When more than one revision 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 revision at a time
While at it, ensure modify the test to ensure the correct error message
is printed.
Signed-off-by: Toon Claes <toon@iotcl•com>
---
builtin/last-modified.c | 2 +-
t/t8020-last-modified.sh | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/builtin/last-modified.c b/builtin/last-modified.c
index c80f0535f6..7d95244e3f 100644
--- a/builtin/last-modified.c
+++ b/builtin/last-modified.c
@@ -146,7 +146,7 @@ static int populate_paths_from_revs(struct last_modified *lm)
continue;
if (num_interesting++)
- return error(_("last-modified can only operate on one tree at a time"));
+ return error(_("last-modified can only operate on one revision at a time"));
diff_tree_oid(lm->rev.repo->hash_algo->empty_tree,
&obj->item->oid, "", &diffopt);
diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh
index 50f4312f71..91901eed58 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 revision' '
+ test_must_fail git last-modified HEAD HEAD~1 2>err &&
+ test_grep "last-modified can only operate on one revision 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
--
2.52.0
next prev parent reply other threads:[~2026-01-23 14:33 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 ` [PATCH v3 4/4] last-modified: verify revision argument is a commit-ish Toon Claes
2026-01-16 18:24 ` 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 ` Toon Claes [this message]
2026-01-23 17:01 ` [PATCH v4 1/4] last-modified: rewrite error message when more than one revision given 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=20260123-toon-last-modified-tree-v4-1-86bf97bad4e2@iotcl.com \
--to=toon@iotcl$(echo .)com \
--cc=git@vger$(echo .)kernel.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