mirror of
https://github.com/git/git.git
synced 2026-01-21 14:27:19 +09:00
last-modified: verify revision argument is a commit-ish
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
be38275cd8
commit
06643fb8a5
@ -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);
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user